Merge branch 'david_test_conda' into david_conda_ci_pkg

.devcontainer/devcontainer.json

@@ -119,7 +119,6 @@
 			],
             "settings": {
                 "cmake.cmakePath": "/tmp/.current-conda-env/bin/cmake",
-                // "cmake.languageSupport.dotnetPath": "/usr/bin/dotnet",
                 "C_Cpp.intelliSenseEngine": "disabled",
                 "python.terminal.activateEnvironment": false
             }

CMakeLists.txt

@@ -74,7 +74,14 @@ morpheus_utils_initialize_package_manager(
 )
 
 # Initialize CUDA
-# NOTE: This MUST occur before any 'project' calls because of rapids_cmake requirements.
+# This is a two-step process. We need to call morpheus_utils_initialize_cuda_arch which in turn calls
+# rapids_cuda_init_architectures prior to calling project(). This is because rapids_cuda_init_architectures defines a
+# `CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE` hook which is invoked by the project() call. This hook is what allows us to
+# set `CMAKE_CUDA_ARCHITECTURES=rapids` when performing a release build which will be expanded to the current list of
+# supported architectures by our version of rapids.
+#
+# After the call to project() we can then call morpheus_utils_enable_cuda() which will set some CUDA+clang settings
+# which can only be performed after calling project(), but which must be set prior to calling enable_language(CUDA)
 if(DEFINED MORPHEUS_CUDA_ARCHITECTURES)
   set(CMAKE_CUDA_ARCHITECTURES "${MORPHEUS_CUDA_ARCHITECTURES}")
 endif()
@@ -89,7 +96,7 @@ project(morpheus
   LANGUAGES C CXX
 )
 
-# Configure CUDA architecture
+# This sets some clang specific settings for CUDA prior to calling enable_language(CUDA)
 morpheus_utils_enable_cuda()
 
 rapids_cmake_write_version_file(${CMAKE_BINARY_DIR}/autogenerated/include/morpheus/version.hpp)
@@ -178,8 +185,6 @@ if(MORPHEUS_ENABLE_DEBUG_INFO)
 
   morpheus_utils_print_target_properties(
     TARGETS
-      morpheus._lib.cudf_helpers
-      morpheus morpheus._lib.llm
       morpheus
     WRITE_TO_FILE
   )

cmake/dependencies.cmake

@@ -50,10 +50,6 @@ endif()
 # ====
 morpheus_utils_configure_glog()
 
-# grpc
-# =========
-morpheus_utils_configure_grpc()
-
 if(MORPHEUS_BUILD_TESTS)
   # google test
   # - Expects package to pre-exist in the build environment

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -17,6 +17,7 @@ dependencies:
 - boost-cpp=1.82
 - boto3
 - breathe=4.34.0
+- ccache>=3.7
 - clangdev=16
 - click>=8
 - cmake=3.25
@@ -70,6 +71,7 @@ dependencies:
 - openai=0.28
 - papermill=2.3.4
 - pip
+- pkg-config
 - pluggy=1.0
 - pre-commit
 - protobuf=4.21.*

conda/environments/dev_cuda-118_arch-x86_64.yaml

@@ -15,6 +15,7 @@ dependencies:
 - benchmark=1.6.0
 - boost-cpp=1.82
 - breathe=4.34.0
+- ccache>=3.7
 - clangdev=16
 - click>=8
 - cmake=3.25
@@ -55,6 +56,7 @@ dependencies:
 - numpydoc=1.4
 - nvtabular=23.06
 - pip
+- pkg-config
 - pluggy=1.0
 - pre-commit
 - protobuf=4.21.*

dependencies.yaml

@@ -137,6 +137,7 @@ dependencies:
           - gxx_linux-64=11.2
           - cmake=3.25
           - boost-cpp=1.82
+          - ccache>=3.7
           - cuda-nvcc
           - cudf=23.06
           - cxx-compiler
@@ -145,6 +146,7 @@ dependencies:
           - librdkafka=1.9.2
           - ninja=1.10
           - nlohmann_json=3.9
+          - pkg-config # for mrc cmake
           - protobuf=4.21.*
           - pybind11-stubgen=0.10
           - rapidjson=1.1.0