Merge pull request #510 from dagardner-nv/branch-25.02-merge-24.10

Forward-merge branch-24.10 into branch-25.02

.devcontainer/conda/Dockerfile

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM rapidsai/devcontainers:23.04-cuda12.1-mambaforge-ubuntu22.04 AS base
+FROM rapidsai/devcontainers:24.12-cuda12.1-mambaforge-ubuntu22.04 AS base
 
 ENV PATH="${PATH}:/workspaces/mrc/.devcontainer/bin"

.devcontainer/conda/devcontainer.json

@@ -35,7 +35,7 @@
         "MRC_ROOT": "${containerWorkspaceFolder}",
         "DEFAULT_CONDA_ENV": "mrc",
         "MAMBA_NO_BANNER": "1",
-        "VAULT_HOST": "https://vault.ops.k8s.rapids.ai"
+        "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs"
     },
     "initializeCommand": [ "${localWorkspaceFolder}/.devcontainer/conda/initialize-command.sh" ],
     "remoteUser": "coder",

.devcontainer/opt/mrc/conda/Dockerfile

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM rapidsai/devcontainers:23.04-cuda12.1-mambaforge-ubuntu22.04 AS base
+FROM rapidsai/devcontainers:24.12-cuda12.1-mambaforge-ubuntu22.04 AS base
 
 ENV PATH="${PATH}:/workspaces/mrc/.devcontainer/bin"

.devcontainer/opt/mrc/conda/devcontainer.json

@@ -35,7 +35,7 @@
         "MRC_ROOT": "${containerWorkspaceFolder}",
         "DEFAULT_CONDA_ENV": "mrc",
         "MAMBA_NO_BANNER": "1",
-        "VAULT_HOST": "https://vault.ops.k8s.rapids.ai"
+        "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs"
     },
     "initializeCommand": [ "${localWorkspaceFolder}/.devcontainer/initialize-command.sh" ],
     "remoteUser": "coder",

.github/workflows/pr.yaml

@@ -58,7 +58,7 @@ jobs:
     steps:
       - name: Get PR Info
         id: get-pr-info
-        uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.08
+        uses: nv-gha-runners/get-pr-info@main
         if: ${{ startsWith(github.ref_name, 'pull-request/') }}
     outputs:
       is_pr: ${{ startsWith(github.ref_name, 'pull-request/') }}

CMakeLists.txt

