Morpheus changes related to utility consolidation

.gitmodules

@@ -2,3 +2,9 @@
 	path = external/morpheus-visualizations
 	url = https://github.com/nv-morpheus/morpheus-visualizations.git
 	branch = branch-22.11
+[submodule "external/utilities"]
+	path = external/utilities
+	url = git@github.com:nv-morpheus/utilities.git
+	branch = devin-issue-255-87
+[submodule "./external/utilities/"]
+	branch = devin-issue-225-87

CMakeLists.txt

@@ -32,6 +32,7 @@ option(MORPHEUS_USE_CONDA "Enables finding dependencies via conda instead of vcp
 option(MORPHEUS_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF)
 set(MORPHEUS_PY_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/wheel" CACHE STRING "Location to install the python directory")
 
+set(MORPHEUS_RAPIDS_CMAKE_VERSION "22.08" CACHE STRING "Sets default versions for RAPIDS CMake.")
 set(MORPHEUS_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data")
 mark_as_advanced(MORPHEUS_CACHE_DIR)
 
@@ -43,39 +44,60 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_INSTALL_RPATH "$ORIGIN")
 
+enable_language(C CXX) # TODO(Devin) Required for coverage import
 enable_testing()
 
-# CMake path
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/cmake")
-
-# Add the RAPIDS cmake helper scripts
-include(import-rapids-cmake)
+# MRC CMake path and module extensions
+set(MORPHEUS_CMAKE_MODULE_PATH_EXTENSIONS
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/utilities/cmake")
+
+set(MORPHEUS_CMAKE_PREFIX_PATH_EXTENSIONS
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+    )
+
+# Prepend path and prefix updates so they take priority in this scope.
+list(PREPEND CMAKE_MODULE_PATH "${MORPHEUS_CMAKE_MODULE_PATH_EXTENSIONS}")
+list(PREPEND CMAKE_PREFIX_PATH "${MORPHEUS_CMAKE_PREFIX_PATH_EXTENSIONS}")
+
+# Load morpheus utils and update CMake paths
+set(MORPHEUS_UTILS_RAPIDS_CMAKE_VERSION ${MRC_RAPIDS_VERSION})
+set(MORPHEUS_UTILS_RAPIDS_CPM_INIT_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rapids_cpm_package_overrides.json")
+include(morpheus_utils/load)
+
+# Configure project package manager
+morpheus_utils_initialize_package_manager(
+    MORPHEUS_USE_CONDA
+    BUILD_SHARED_LIBS
+    MORPHEUS_VCPKG_TOOLCHAIN
+    MORPHEUS_VCPKG_DEFAULT_BINARY_CACHE
+)
 
 # Configure CUDA architecture
-include(configure_cuda_architecture)
+# NOTE: This MUST occur before any 'project' calls because of rapids_cmake requirements.
+morpheus_utils_initialize_cuda_arch(morpheus)
 
 # Set a default build type if none was specified
 rapids_cmake_build_type(Release)
 
-# Toolchain selection (Conda/VCPKG/custom) and configuration
-include(cmake/configure_toolchain.cmake)
-
 # Project definition
-project(morpheus LANGUAGES C CXX CUDA)
+project(morpheus
+    VERSION 23.01.00
+    LANGUAGES C CXX CUDA)
+rapids_cmake_write_version_file(${CMAKE_BINARY_DIR}/autogenerated/include/mrc/version.hpp)
 
 # Ccache configuration
-include(setup_cache)
+include(environment/init_ccache)
 
 # Configure all dependencies
-include(cmake/dependencies.cmake)
+include(dependencies)
 
 ####################################
 # - Post dependencies setup --------
-include(cmake/setup_compiler.cmake)
+include(environment/init_compiler)
 
 # Setup IWYU if enabled
-include(cmake/setup_iwyu.cmake)
+include(environment/init_iwyu)
 
 # To make it easier for CI to find output files, set the default executable suffix to .x if not set
 if("${CMAKE_EXECUTABLE_SUFFIX}" STREQUAL "")
@@ -158,5 +180,8 @@ install(
     PATTERN "data/*"
 )
 
+# Cleanup the environment after we exit this scope
+list(REMOVE_ITEM CMAKE_PREFIX_PATH "${MORPHEUS_CMAKE_PREFIX_PATH_EXTENSIONS}")
+list(REMOVE_ITEM CMAKE_MODULE_PATH "${MORPHEUS_CMAKE_MODULE_PATH_EXTENSIONS}")
 
 list(POP_BACK CMAKE_MESSAGE_CONTEXT)

cmake/dependencies.cmake

@@ -83,37 +83,30 @@ endif()
 
 # libcudacxx -- get an explicit lubcudacxx build, matx tries to pull a tag that doesn't exist.
 # =========
-set(LIBCUDACXX_VERSION "1.8.0" CACHE STRING "Version of libcudacxx to use")
-include(deps/Configure_libcudacxx)
+morpheus_utils_configure_libcudacxx()
 
 # matx
 # ====
-set(MATX_VERSION "0.1.0" CACHE STRING "Version of MatX to use")
-include(deps/Configure_matx)
+morpheus_utils_configure_matx()
 
 # pybind11
 # =========
-set(PYBIND11_VERSION "2.8.1" CACHE STRING "Version of Pybind11 to use")
-include(deps/Configure_pybind11)
+morpheus_utils_configure_pybind11()
 
 # RD-Kafka
 # =====
-set(RDKAFKA_VERSION 1.6.2)
-include(deps/Configure_rdkafka)
+morpheus_utils_configure_rdkafka()
 
 # MRC (Should come after all third party but before NVIDIA repos)
 # =====
-set(MRC_VERSION 23.01 CACHE STRING "Which version of MRC to use")
-include(deps/Configure_mrc)
+morpheus_utils_configure_mrc()
 
 # CuDF
 # =====
-set(CUDF_VERSION "${MORPHEUS_RAPIDS_VERSION}" CACHE STRING "Which version of cuDF to use")
-include(deps/Configure_cudf)
+morpheus_utils_configure_cudf()
 
 # Triton-client
 # =====
-set(TRITONCLIENT_VERSION "${MORPHEUS_RAPIDS_VERSION}" CACHE STRING "Which version of TritonClient to use")
-include(deps/Configure_TritonClient)
+morpheus_utils_configure_tritonclient()
 
 list(POP_BACK CMAKE_MESSAGE_CONTEXT)