From 244db07afe9812475c0d3b0a8a86b524d058c161 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 31 Jul 2024 16:38:06 +0000 Subject: [PATCH 01/21] change rmm to 24.08 --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 92c468507..fd6e18624 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -60,7 +60,7 @@ dependencies: - gxx=11.2 - libgrpc=1.59 - libhwloc=2.9.2 - - librmm=24.02 + - librmm=24.08 - libxml2=2.11.6 # 2.12 has a bug preventing round-trip serialization in hwloc - ninja=1.11 - nlohmann_json=3.11 From 88405fbff601fbb34db496725bfc8f77bdd9d03d Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 1 Aug 2024 19:39:48 +0000 Subject: [PATCH 02/21] update dependencies for rapids 24.08 --- dependencies.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index fd6e18624..bebab5cc2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["12.1"] + cuda: ["12.4"] arch: [x86_64] includes: - build @@ -21,7 +21,7 @@ files: ci: output: conda matrix: - cuda: ["12.1"] + cuda: ["12.4"] arch: [x86_64] includes: - build @@ -55,13 +55,13 @@ dependencies: - cmake=3.27 - cuda-nvcc - cxx-compiler - - glog=0.6 + - glog>=0.7.1,<0.8 - gtest=1.14 - gxx=11.2 - - libgrpc=1.59 + - libgrpc=1.62.2 - libhwloc=2.9.2 - librmm=24.08 - - libxml2=2.11.6 # 2.12 has a bug preventing round-trip serialization in hwloc + - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 - numactl-libs-cos7-x86_64 @@ -137,17 +137,17 @@ dependencies: common: - output_types: [conda] packages: - - python=3.10 + - python=3.11 cudatoolkit: specific: - output_types: [conda] matrices: - matrix: - cuda: "12.1" + cuda: "12.4" packages: - - cuda-cudart-dev=12.1 - - cuda-nvml-dev=12.1 - - cuda-nvrtc-dev=12.1 - - cuda-tools=12.1 - - cuda-version=12.1 + - cuda-cudart-dev=12.4 + - cuda-nvml-dev=12.4 + - cuda-nvrtc-dev=12.4 + - cuda-tools=12.4 + - cuda-version=12.4 From 9b59a42ece6656b5df2bb9d167a31bc7af565ecc Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 1 Aug 2024 19:42:55 +0000 Subject: [PATCH 03/21] fix environment files --- ..._64.yaml => all_cuda-124_arch-x86_64.yaml} | 22 +++++++++---------- ...6_64.yaml => ci_cuda-124_arch-x86_64.yaml} | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) rename conda/environments/{all_cuda-121_arch-x86_64.yaml => all_cuda-124_arch-x86_64.yaml} (78%) rename conda/environments/{ci_cuda-121_arch-x86_64.yaml => ci_cuda-124_arch-x86_64.yaml} (74%) diff --git a/conda/environments/all_cuda-121_arch-x86_64.yaml b/conda/environments/all_cuda-124_arch-x86_64.yaml similarity index 78% rename from conda/environments/all_cuda-121_arch-x86_64.yaml rename to conda/environments/all_cuda-124_arch-x86_64.yaml index 7e6e17b84..5f41d0591 100644 --- a/conda/environments/all_cuda-121_arch-x86_64.yaml +++ b/conda/environments/all_cuda-124_arch-x86_64.yaml @@ -16,27 +16,27 @@ dependencies: - clangxx=16 - cmake=3.27 - codecov=2.1 -- cuda-cudart-dev=12.1 +- cuda-cudart-dev=12.4 - cuda-nvcc -- cuda-nvml-dev=12.1 -- cuda-nvrtc-dev=12.1 -- cuda-tools=12.1 -- cuda-version=12.1 +- cuda-nvml-dev=12.4 +- cuda-nvrtc-dev=12.4 +- cuda-tools=12.4 +- cuda-version=12.4 - cxx-compiler - doxygen=1.9.2 - flake8 - gcovr=5.2 - gdb -- glog=0.6 +- glog>=0.7.1,<0.8 - gtest=1.14 - gxx=11.2 - include-what-you-use=0.20 - libclang-cpp=16 - libclang=16 -- libgrpc=1.59 +- libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=24.02 -- libxml2=2.11.6 +- librmm=24.08 +- libxml2>=2.12.6,<3 - llvmdev=16 - ninja=1.11 - nlohmann_json=3.11 @@ -49,8 +49,8 @@ dependencies: - pytest-asyncio - pytest-timeout - python-graphviz -- python=3.10 +- python=3.11 - scikit-build=0.17 - ucx=1.15 - yapf -name: all_cuda-121_arch-x86_64 +name: all_cuda-124_arch-x86_64 diff --git a/conda/environments/ci_cuda-121_arch-x86_64.yaml b/conda/environments/ci_cuda-124_arch-x86_64.yaml similarity index 74% rename from conda/environments/ci_cuda-121_arch-x86_64.yaml rename to conda/environments/ci_cuda-124_arch-x86_64.yaml index 6d5ccef0a..9a5d66824 100644 --- a/conda/environments/ci_cuda-121_arch-x86_64.yaml +++ b/conda/environments/ci_cuda-124_arch-x86_64.yaml @@ -11,23 +11,23 @@ dependencies: - ccache - cmake=3.27 - codecov=2.1 -- cuda-cudart-dev=12.1 +- cuda-cudart-dev=12.4 - cuda-nvcc -- cuda-nvml-dev=12.1 -- cuda-nvrtc-dev=12.1 -- cuda-tools=12.1 -- cuda-version=12.1 +- cuda-nvml-dev=12.4 +- cuda-nvrtc-dev=12.4 +- cuda-tools=12.4 +- cuda-version=12.4 - cxx-compiler - doxygen=1.9.2 - gcovr=5.2 -- glog=0.6 +- glog>=0.7.1,<0.8 - gtest=1.14 - gxx=11.2 - include-what-you-use=0.20 -- libgrpc=1.59 +- libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=24.02 -- libxml2=2.11.6 +- librmm=24.08 +- libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 - numactl-libs-cos7-x86_64 @@ -38,7 +38,7 @@ dependencies: - pytest-asyncio - pytest-timeout - python-graphviz -- python=3.10 +- python=3.11 - scikit-build=0.17 - ucx=1.15 -name: ci_cuda-121_arch-x86_64 +name: ci_cuda-124_arch-x86_64 From dd99fcd6c7f33d82ac09234e4e6454036563d71f Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 1 Aug 2024 19:44:54 +0000 Subject: [PATCH 04/21] update 121_arch to 124_arch --- .devcontainer/opt/mrc/bin/post-attach-command.sh | 4 ++-- CONTRIBUTING.md | 2 +- Dockerfile | 4 ++-- README.md | 2 +- ci/scripts/github/common.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/opt/mrc/bin/post-attach-command.sh b/.devcontainer/opt/mrc/bin/post-attach-command.sh index e86c3a259..be6f27dff 100755 --- a/.devcontainer/opt/mrc/bin/post-attach-command.sh +++ b/.devcontainer/opt/mrc/bin/post-attach-command.sh @@ -28,6 +28,6 @@ sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc; if conda_env_find "${ENV_NAME}" ; \ -then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-121_arch-x86_64.yaml --prune; \ -else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-121_arch-x86_64.yaml; \ +then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-124_arch-x86_64.yaml --prune; \ +else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-124_arch-x86_64.yaml; \ fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6f64ff959..846c38a24 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -85,7 +85,7 @@ cd $MRC_ROOT #### Create MRC Conda environment ```bash # note: `mamba` may be used in place of `conda` for better performance. -conda env create -n mrc --file $MRC_ROOT/conda/environments/all_cuda-121_arch-x86_64.yaml +conda env create -n mrc --file $MRC_ROOT/conda/environments/all_cuda-124_arch-x86_64.yaml conda activate mrc ``` #### Build MRC diff --git a/Dockerfile b/Dockerfile index 989d5a1c1..1760faa52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,13 +45,13 @@ RUN useradd --uid $USER_UID --gid $USER_GID -m $USERNAME && \ echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \ chmod 0440 /etc/sudoers.d/$USERNAME -COPY ./conda/environments/all_cuda-121_arch-x86_64.yaml /opt/mrc/conda/environments/all_cuda-121_arch-x86_64.yaml +COPY ./conda/environments/all_cuda-124_arch-x86_64.yaml /opt/mrc/conda/environments/all_cuda-124_arch-x86_64.yaml RUN --mount=type=cache,target=/opt/conda/pkgs,sharing=locked \ echo "create env: ${PROJ_NAME}" && \ sudo -g conda -u $USERNAME \ CONDA_ALWAYS_YES=true \ - /opt/conda/bin/mamba env create -q -n ${PROJ_NAME} --file /opt/mrc/conda/environments/all_cuda-121_arch-x86_64.yaml && \ + /opt/conda/bin/mamba env create -q -n ${PROJ_NAME} --file /opt/mrc/conda/environments/all_cuda-124_arch-x86_64.yaml && \ chmod -R a+rwX /opt/conda && \ rm -rf /tmp/conda diff --git a/README.md b/README.md index c79ef1086..ba47836db 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ cd $MRC_ROOT #### Create MRC Conda Environment ```bash # note: `mamba` may be used in place of `conda` for better performance. -conda env create -n mrc-dev --file $MRC_ROOT/conda/environments/all_cuda-121_arch-x86_64.yaml +conda env create -n mrc-dev --file $MRC_ROOT/conda/environments/all_cuda-124_arch-x86_64.yaml conda activate mrc-dev ``` diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh index 542d9b4e9..4adcaa20d 100644 --- a/ci/scripts/github/common.sh +++ b/ci/scripts/github/common.sh @@ -35,7 +35,7 @@ id export NUM_PROC=${PARALLEL_LEVEL:-$(nproc)} export BUILD_CC=${BUILD_CC:-"gcc"} -export CONDA_ENV_YML="${MRC_ROOT}/conda/environments/all_cuda-121_arch-x86_64.yaml" +export CONDA_ENV_YML="${MRC_ROOT}/conda/environments/all_cuda-124_arch-x86_64.yaml" export CMAKE_BUILD_ALL_FEATURES="-DCMAKE_MESSAGE_CONTEXT_SHOW=ON -DMRC_BUILD_BENCHMARKS=ON -DMRC_BUILD_EXAMPLES=ON -DMRC_BUILD_PYTHON=ON -DMRC_BUILD_TESTS=ON -DMRC_USE_CONDA=ON -DMRC_PYTHON_BUILD_STUBS=ON" export CMAKE_BUILD_WITH_CODECOV="-DCMAKE_BUILD_TYPE=Debug -DMRC_ENABLE_CODECOV=ON -DMRC_PYTHON_PERFORM_INSTALL:BOOL=ON -DMRC_PYTHON_INPLACE_BUILD:BOOL=ON" From 2aed8f1af6920f1a99e98df312ff55dbad66e053 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 15 Aug 2024 19:31:01 +0000 Subject: [PATCH 05/21] rapids 24.06 --- .github/workflows/pr.yaml | 4 ++-- CMakeLists.txt | 2 +- .../recipes/libmrc/conda_build_config.yaml | 2 +- ci/conda/recipes/run_conda_build.sh | 2 +- ..._64.yaml => all_cuda-125_arch-x86_64.yaml} | 15 +++++++------- ...6_64.yaml => ci_cuda-125_arch-x86_64.yaml} | 15 +++++++------- dependencies.yaml | 20 +++++++++---------- python/mrc/_pymrc/src/logging.cpp | 2 +- 8 files changed, 30 insertions(+), 32 deletions(-) rename conda/environments/{all_cuda-124_arch-x86_64.yaml => all_cuda-125_arch-x86_64.yaml} (83%) rename conda/environments/{ci_cuda-124_arch-x86_64.yaml => ci_cuda-125_arch-x86_64.yaml} (80%) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index dce3cfeb6..fe1d1c263 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -49,7 +49,7 @@ jobs: - prepare - ci_pipe secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06 prepare: name: Prepare runs-on: ubuntu-latest @@ -72,7 +72,7 @@ jobs: needs: [prepare] if: ${{ !fromJSON(needs.prepare.outputs.has_skip_ci_label) && fromJSON(needs.prepare.outputs.is_pr )}} secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.06 with: enable_check_generated_files: false diff --git a/CMakeLists.txt b/CMakeLists.txt index 36109ad2e..685c0b6c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ option(MRC_USE_CONDA "Enables finding dependencies via conda. All dependencies m environment" ON) option(MRC_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF) -set(MRC_RAPIDS_VERSION "24.02" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") +set(MRC_RAPIDS_VERSION "24.06" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") set(MRC_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data") mark_as_advanced(MRC_CACHE_DIR) diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml index f16cfda2d..2cdc93770 100644 --- a/ci/conda/recipes/libmrc/conda_build_config.yaml +++ b/ci/conda/recipes/libmrc/conda_build_config.yaml @@ -30,4 +30,4 @@ python: # Setup the dependencies to build with multiple versions of RAPIDS rapids_version: # Keep around compatibility with current version -2 - - 24.02 + - 24.06 diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 9f60d4340..40476901c 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -95,7 +95,7 @@ fi # Choose default variants if hasArg quick; then # For quick build, just do most recent version of rapids - CONDA_ARGS_ARRAY+=("--variants" "{rapids_version: 24.02}") + CONDA_ARGS_ARRAY+=("--variants" "{rapids_version: 24.06}") fi # And default channels (should match dependencies.yaml) diff --git a/conda/environments/all_cuda-124_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml similarity index 83% rename from conda/environments/all_cuda-124_arch-x86_64.yaml rename to conda/environments/all_cuda-125_arch-x86_64.yaml index 5f41d0591..5f1dafa0b 100644 --- a/conda/environments/all_cuda-124_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -16,12 +16,11 @@ dependencies: - clangxx=16 - cmake=3.27 - codecov=2.1 -- cuda-cudart-dev=12.4 +- cuda-cudart-dev=12.5 - cuda-nvcc -- cuda-nvml-dev=12.4 -- cuda-nvrtc-dev=12.4 -- cuda-tools=12.4 -- cuda-version=12.4 +- cuda-nvml-dev=12.5 +- cuda-nvrtc-dev=12.5 +- cuda-version=12.5 - cxx-compiler - doxygen=1.9.2 - flake8 @@ -35,7 +34,7 @@ dependencies: - libclang=16 - libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=24.08 +- librmm=6 - libxml2>=2.12.6,<3 - llvmdev=16 - ninja=1.11 @@ -49,8 +48,8 @@ dependencies: - pytest-asyncio - pytest-timeout - python-graphviz -- python=3.11 +- python=3.10 - scikit-build=0.17 - ucx=1.15 - yapf -name: all_cuda-124_arch-x86_64 +name: all_cuda-125_arch-x86_64 diff --git a/conda/environments/ci_cuda-124_arch-x86_64.yaml b/conda/environments/ci_cuda-125_arch-x86_64.yaml similarity index 80% rename from conda/environments/ci_cuda-124_arch-x86_64.yaml rename to conda/environments/ci_cuda-125_arch-x86_64.yaml index 9a5d66824..538f8e3a5 100644 --- a/conda/environments/ci_cuda-124_arch-x86_64.yaml +++ b/conda/environments/ci_cuda-125_arch-x86_64.yaml @@ -11,12 +11,11 @@ dependencies: - ccache - cmake=3.27 - codecov=2.1 -- cuda-cudart-dev=12.4 +- cuda-cudart-dev=12.5 - cuda-nvcc -- cuda-nvml-dev=12.4 -- cuda-nvrtc-dev=12.4 -- cuda-tools=12.4 -- cuda-version=12.4 +- cuda-nvml-dev=12.5 +- cuda-nvrtc-dev=12.5 +- cuda-version=12.5 - cxx-compiler - doxygen=1.9.2 - gcovr=5.2 @@ -26,7 +25,7 @@ dependencies: - include-what-you-use=0.20 - libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=24.08 +- librmm=6 - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 @@ -38,7 +37,7 @@ dependencies: - pytest-asyncio - pytest-timeout - python-graphviz -- python=3.11 +- python=3.10 - scikit-build=0.17 - ucx=1.15 -name: ci_cuda-124_arch-x86_64 +name: ci_cuda-125_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index bebab5cc2..49dfc5352 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -3,7 +3,7 @@ files: all: output: conda matrix: - cuda: ["12.4"] + cuda: ["12.5"] arch: [x86_64] includes: - build @@ -21,7 +21,7 @@ files: ci: output: conda matrix: - cuda: ["12.4"] + cuda: ["12.5"] arch: [x86_64] includes: - build @@ -60,7 +60,7 @@ dependencies: - gxx=11.2 - libgrpc=1.62.2 - libhwloc=2.9.2 - - librmm=24.08 + - librmm=6 - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 @@ -137,17 +137,17 @@ dependencies: common: - output_types: [conda] packages: - - python=3.11 + - python=3.10 cudatoolkit: specific: - output_types: [conda] matrices: - matrix: - cuda: "12.4" + cuda: "12.5" packages: - - cuda-cudart-dev=12.4 - - cuda-nvml-dev=12.4 - - cuda-nvrtc-dev=12.4 - - cuda-tools=12.4 - - cuda-version=12.4 + - cuda-cudart-dev=12.5 + - cuda-nvml-dev=12.5 + - cuda-nvrtc-dev=12.5 + # - cuda-tools=12.5 + - cuda-version=12.5 diff --git a/python/mrc/_pymrc/src/logging.cpp b/python/mrc/_pymrc/src/logging.cpp index 1150340e8..d79852847 100644 --- a/python/mrc/_pymrc/src/logging.cpp +++ b/python/mrc/_pymrc/src/logging.cpp @@ -88,7 +88,7 @@ void log(const std::string& msg, int py_level, const std::string& filename, int LOG(WARNING) << "Log called prior to calling init_logging, initialized with defaults"; } - google::LogMessage(filename.c_str(), line, static_cast(py_level_to_mrc(py_level))).stream() << msg; + google::LogMessage(filename.c_str(), line, static_cast(py_level_to_mrc(py_level))).stream() << msg; } } // namespace mrc::pymrc From 9d2e1dfb269d38c0643312da428fe76bb1e6d644 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Thu, 15 Aug 2024 19:56:13 +0000 Subject: [PATCH 06/21] . --- external/utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/utilities b/external/utilities index fb2c9503f..26b29cff8 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit fb2c9503fbfdd08503013f712b8bc1e4d9869933 +Subproject commit 26b29cff8a55c19bb6fd2c59e5c5e1fea07d2f6f From 3266ad22cc9afc27d29ce190860bd90c67c51e8c Mon Sep 17 00:00:00 2001 From: Michael Demoret Date: Fri, 16 Aug 2024 18:30:21 -0400 Subject: [PATCH 07/21] Small tweaks to the build. --- ci/conda/recipes/libmrc/meta.yaml | 8 ++++---- cmake/dependencies.cmake | 16 +++------------- .../all_cuda-125_arch-x86_64.yaml | 6 +++--- .../environments/ci_cuda-125_arch-x86_64.yaml | 6 +++--- cpp/mrc/CMakeLists.txt | 19 +++++++++---------- cpp/mrc/include/mrc/core/utils.hpp | 1 + cpp/mrc/src/internal/utils/contains.hpp | 12 +++++++----- dependencies.yaml | 6 +++--- docs/quickstart/environment_cpp.yml | 4 ++-- external/utilities | 2 +- 10 files changed, 36 insertions(+), 44 deletions(-) diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml index 30916f85c..b3d777def 100644 --- a/ci/conda/recipes/libmrc/meta.yaml +++ b/ci/conda/recipes/libmrc/meta.yaml @@ -42,9 +42,9 @@ requirements: - cmake =3.27 - libtool - ninja =1.11 - - numactl-libs-cos7-x86_64 + - numactl =2.0.18 - pkg-config =0.29 - - sysroot_linux-64 >=2.17 + - sysroot_linux-64 >=2.28 host: # Libraries necessary to build. Keep sorted! - boost-cpp =1.84 @@ -80,8 +80,8 @@ outputs: - {{ compiler("cuda") }} - {{ compiler("cxx") }} - cmake =3.27 - - numactl-libs-cos7-x86_64 - - sysroot_linux-64 =2.17 + - numactl =2.0.18 + - sysroot_linux-64 >=2.28 host: # Any libraries with weak run_exports need to go here to be added to the run. Keep sorted! - boost-cpp =1.84 diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index f1e15d946..d4eb2d559 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -48,18 +48,8 @@ morpheus_utils_configure_cccl() # ================= morpheus_utils_configure_rmm() -# gflags -# ====== -rapids_find_package(gflags REQUIRED - GLOBAL_TARGETS gflags - BUILD_EXPORT_SET ${PROJECT_NAME}-exports - INSTALL_EXPORT_SET ${PROJECT_NAME}-exports -) - # glog # ==== -# - link against shared -# - todo: compile with -DWITH_GFLAGS=OFF and remove gflags dependency morpheus_utils_configure_glog() # nvidia cub @@ -73,9 +63,9 @@ find_path(CUB_INCLUDE_DIRS "cub/cub.cuh" # ========= rapids_find_package(gRPC REQUIRED GLOBAL_TARGETS - gRPC::address_sorting gRPC::gpr gRPC::grpc gRPC::grpc_unsecure gRPC::grpc++ gRPC::grpc++_alts gRPC::grpc++_error_details gRPC::grpc++_reflection - gRPC::grpc++_unsecure gRPC::grpc_plugin_support gRPC::grpcpp_channelz gRPC::upb gRPC::grpc_cpp_plugin gRPC::grpc_csharp_plugin gRPC::grpc_node_plugin - gRPC::grpc_objective_c_plugin gRPC::grpc_php_plugin gRPC::grpc_python_plugin gRPC::grpc_ruby_plugin + gRPC::address_sorting gRPC::gpr gRPC::grpc gRPC::grpc_unsecure gRPC::grpc++ gRPC::grpc++_alts gRPC::grpc++_error_details gRPC::grpc++_reflection + gRPC::grpc++_unsecure gRPC::grpc_plugin_support gRPC::grpcpp_channelz gRPC::upb gRPC::grpc_cpp_plugin gRPC::grpc_csharp_plugin gRPC::grpc_node_plugin + gRPC::grpc_objective_c_plugin gRPC::grpc_php_plugin gRPC::grpc_python_plugin gRPC::grpc_ruby_plugin BUILD_EXPORT_SET ${PROJECT_NAME}-exports INSTALL_EXPORT_SET ${PROJECT_NAME}-exports ) diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 5f1dafa0b..c8e8c774e 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -28,18 +28,18 @@ dependencies: - gdb - glog>=0.7.1,<0.8 - gtest=1.14 -- gxx=11.2 +- gxx=12.1 - include-what-you-use=0.20 - libclang-cpp=16 - libclang=16 - libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=6 +- librmm=24.06 - libxml2>=2.12.6,<3 - llvmdev=16 - ninja=1.11 - nlohmann_json=3.11 -- numactl-libs-cos7-x86_64 +- numactl=2.0.18 - numpy=1.24 - pkg-config=0.29 - pre-commit diff --git a/conda/environments/ci_cuda-125_arch-x86_64.yaml b/conda/environments/ci_cuda-125_arch-x86_64.yaml index 538f8e3a5..6efd7056d 100644 --- a/conda/environments/ci_cuda-125_arch-x86_64.yaml +++ b/conda/environments/ci_cuda-125_arch-x86_64.yaml @@ -21,15 +21,15 @@ dependencies: - gcovr=5.2 - glog>=0.7.1,<0.8 - gtest=1.14 -- gxx=11.2 +- gxx=12.1 - include-what-you-use=0.20 - libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=6 +- librmm=24.06 - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 -- numactl-libs-cos7-x86_64 +- numactl=2.0.18 - pkg-config=0.29 - pre-commit - pybind11-stubgen=0.10 diff --git a/cpp/mrc/CMakeLists.txt b/cpp/mrc/CMakeLists.txt index fbebef5cf..88ac29a70 100644 --- a/cpp/mrc/CMakeLists.txt +++ b/cpp/mrc/CMakeLists.txt @@ -163,19 +163,18 @@ add_library(${PROJECT_NAME}::libmrc ALIAS libmrc) target_link_libraries(libmrc PUBLIC - mrc_protos - mrc_architect_protos - rmm::rmm - CUDA::cudart - rxcpp::rxcpp - glog::glog - libcudacxx::libcudacxx - Boost::fiber Boost::context + Boost::fiber + CUDA::cudart glog::glog - gRPC::grpc++ - gRPC::grpc gRPC::gpr + gRPC::grpc + gRPC::grpc++ + libcudacxx::libcudacxx + mrc_architect_protos + mrc_protos + rmm::rmm + rxcpp::rxcpp PRIVATE hwloc::hwloc prometheus-cpp::core # private in MR !199 diff --git a/cpp/mrc/include/mrc/core/utils.hpp b/cpp/mrc/include/mrc/core/utils.hpp index 72d9089a7..bde8cc98e 100644 --- a/cpp/mrc/include/mrc/core/utils.hpp +++ b/cpp/mrc/include/mrc/core/utils.hpp @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/cpp/mrc/src/internal/utils/contains.hpp b/cpp/mrc/src/internal/utils/contains.hpp index 61d613692..e2fefb77b 100644 --- a/cpp/mrc/src/internal/utils/contains.hpp +++ b/cpp/mrc/src/internal/utils/contains.hpp @@ -29,13 +29,15 @@ bool contains(const ContainerT& container, const KeyT& key) } template -class KeyIterator : public std::iterator +class KeyIterator { public: + using iterator_category = std::bidirectional_iterator_tag; + using value_type = C::key_type; + using difference_type = C::difference_type; + using pointer = C::pointer; + using reference = C::reference; + KeyIterator() = default; explicit KeyIterator(typename C::const_iterator it) : m_iter(it) {} diff --git a/dependencies.yaml b/dependencies.yaml index 49dfc5352..fe86b0c67 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -57,14 +57,14 @@ dependencies: - cxx-compiler - glog>=0.7.1,<0.8 - gtest=1.14 - - gxx=11.2 + - gxx=12.1 - libgrpc=1.62.2 - libhwloc=2.9.2 - - librmm=6 + - librmm=24.06 - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 - - numactl-libs-cos7-x86_64 + - numactl=2.0.18 - pkg-config=0.29 - pybind11-stubgen=0.10 - scikit-build=0.17 diff --git a/docs/quickstart/environment_cpp.yml b/docs/quickstart/environment_cpp.yml index a8c0eb2c2..860d54a4c 100644 --- a/docs/quickstart/environment_cpp.yml +++ b/docs/quickstart/environment_cpp.yml @@ -24,14 +24,14 @@ dependencies: - isort - libtool - ninja=1.10 - - numactl-libs-cos7-x86_64 + - numactl=2.0.18 - numpy>=1.21 - nvcc_linux-64=11.8 - pkg-config=0.29 - python=3.10 - scikit-build>=0.12 - mrc=24.10 - - sysroot_linux-64=2.17 + - sysroot_linux-64>=2.28 - pip: - cython - flake8 diff --git a/external/utilities b/external/utilities index 26b29cff8..9984a4bdb 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 26b29cff8a55c19bb6fd2c59e5c5e1fea07d2f6f +Subproject commit 9984a4bdb5eb6de55d9c25dc3ad4ad1cd2679c39 From f4f2acfcc288ece94ec6b750c75c4a7dd227e217 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 23 Aug 2024 17:42:24 +0000 Subject: [PATCH 08/21] update CI container CUDA version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1760faa52..771c97c0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG FROM_IMAGE="rapidsai/ci-conda" -ARG CUDA_VER=12.1.1 +ARG CUDA_VER=12.5.1 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=22.04 ARG PYTHON_VER=3.10 From 1db63f7ab4812903467500dd031435debab7fc41 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 23 Aug 2024 17:48:23 +0000 Subject: [PATCH 09/21] update references of cuda 12.4 to 12.5 --- .devcontainer/opt/mrc/bin/post-attach-command.sh | 4 ++-- CONTRIBUTING.md | 2 +- Dockerfile | 4 ++-- README.md | 2 +- ci/scripts/github/common.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/opt/mrc/bin/post-attach-command.sh b/.devcontainer/opt/mrc/bin/post-attach-command.sh index be6f27dff..4af1fe68e 100755 --- a/.devcontainer/opt/mrc/bin/post-attach-command.sh +++ b/.devcontainer/opt/mrc/bin/post-attach-command.sh @@ -28,6 +28,6 @@ sed -ri "s/conda activate base/conda activate $ENV_NAME/g" ~/.bashrc; if conda_env_find "${ENV_NAME}" ; \ -then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-124_arch-x86_64.yaml --prune; \ -else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-124_arch-x86_64.yaml; \ +then mamba env update --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml --prune; \ +else mamba env create --name ${ENV_NAME} -f ${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml; \ fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 846c38a24..bd755b289 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -85,7 +85,7 @@ cd $MRC_ROOT #### Create MRC Conda environment ```bash # note: `mamba` may be used in place of `conda` for better performance. -conda env create -n mrc --file $MRC_ROOT/conda/environments/all_cuda-124_arch-x86_64.yaml +conda env create -n mrc --file $MRC_ROOT/conda/environments/all_cuda-125_arch-x86_64.yaml conda activate mrc ``` #### Build MRC diff --git a/Dockerfile b/Dockerfile index 771c97c0f..f2df5d0fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,13 +45,13 @@ RUN useradd --uid $USER_UID --gid $USER_GID -m $USERNAME && \ echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \ chmod 0440 /etc/sudoers.d/$USERNAME -COPY ./conda/environments/all_cuda-124_arch-x86_64.yaml /opt/mrc/conda/environments/all_cuda-124_arch-x86_64.yaml +COPY ./conda/environments/all_cuda-125_arch-x86_64.yaml /opt/mrc/conda/environments/all_cuda-125_arch-x86_64.yaml RUN --mount=type=cache,target=/opt/conda/pkgs,sharing=locked \ echo "create env: ${PROJ_NAME}" && \ sudo -g conda -u $USERNAME \ CONDA_ALWAYS_YES=true \ - /opt/conda/bin/mamba env create -q -n ${PROJ_NAME} --file /opt/mrc/conda/environments/all_cuda-124_arch-x86_64.yaml && \ + /opt/conda/bin/mamba env create -q -n ${PROJ_NAME} --file /opt/mrc/conda/environments/all_cuda-125_arch-x86_64.yaml && \ chmod -R a+rwX /opt/conda && \ rm -rf /tmp/conda diff --git a/README.md b/README.md index ba47836db..3baca24c3 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ cd $MRC_ROOT #### Create MRC Conda Environment ```bash # note: `mamba` may be used in place of `conda` for better performance. -conda env create -n mrc-dev --file $MRC_ROOT/conda/environments/all_cuda-124_arch-x86_64.yaml +conda env create -n mrc-dev --file $MRC_ROOT/conda/environments/all_cuda-125_arch-x86_64.yaml conda activate mrc-dev ``` diff --git a/ci/scripts/github/common.sh b/ci/scripts/github/common.sh index 4adcaa20d..6b5ba72bd 100644 --- a/ci/scripts/github/common.sh +++ b/ci/scripts/github/common.sh @@ -35,7 +35,7 @@ id export NUM_PROC=${PARALLEL_LEVEL:-$(nproc)} export BUILD_CC=${BUILD_CC:-"gcc"} -export CONDA_ENV_YML="${MRC_ROOT}/conda/environments/all_cuda-124_arch-x86_64.yaml" +export CONDA_ENV_YML="${MRC_ROOT}/conda/environments/all_cuda-125_arch-x86_64.yaml" export CMAKE_BUILD_ALL_FEATURES="-DCMAKE_MESSAGE_CONTEXT_SHOW=ON -DMRC_BUILD_BENCHMARKS=ON -DMRC_BUILD_EXAMPLES=ON -DMRC_BUILD_PYTHON=ON -DMRC_BUILD_TESTS=ON -DMRC_USE_CONDA=ON -DMRC_PYTHON_BUILD_STUBS=ON" export CMAKE_BUILD_WITH_CODECOV="-DCMAKE_BUILD_TYPE=Debug -DMRC_ENABLE_CODECOV=ON -DMRC_PYTHON_PERFORM_INSTALL:BOOL=ON -DMRC_PYTHON_INPLACE_BUILD:BOOL=ON" From 61ce6232224884254b53af44e214cf788c503b15 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 28 Aug 2024 16:24:12 +0000 Subject: [PATCH 10/21] update rapids dep to 24.10 --- .github/workflows/pr.yaml | 8 ++++---- CMakeLists.txt | 2 +- ci/conda/recipes/run_conda_build.sh | 2 +- ci/scripts/run_ci_local.sh | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/environments/ci_cuda-125_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index fe1d1c263..c21e54573 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -49,7 +49,7 @@ jobs: - prepare - ci_pipe secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 prepare: name: Prepare runs-on: ubuntu-latest @@ -72,7 +72,7 @@ jobs: needs: [prepare] if: ${{ !fromJSON(needs.prepare.outputs.has_skip_ci_label) && fromJSON(needs.prepare.outputs.is_pr )}} secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.06 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 with: enable_check_generated_files: false @@ -89,9 +89,9 @@ jobs: # Update conda package only for non PR branches. Use 'main' for main branch and 'dev' for all other branches conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }} # Build container - container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-240214 + container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-240823 # Test container - test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-240214 + test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-240823 # Info about the PR. Empty for non PR branches. Useful for extracting PR number, title, etc. pr_info: ${{ needs.prepare.outputs.pr_info }} secrets: diff --git a/CMakeLists.txt b/CMakeLists.txt index ca636c139..c4ff438bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ option(MRC_USE_CONDA "Enables finding dependencies via conda. All dependencies m environment" ON) option(MRC_USE_IWYU "Enable running include-what-you-use as part of the build process" OFF) -set(MRC_RAPIDS_VERSION "24.06" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") +set(MRC_RAPIDS_VERSION "24.10" CACHE STRING "Which version of RAPIDS to build for. Sets default versions for RAPIDS CMake and RMM.") set(MRC_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data") mark_as_advanced(MRC_CACHE_DIR) diff --git a/ci/conda/recipes/run_conda_build.sh b/ci/conda/recipes/run_conda_build.sh index 40476901c..263a93388 100755 --- a/ci/conda/recipes/run_conda_build.sh +++ b/ci/conda/recipes/run_conda_build.sh @@ -95,7 +95,7 @@ fi # Choose default variants if hasArg quick; then # For quick build, just do most recent version of rapids - CONDA_ARGS_ARRAY+=("--variants" "{rapids_version: 24.06}") + CONDA_ARGS_ARRAY+=("--variants" "{rapids_version: 24.10}") fi # And default channels (should match dependencies.yaml) diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh index e2da9f6cd..8050fe773 100755 --- a/ci/scripts/run_ci_local.sh +++ b/ci/scripts/run_ci_local.sh @@ -58,7 +58,7 @@ GIT_BRANCH=$(git branch --show-current) GIT_COMMIT=$(git log -n 1 --pretty=format:%H) BASE_LOCAL_CI_TMP=${BASE_LOCAL_CI_TMP:-${MRC_ROOT}/.tmp/local_ci_tmp} -CONTAINER_VER=${CONTAINER_VER:-240214} +CONTAINER_VER=${CONTAINER_VER:-240823} CUDA_VER=${CUDA_VER:-12.1} DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""} diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index c8e8c774e..627bc5e64 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -34,7 +34,7 @@ dependencies: - libclang=16 - libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=24.06 +- librmm=24.10 - libxml2>=2.12.6,<3 - llvmdev=16 - ninja=1.11 diff --git a/conda/environments/ci_cuda-125_arch-x86_64.yaml b/conda/environments/ci_cuda-125_arch-x86_64.yaml index 6efd7056d..da471b1ce 100644 --- a/conda/environments/ci_cuda-125_arch-x86_64.yaml +++ b/conda/environments/ci_cuda-125_arch-x86_64.yaml @@ -25,7 +25,7 @@ dependencies: - include-what-you-use=0.20 - libgrpc=1.62.2 - libhwloc=2.9.2 -- librmm=24.06 +- librmm=24.10 - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 diff --git a/dependencies.yaml b/dependencies.yaml index fe86b0c67..338130cf7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -60,7 +60,7 @@ dependencies: - gxx=12.1 - libgrpc=1.62.2 - libhwloc=2.9.2 - - librmm=24.06 + - librmm=24.10 - libxml2>=2.12.6,<3 - ninja=1.11 - nlohmann_json=3.11 From 1daf9776174c795ae4409462cf76429018f2a3a6 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 30 Aug 2024 18:20:44 +0000 Subject: [PATCH 11/21] use rapids_cpm_* for gbench and gtest --- cmake/dependencies.cmake | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index d4eb2d559..477bb374e 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -91,26 +91,18 @@ morpheus_utils_configure_prometheus_cpp() if(MRC_BUILD_BENCHMARKS) # google benchmark # ================ - rapids_find_package(benchmark REQUIRED - GLOBAL_TARGETS benchmark::benchmark + include(${rapids-cmake-dir}/cpm/gbench.cmake) + rapids_cpm_gbench( BUILD_EXPORT_SET ${PROJECT_NAME}-exports - - # No install set - FIND_ARGS - CONFIG ) endif() if(MRC_BUILD_TESTS) # google test # =========== - rapids_find_package(GTest REQUIRED - GLOBAL_TARGETS GTest::gtest GTest::gmock GTest::gtest_main GTest::gmock_main + include(${rapids-cmake-dir}/cpm/gtest.cmake) + rapids_cpm_gtest( BUILD_EXPORT_SET ${PROJECT_NAME}-exports - - # No install set - FIND_ARGS - CONFIG ) endif() From 38cdae7e3ed92387f5f8ba64fa04ab115244f685 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 17:07:53 +0000 Subject: [PATCH 12/21] update meta.yaml --- ci/conda/recipes/libmrc/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml index b3d777def..2664ba474 100644 --- a/ci/conda/recipes/libmrc/meta.yaml +++ b/ci/conda/recipes/libmrc/meta.yaml @@ -15,7 +15,7 @@ {% set version = environ.get('GIT_VERSION', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} {% set py_version = environ.get('CONDA_PY', '3.10') %} -{% set cuda_version = '.'.join(environ.get('CUDA', '12.1').split('.')[:2]) %} +{% set cuda_version = '.'.join(environ.get('CUDA', '12.5').split('.')[:2]) %} package: name: libmrc-split @@ -53,8 +53,8 @@ requirements: - cuda-nvrtc-dev {{ cuda_version }}.* - cuda-version {{ cuda_version }}.* - doxygen 1.10.0 - - glog =0.6 - - libgrpc =1.59 + - glog>=0.7.1,<0.8 + - libgrpc =1.62.2 - gtest =1.14 - libhwloc =2.9.2 - librmm {{ rapids_version }} @@ -86,8 +86,8 @@ outputs: # Any libraries with weak run_exports need to go here to be added to the run. Keep sorted! - boost-cpp =1.84 - cuda-version # Needed to allow pin_compatible to work - - glog =0.6 - - libgrpc =1.59 + - glog>=0.7.1,<0.8 + - libgrpc =1.62.2 - libhwloc =2.9.2 - librmm {{ rapids_version }} - nlohmann_json =3.11 From 35c28be7fd60c10c428cded12eb48112d7a2f4f2 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 17:10:39 +0000 Subject: [PATCH 13/21] update CI image --- .github/workflows/pr.yaml | 4 ++-- ci/scripts/run_ci_local.sh | 2 +- external/utilities | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c21e54573..6f36c3754 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -89,9 +89,9 @@ jobs: # Update conda package only for non PR branches. Use 'main' for main branch and 'dev' for all other branches conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }} # Build container - container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-240823 + container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-build-241002 # Test container - test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-240823 + test_container: nvcr.io/ea-nvidia-morpheus/morpheus:mrc-ci-test-241002 # Info about the PR. Empty for non PR branches. Useful for extracting PR number, title, etc. pr_info: ${{ needs.prepare.outputs.pr_info }} secrets: diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh index 8050fe773..41299c3fb 100755 --- a/ci/scripts/run_ci_local.sh +++ b/ci/scripts/run_ci_local.sh @@ -58,7 +58,7 @@ GIT_BRANCH=$(git branch --show-current) GIT_COMMIT=$(git log -n 1 --pretty=format:%H) BASE_LOCAL_CI_TMP=${BASE_LOCAL_CI_TMP:-${MRC_ROOT}/.tmp/local_ci_tmp} -CONTAINER_VER=${CONTAINER_VER:-240823} +CONTAINER_VER=${CONTAINER_VER:-241002} CUDA_VER=${CUDA_VER:-12.1} DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""} diff --git a/external/utilities b/external/utilities index 9984a4bdb..c141827de 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 9984a4bdb5eb6de55d9c25dc3ad4ad1cd2679c39 +Subproject commit c141827dedccb6d01052477e22dbf7bf47dec5c0 From feb9ceb9ea493f36274a47c4b09c67e144b46c12 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 19:26:38 +0000 Subject: [PATCH 14/21] styles --- cpp/mrc/src/internal/utils/contains.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/mrc/src/internal/utils/contains.hpp b/cpp/mrc/src/internal/utils/contains.hpp index e2fefb77b..0160068d5 100644 --- a/cpp/mrc/src/internal/utils/contains.hpp +++ b/cpp/mrc/src/internal/utils/contains.hpp @@ -32,11 +32,11 @@ template class KeyIterator { public: - using iterator_category = std::bidirectional_iterator_tag; - using value_type = C::key_type; - using difference_type = C::difference_type; - using pointer = C::pointer; - using reference = C::reference; + using iterator_category_t = std::bidirectional_iterator_tag; + using value_type = C::key_type; + using difference_type = C::difference_type; + using pointer_t = C::pointer; + using reference_t = C::reference; KeyIterator() = default; explicit KeyIterator(typename C::const_iterator it) : m_iter(it) {} From af4470d52dc37511558a5c8729edd11623d8969c Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 19:47:02 +0000 Subject: [PATCH 15/21] fix libxml2 version to avoid bug in libhwloc --- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/environments/ci_cuda-125_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 627bc5e64..1e672e8b0 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -35,7 +35,7 @@ dependencies: - libgrpc=1.62.2 - libhwloc=2.9.2 - librmm=24.10 -- libxml2>=2.12.6,<3 +- libxml2=2.11.6 - llvmdev=16 - ninja=1.11 - nlohmann_json=3.11 diff --git a/conda/environments/ci_cuda-125_arch-x86_64.yaml b/conda/environments/ci_cuda-125_arch-x86_64.yaml index da471b1ce..78cf2d601 100644 --- a/conda/environments/ci_cuda-125_arch-x86_64.yaml +++ b/conda/environments/ci_cuda-125_arch-x86_64.yaml @@ -26,7 +26,7 @@ dependencies: - libgrpc=1.62.2 - libhwloc=2.9.2 - librmm=24.10 -- libxml2>=2.12.6,<3 +- libxml2=2.11.6 - ninja=1.11 - nlohmann_json=3.11 - numactl=2.0.18 diff --git a/dependencies.yaml b/dependencies.yaml index 338130cf7..30de9f1cc 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -61,7 +61,7 @@ dependencies: - libgrpc=1.62.2 - libhwloc=2.9.2 - librmm=24.10 - - libxml2>=2.12.6,<3 + - libxml2=2.11.6 - ninja=1.11 - nlohmann_json=3.11 - numactl=2.0.18 From 0ac4dc6cc779793b33524610a917141d2c748f4f Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 20:03:04 +0000 Subject: [PATCH 16/21] styles --- python/mrc/_pymrc/src/logging.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/mrc/_pymrc/src/logging.cpp b/python/mrc/_pymrc/src/logging.cpp index d79852847..09eab574a 100644 --- a/python/mrc/_pymrc/src/logging.cpp +++ b/python/mrc/_pymrc/src/logging.cpp @@ -88,7 +88,8 @@ void log(const std::string& msg, int py_level, const std::string& filename, int LOG(WARNING) << "Log called prior to calling init_logging, initialized with defaults"; } - google::LogMessage(filename.c_str(), line, static_cast(py_level_to_mrc(py_level))).stream() << msg; + google::LogMessage(filename.c_str(), line, static_cast(py_level_to_mrc(py_level))).stream() + << msg; } } // namespace mrc::pymrc From cd72f9a275f1141fd59c76ce20972448b9437e57 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 20:24:01 +0000 Subject: [PATCH 17/21] update copyright year --- cpp/mrc/include/mrc/core/utils.hpp | 2 +- cpp/mrc/src/internal/utils/contains.hpp | 2 +- python/mrc/_pymrc/src/logging.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/mrc/include/mrc/core/utils.hpp b/cpp/mrc/include/mrc/core/utils.hpp index bde8cc98e..78410149a 100644 --- a/cpp/mrc/include/mrc/core/utils.hpp +++ b/cpp/mrc/include/mrc/core/utils.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"); diff --git a/cpp/mrc/src/internal/utils/contains.hpp b/cpp/mrc/src/internal/utils/contains.hpp index 0160068d5..690b8e9b2 100644 --- a/cpp/mrc/src/internal/utils/contains.hpp +++ b/cpp/mrc/src/internal/utils/contains.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"); diff --git a/python/mrc/_pymrc/src/logging.cpp b/python/mrc/_pymrc/src/logging.cpp index 09eab574a..73455caa5 100644 --- a/python/mrc/_pymrc/src/logging.cpp +++ b/python/mrc/_pymrc/src/logging.cpp @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); From 7489d5a2ee7533b836c4b8ff0f922122c6862a49 Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 20:58:36 +0000 Subject: [PATCH 18/21] fix docs build for bad mrc import --- docs/quickstart/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/quickstart/CMakeLists.txt b/docs/quickstart/CMakeLists.txt index ef55ee70d..b201248c6 100644 --- a/docs/quickstart/CMakeLists.txt +++ b/docs/quickstart/CMakeLists.txt @@ -42,7 +42,7 @@ set(OPTION_PREFIX "MRC") morpheus_utils_python_configure() -rapids_find_package(mrc REQUIRED) +morpheus_utils_configure_mrc() rapids_find_package(CUDAToolkit REQUIRED) # To make it easier for CI to find output files, set the default executable suffix to .x if not set From 984a9d71183ffca0793e59b8033738f8ea2faa1b Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Wed, 2 Oct 2024 21:38:49 +0000 Subject: [PATCH 19/21] update utilities submodule --- external/utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/utilities b/external/utilities index c141827de..6e10e2c9a 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit c141827dedccb6d01052477e22dbf7bf47dec5c0 +Subproject commit 6e10e2c9a686041fdeb3d9e100874c6fa55f0856 From 32c8fb6f76d1bee21a07f00355b05464a42e660f Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 4 Oct 2024 01:08:14 +0000 Subject: [PATCH 20/21] update conda build config --- ci/conda/recipes/libmrc/conda_build_config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml index 2cdc93770..0ab4a5dd9 100644 --- a/ci/conda/recipes/libmrc/conda_build_config.yaml +++ b/ci/conda/recipes/libmrc/conda_build_config.yaml @@ -14,20 +14,20 @@ # limitations under the License. c_compiler_version: - - 11.2 + - 12.1 cxx_compiler_version: - - 11.2 + - 12.1 cuda_compiler: - cuda-nvcc cuda_compiler_version: - - 12.1 + - 12.5 python: - 3.10 # Setup the dependencies to build with multiple versions of RAPIDS rapids_version: # Keep around compatibility with current version -2 - - 24.06 + - 24.10 From ca9a96a7599f649373be3a7d1d6fbfe1791b200c Mon Sep 17 00:00:00 2001 From: Christopher Harris Date: Fri, 4 Oct 2024 02:53:06 +0000 Subject: [PATCH 21/21] remove unnecessary `cuda-tools` comment from dependencies.yaml --- dependencies.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index 30de9f1cc..22e206c14 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -149,5 +149,4 @@ dependencies: - cuda-cudart-dev=12.5 - cuda-nvml-dev=12.5 - cuda-nvrtc-dev=12.5 - # - cuda-tools=12.5 - cuda-version=12.5