@@ -85,8 +85,6 @@ project(mrc
 
 morpheus_utils_initialize_install_prefix(MRC_USE_CONDA)
 
-rapids_cmake_write_version_file(${CMAKE_BINARY_DIR}/autogenerated/include/mrc/version.hpp)
-
 # Delay enabling CUDA until after we have determined our CXX compiler
 if(NOT DEFINED CMAKE_CUDA_HOST_COMPILER)
   message(STATUS "Setting CUDA host compiler to match CXX compiler: ${CMAKE_CXX_COMPILER}")
@@ -180,6 +178,47 @@ if(MRC_BUILD_DOCS)
   add_subdirectory(docs)
 endif()
 
+# ##################################################################################################
+# - install export ---------------------------------------------------------------------------------
+
+set(doc_string
+  [=[
+Provide targets for mrc.
+]=])
+
+set(code_string "")
+
+set(rapids_project_version_compat SameMinorVersion)
+
+# Need to explicitly set VERSION ${PROJECT_VERSION} here since rapids_cmake gets
+# confused with the `RAPIDS_VERSION` variable we use
+rapids_export(INSTALL ${PROJECT_NAME}
+  EXPORT_SET ${PROJECT_NAME}-exports
+  GLOBAL_TARGETS libmrc pymrc
+  COMPONENTS python
+  COMPONENTS_EXPORT_SET ${PROJECT_NAME}-python-exports
+  VERSION ${PROJECT_VERSION}
+  NAMESPACE mrc::
+  DOCUMENTATION doc_string
+  FINAL_CODE_BLOCK code_string
+)
+
+# ##################################################################################################
+# - build export -----------------------------------------------------------------------------------
+rapids_export(BUILD ${PROJECT_NAME}
+  EXPORT_SET ${PROJECT_NAME}-exports
+  GLOBAL_TARGETS libmrc pymrc
+  COMPONENTS python
+  COMPONENTS_EXPORT_SET ${PROJECT_NAME}-python-exports
+  VERSION ${PROJECT_VERSION}
+  LANGUAGES C CXX CUDA
+  NAMESPACE mrc::
+  DOCUMENTATION doc_string
+  FINAL_CODE_BLOCK code_string
+)
+
+# ##################################################################################################
+# - debug info -------------------------------------------------------------------------------------
 if (MRC_ENABLE_DEBUG_INFO)
   morpheus_utils_print_all_targets()
 

ci/iwyu/mappings.imp

@@ -3,6 +3,7 @@
 ## Include mappings
 
 # stdlib
+{ "include": [ "<bits/chrono.h>", private, "<chrono>", "public" ] },
 { "include": [ "<bits/cxxabi_forced.h>", private, "<mutex>", "public" ] },
 { "include": [ "<bits/cxxabi_forced.h>", private, "<vector>", "public" ] },
 { "include": [ "<bits/this_thread_sleep.h>", private, "<thread>", "public" ] },

ci/scripts/cpp_checks.sh

@@ -80,9 +80,8 @@ if [[ -n "${MRC_MODIFIED_FILES}" ]]; then
 
    # Include What You Use
    if [[ "${SKIP_IWYU}" == "" ]]; then
-      # Remove .h, .hpp, and .cu files from the modified list
       shopt -s extglob
-      IWYU_MODIFIED_FILES=( "${MRC_MODIFIED_FILES[@]/*.@(h|hpp|cu)/}" )
+      IWYU_MODIFIED_FILES=( "${MRC_MODIFIED_FILES[@]}" )
 
       if [[ -n "${IWYU_MODIFIED_FILES}" ]]; then
          # Get the list of compiled files relative to this directory

cpp/mrc/CMakeLists.txt

@@ -16,6 +16,11 @@
 # ##################################################################################################
 # - libmrc -----------------------------------------------------------------------------------------
 
+include(GenerateExportHeader)
+
+# Generate the version header file
+rapids_cmake_write_version_file(${CMAKE_CURRENT_BINARY_DIR}/autogenerated/include/mrc/version.hpp)
+
 # Keep all source files sorted!!!
 add_library(libmrc
   src/internal/codable/codable_storage.cpp
@@ -125,6 +130,7 @@ add_library(libmrc
   src/public/cuda/sync.cpp
   src/public/edge/edge_adapter_registry.cpp
   src/public/edge/edge_builder.cpp
+  src/public/exceptions/checks.cpp
   src/public/exceptions/exception_catcher.cpp
   src/public/manifold/manifold.cpp
   src/public/memory/buffer_view.cpp
@@ -204,6 +210,47 @@ target_compile_features(libmrc PUBLIC cxx_std_20)
 
 set_target_properties(libmrc PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
 
+# Generates an include file for specifying external linkage since everything is hidden by default
+generate_export_header(libmrc
+  NO_EXPORT_MACRO_NAME
+    MRC_LOCAL
+  EXPORT_FILE_NAME
+    "${CMAKE_CURRENT_BINARY_DIR}/autogenerated/include/mrc/export.h"
+)
+
+# ##################################################################################################
+# - source information -----------------------------------------------------------------------------
+
+# Ideally, we dont use glob here. But there is no good way to guarantee you dont miss anything like *.cpp
+file(GLOB_RECURSE libmrc_public_headers
+  LIST_DIRECTORIES FALSE
+  CONFIGURE_DEPENDS
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/mrc/*"
+)
+
+# Add headers to target sources file_set so they can be installed
+# https://discourse.cmake.org/t/installing-headers-the-modern-way-regurgitated-and-revisited/3238/3
+target_sources(libmrc
+  PUBLIC
+    FILE_SET public_headers
+    TYPE HEADERS
+    BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    FILES
+      ${libmrc_public_headers}
+)
+
+# Add generated headers to fileset
+target_sources(libmrc
+  PUBLIC
+    FILE_SET public_headers
+    TYPE HEADERS
+    BASE_DIRS
+      "${CMAKE_CURRENT_BINARY_DIR}/autogenerated/include"
+    FILES
+      "${CMAKE_CURRENT_BINARY_DIR}/autogenerated/include/mrc/version.hpp"
+      "${CMAKE_CURRENT_BINARY_DIR}/autogenerated/include/mrc/export.h"
+)
+
 # ##################################################################################################
 # - install targets --------------------------------------------------------------------------------
 rapids_cmake_install_lib_dir(lib_dir)
@@ -215,12 +262,7 @@ install(
   DESTINATION ${lib_dir}
   EXPORT ${PROJECT_NAME}-exports
   COMPONENT Core
-)
-
-install(
-  DIRECTORY include/
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  COMPONENT Core
+  FILE_SET public_headers
 )
 
 # ##################################################################################################
@@ -234,37 +276,3 @@ endif()
 if(MRC_BUILD_BENCHMARKS)
   add_subdirectory(benchmarks)
 endif()
-
-# ##################################################################################################
-# - install export ---------------------------------------------------------------------------------
-set(doc_string
-  [=[
-Provide targets for mrc.
-]=])
-
-set(code_string "")
-
-set(rapids_project_version_compat SameMinorVersion)
-
-# Need to explicitly set VERSION ${PROJECT_VERSION} here since rapids_cmake gets
-# confused with the `RAPIDS_VERSION` variable we use
-rapids_export(INSTALL ${PROJECT_NAME}
-  EXPORT_SET ${PROJECT_NAME}-exports
-  GLOBAL_TARGETS libmrc
-  VERSION ${PROJECT_VERSION}
-  NAMESPACE mrc::
-  DOCUMENTATION doc_string
-  FINAL_CODE_BLOCK code_string
-)
-
-# ##################################################################################################
-# - build export ----------------------------------------------------------------------------------
-rapids_export(BUILD ${PROJECT_NAME}
-  EXPORT_SET ${PROJECT_NAME}-exports
-  GLOBAL_TARGETS libmrc
-  VERSION ${PROJECT_VERSION}
-  LANGUAGES C CXX CUDA
-  NAMESPACE mrc::
-  DOCUMENTATION doc_string
-  FINAL_CODE_BLOCK code_string
-)

cpp/mrc/include/mrc/channel/status.hpp

@@ -1,5 +1,5 @@
 /*
- * 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");
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include <ostream>
+
 namespace mrc::channel {
 
 enum class Status
@@ -29,4 +31,25 @@ enum class Status
     error
 };
 
+static inline std::ostream& operator<<(std::ostream& os, const Status& s)
+{
+    switch (s)
+    {
+    case Status::success:
+        return os << "success";
+    case Status::empty:
+        return os << "empty";
+    case Status::full:
+        return os << "full";
+    case Status::closed:
+        return os << "closed";
+    case Status::timeout:
+        return os << "timeout";
+    case Status::error:
+        return os << "error";
+    default:
+        throw std::logic_error("Unsupported channel::Status enum. Was a new value added recently?");
+    }
 }
+
+}  // namespace mrc::channel

cpp/mrc/include/mrc/core/fiber_pool.hpp

@@ -1,5 +1,5 @@
 /*
- * 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");
@@ -43,14 +43,14 @@ class FiberPool
     [[nodiscard]] virtual std::size_t thread_count() const = 0;
 
     template <class F, class... ArgsT>
-    auto enqueue(std::uint32_t index, F&& f, ArgsT&&... args) -> Future<typename std::result_of<F(ArgsT...)>::type>
+    auto enqueue(std::uint32_t index, F&& f, ArgsT&&... args) -> Future<typename std::invoke_result_t<F, ArgsT...>>
     {
         return task_queue(index).enqueue(f, std::forward<ArgsT>(args)...);
     }
 
     template <class MetaDataT, class F, class... ArgsT>
     auto enqueue(std::uint32_t index, MetaDataT&& md, F&& f, ArgsT&&... args)
-        -> Future<typename std::result_of<F(ArgsT...)>::type>
+        -> Future<typename std::invoke_result_t<F, ArgsT...>>
     {
         return task_queue(index).enqueue(std::forward<MetaDataT>(md), std::forward<F>(f), std::forward<ArgsT>(args)...);
     }