Merge branch-24.10 into branch-25.02

ci/conda/README.md

@@ -4,7 +4,7 @@ To build the Conda packages, it's recommended to run the provided scripts from a
 
 ```bash
 cd ${MRC_ROOT}
-docker buildx build --target developement -t mrc-conda-build .
+docker buildx build --target development -t mrc-conda-build .
 ```
 
 This will create the image `mrc-conda-build` that can be used to build MRC conda packages. When running this container, is recommended to set the environment variable `CONDA_PKGS_DIRS` to a path mounted on the host to speed up the build process. Without this variable set, the packages needed during the build will need to be re-downloaded each time the container is run.
@@ -16,14 +16,14 @@ To build and save the MRC conda package, run the following:
 ```bash
 docker run --rm -ti -v $PWD:/work \
    -e CONDA_PKGS_DIRS=/work/.cache/conda_pkgs \
-   -e CONDA_ARGS="--output-folder=/work/.conda-bld" \
+   -e CONDA_ARGS="--output-folder=/work/.tmp/.conda-bld" \
    mrc-conda-build ./ci/conda/recipes/run_conda_build.sh
 ```
 
-This will save the conda packages to `${MRC_ROOT}/.conda-bld`. To install from this location, use the following:
+This will save the conda packages to `${MRC_ROOT}/.tmp/.conda-bld`. To install from this location, use the following:
 
 ```bash
-conda install -c file://${MRC_ROOT}/.conda-bld mrc
+conda install -c file://${MRC_ROOT}/.tmp/.conda-bld mrc
 ```
 
 ## Uploading the Conda Package

cpp/mrc/CMakeLists.txt

@@ -259,9 +259,10 @@ include(GNUInstallDirs)
 
 install(
   TARGETS libmrc
-  DESTINATION ${lib_dir}
   EXPORT ${PROJECT_NAME}-exports
-  COMPONENT Core
+  COMPONENT core
+  LIBRARY
+    DESTINATION ${lib_dir}
   FILE_SET public_headers
 )
 

protos/CMakeLists.txt

@@ -94,8 +94,9 @@ add_dependencies(${PROJECT_NAME}_style_checks mrc_protos-headers-target)
 install(
   TARGETS mrc_protos mrc_architect_protos
   EXPORT ${PROJECT_NAME}-exports
+  COMPONENT core
   PUBLIC_HEADER
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/protos"
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/protos"
 )
 
 list(REMOVE_ITEM CMAKE_MODULE_PATH ${MRC_PROTO_MODULE_PATH_EXTENSIONS})

python/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +15,9 @@
 
 list(APPEND CMAKE_MESSAGE_CONTEXT "python")
 
-find_package(CUDAToolkit REQUIRED)
-
-
 # Ensure python is configured
 morpheus_utils_python_configure()
 
-
 morpheus_utils_print_python_info()
 
 # Create the mrc python package
@@ -30,9 +26,9 @@ morpheus_utils_create_python_package(mrc)
 # Add a few additional files to be copied
 file(GLOB pymrc_test_files "${CMAKE_CURRENT_SOURCE_DIR}/tests/*.py")
 morpheus_utils_add_python_sources(
-    "pytest.ini"
-    "tests/string_reader_input.txt"
-    ${pymrc_test_files}
+  "pytest.ini"
+  "tests/string_reader_input.txt"
+  ${pymrc_test_files}
 )
 
 # Build the pymrc library

python/mrc/_pymrc/CMakeLists.txt

@@ -14,9 +14,23 @@
 
 include(GenerateExportHeader)
 
-find_package(Python 3.8 REQUIRED COMPONENTS Development Interpreter)
-find_package(pybind11 REQUIRED)
-find_package(prometheus-cpp REQUIRED)
+rapids_find_package(Python 3.8 REQUIRED
+  COMPONENTS
+    Development
+    Interpreter
+  BUILD_EXPORT_SET ${PROJECT_NAME}-python-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-python-exports
+)
+
+rapids_find_package(pybind11 REQUIRED
+  BUILD_EXPORT_SET ${PROJECT_NAME}-python-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-python-exports
+)
+
+rapids_find_package(prometheus-cpp REQUIRED
+  BUILD_EXPORT_SET ${PROJECT_NAME}-python-exports
+  INSTALL_EXPORT_SET ${PROJECT_NAME}-python-exports
+)
 
 # Keep all source files sorted!!!
 add_library(pymrc
@@ -120,9 +134,10 @@ include(GNUInstallDirs)
 
 install(
   TARGETS pymrc
-  DESTINATION ${lib_dir}
   EXPORT ${PROJECT_NAME}-python-exports
-  COMPONENT Python
+  COMPONENT python
+  LIBRARY
+    DESTINATION ${lib_dir}
   FILE_SET public_headers
 )
 

python/mrc/_pymrc/tests/CMakeLists.txt

@@ -15,8 +15,6 @@
 
 list(APPEND CMAKE_MESSAGE_CONTEXT "tests")
 
-find_package(pybind11 REQUIRED)
-
 add_subdirectory(coro)
 
 # Keep all source files sorted!!!