From 8f3cccc169e72bdcaea3a7427ffc1ae2fde218d1 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 8 May 2024 21:40:42 +0000 Subject: [PATCH 01/17] proclaim return types for CCCL 2.4+ --- cpp/src/arima/batched_arima.cu | 2 +- cpp/src/hdbscan/condensed_hierarchy.cu | 2 +- cpp/src/hdbscan/detail/select.cuh | 2 +- cpp/src/hdbscan/detail/utils.h | 2 +- cpp/src/tsne/distances.cuh | 2 +- cpp/src/tsne/utils.cuh | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cpp/src/arima/batched_arima.cu b/cpp/src/arima/batched_arima.cu index 187fc7923b..2b262df412 100644 --- a/cpp/src/arima/batched_arima.cu +++ b/cpp/src/arima/batched_arima.cu @@ -84,7 +84,7 @@ struct is_missing { typedef T argument_type; typedef T result_type; - __thrust_exec_check_disable__ __device__ const T operator()(const T& x) const { return isnan(x); } + __device__ const T operator()(const T& x) const { return isnan(x); } }; // end is_missing bool detect_missing(raft::handle_t& handle, const double* d_y, int n_elem) diff --git a/cpp/src/hdbscan/condensed_hierarchy.cu b/cpp/src/hdbscan/condensed_hierarchy.cu index 20f155b012..328016f1e2 100644 --- a/cpp/src/hdbscan/condensed_hierarchy.cu +++ b/cpp/src/hdbscan/condensed_hierarchy.cu @@ -156,7 +156,7 @@ void CondensedHierarchy::condense(value_idx* full_parents, thrust::cuda::par.on(stream), full_sizes, full_sizes + size, - [=] __device__(value_idx a) { return a != -1; }, + [=] __device__(value_idx a) -> bool { return a != -1; }, 0, thrust::plus()); diff --git a/cpp/src/hdbscan/detail/select.cuh b/cpp/src/hdbscan/detail/select.cuh index 3bf17c437f..f8230c2a19 100644 --- a/cpp/src/hdbscan/detail/select.cuh +++ b/cpp/src/hdbscan/detail/select.cuh @@ -220,7 +220,7 @@ void excess_of_mass(const raft::handle_t& handle, exec_policy, children + indptr_h[node], children + indptr_h[node + 1], - [=] __device__(value_idx a) { return stability[a]; }, + [=] __device__(value_idx a) -> value_t { return stability[a]; }, 0.0, thrust::plus()); } diff --git a/cpp/src/hdbscan/detail/utils.h b/cpp/src/hdbscan/detail/utils.h index 092dc2e673..a0bb5ab542 100644 --- a/cpp/src/hdbscan/detail/utils.h +++ b/cpp/src/hdbscan/detail/utils.h @@ -114,7 +114,7 @@ Common::CondensedHierarchy make_cluster_tree( thrust_policy, sizes, sizes + condensed_tree.get_n_edges(), - [=] __device__(value_idx a) { return a > 1; }, + [=] __device__(value_idx a) -> bool { return a > 1; }, 0, thrust::plus()); diff --git a/cpp/src/tsne/distances.cuh b/cpp/src/tsne/distances.cuh index d9e831cc34..ff76f3dba4 100644 --- a/cpp/src/tsne/distances.cuh +++ b/cpp/src/tsne/distances.cuh @@ -162,7 +162,7 @@ void get_distances(const raft::handle_t& handle, template void normalize_distances(value_t* distances, const size_t total_nn, cudaStream_t stream) { - auto abs_f = [] __device__(const value_t& x) { return abs(x); }; + auto abs_f = [] __device__(const value_t& x) -> value_t { return abs(x); }; value_t maxNorm = thrust::transform_reduce(rmm::exec_policy(stream), distances, distances + total_nn, diff --git a/cpp/src/tsne/utils.cuh b/cpp/src/tsne/utils.cuh index 5b3d008c25..895fe412d2 100644 --- a/cpp/src/tsne/utils.cuh +++ b/cpp/src/tsne/utils.cuh @@ -39,6 +39,7 @@ #include #include +#include #include #include From 742cd3514731be32d0d2a2a5729ea976f7549282 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 8 May 2024 22:07:36 +0000 Subject: [PATCH 02/17] hide RAFT pragma deprecation messages --- cpp/cmake/modules/ConfigureCUDA.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/modules/ConfigureCUDA.cmake b/cpp/cmake/modules/ConfigureCUDA.cmake index b6c49bb2c2..7a242de424 100644 --- a/cpp/cmake/modules/ConfigureCUDA.cmake +++ b/cpp/cmake/modules/ConfigureCUDA.cmake @@ -31,8 +31,8 @@ endif() list(APPEND CUML_CUDA_FLAGS -Xcompiler=-Wall,-Werror,-Wno-error=deprecated-declarations,-Wno-error=sign-compare) if(DISABLE_DEPRECATION_WARNINGS) - list(APPEND CUML_CXX_FLAGS -Wno-deprecated-declarations) - list(APPEND CUML_CUDA_FLAGS -Wno-deprecated-declarations -Xcompiler=-Wno-deprecated-declarations) + list(APPEND CUML_CXX_FLAGS -Wno-deprecated-declarations -DRAFT_HIDE_DEPRECATION_WARNINGS) + list(APPEND CUML_CUDA_FLAGS -Wno-deprecated-declarations -Xcompiler=-Wno-deprecated-declarations -DRAFT_HIDE_DEPRECATION_WARNINGS) endif() # make sure we produce smallest binary size From 005e11567b45e18fd6ff3d0696de45510fdad90a Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 8 May 2024 22:14:14 +0000 Subject: [PATCH 03/17] use cuda::proclaim_return_type --- cpp/src/hdbscan/condensed_hierarchy.cu | 3 ++- cpp/src/hdbscan/detail/utils.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cpp/src/hdbscan/condensed_hierarchy.cu b/cpp/src/hdbscan/condensed_hierarchy.cu index 328016f1e2..76f1a19cf8 100644 --- a/cpp/src/hdbscan/condensed_hierarchy.cu +++ b/cpp/src/hdbscan/condensed_hierarchy.cu @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -156,7 +157,7 @@ void CondensedHierarchy::condense(value_idx* full_parents, thrust::cuda::par.on(stream), full_sizes, full_sizes + size, - [=] __device__(value_idx a) -> bool { return a != -1; }, + cuda::proclaim_return_type([=] __device__(value_idx a) -> bool { return a != -1; }), 0, thrust::plus()); diff --git a/cpp/src/hdbscan/detail/utils.h b/cpp/src/hdbscan/detail/utils.h index a0bb5ab542..b151628429 100644 --- a/cpp/src/hdbscan/detail/utils.h +++ b/cpp/src/hdbscan/detail/utils.h @@ -114,7 +114,7 @@ Common::CondensedHierarchy make_cluster_tree( thrust_policy, sizes, sizes + condensed_tree.get_n_edges(), - [=] __device__(value_idx a) -> bool { return a > 1; }, + cuda::proclaim_return_type([=] __device__(value_idx a) -> bool { return a > 1; }), 0, thrust::plus()); From a752723afea59bf1f0605cbd782dbb1d979f9b4d Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 8 May 2024 15:28:42 -0700 Subject: [PATCH 04/17] use cuda::proclaim_return_type some more --- cpp/src/hdbscan/detail/select.cuh | 15 ++++++++------- cpp/src/tsne/distances.cuh | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cpp/src/hdbscan/detail/select.cuh b/cpp/src/hdbscan/detail/select.cuh index f8230c2a19..36e674e40b 100644 --- a/cpp/src/hdbscan/detail/select.cuh +++ b/cpp/src/hdbscan/detail/select.cuh @@ -216,13 +216,14 @@ void excess_of_mass(const raft::handle_t& handle, value_t subtree_stability = 0.0; if (indptr_h[node + 1] - indptr_h[node] > 0) { - subtree_stability = thrust::transform_reduce( - exec_policy, - children + indptr_h[node], - children + indptr_h[node + 1], - [=] __device__(value_idx a) -> value_t { return stability[a]; }, - 0.0, - thrust::plus()); + subtree_stability = + thrust::transform_reduce(exec_policy, + children + indptr_h[node], + children + indptr_h[node + 1], + cuda::proclaim_return_type( + [=] __device__(value_idx a) -> value_t { return stability[a]; }), + 0.0, + thrust::plus()); } if (subtree_stability > node_stability || cluster_sizes_h[node] > max_cluster_size) { diff --git a/cpp/src/tsne/distances.cuh b/cpp/src/tsne/distances.cuh index ff76f3dba4..a221d70820 100644 --- a/cpp/src/tsne/distances.cuh +++ b/cpp/src/tsne/distances.cuh @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -162,7 +163,8 @@ void get_distances(const raft::handle_t& handle, template void normalize_distances(value_t* distances, const size_t total_nn, cudaStream_t stream) { - auto abs_f = [] __device__(const value_t& x) -> value_t { return abs(x); }; + auto abs_f = cuda::proclaim_return_type( + [] __device__(const value_t& x) -> value_t { return abs(x); }); value_t maxNorm = thrust::transform_reduce(rmm::exec_policy(stream), distances, distances + total_nn, From 13cc2a27ad79ce848c6db55b8a073dc21b76a664 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 8 May 2024 22:38:18 +0000 Subject: [PATCH 05/17] fix lint --- cpp/cmake/modules/ConfigureCUDA.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake/modules/ConfigureCUDA.cmake b/cpp/cmake/modules/ConfigureCUDA.cmake index 7a242de424..60cc5dae15 100644 --- a/cpp/cmake/modules/ConfigureCUDA.cmake +++ b/cpp/cmake/modules/ConfigureCUDA.cmake @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2018-2022, NVIDIA CORPORATION. +# Copyright (c) 2018-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 70b3d7a0667c48b92d26d1097e8f61722d8caa27 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 9 May 2024 20:29:58 +0000 Subject: [PATCH 06/17] define cxx and cuda standards --- cpp/bench/CMakeLists.txt | 4 ++++ cpp/test/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt index 1eccd65ba4..8e428ba3db 100644 --- a/cpp/bench/CMakeLists.txt +++ b/cpp/bench/CMakeLists.txt @@ -61,6 +61,10 @@ if(BUILD_CUML_BENCH) set_target_properties( ${CUML_CPP_BENCH_TARGET} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib" + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CUDA_STANDARD 17 + CUDA_STANDARD_REQUIRED ON ) install( diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index 0033c844ae..2a04100cdf 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -85,6 +85,10 @@ function(ConfigureTest) set_target_properties( ${_CUML_TEST_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib" + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CUDA_STANDARD 17 + CUDA_STANDARD_REQUIRED ON ) set(_CUML_TEST_COMPONENT_NAME testing) From 0f7bd6c53ec2c7087b6f30cf9d1d8868ecce42bd Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 9 May 2024 20:30:05 +0000 Subject: [PATCH 07/17] update devcontainer workflow to use NVIDIA/cccl#pull-request/1667 --- .github/workflows/pr.yaml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 933db0304d..d4f42d582e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -136,6 +136,24 @@ jobs: cuda: '["12.2"]' extra-repo-deploy-key: CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY build_command: | + # Tell rapids-cmake to use custom CCCL and cuCollections forks + rapids_branch="$(yq '.x-git-defaults.tag' /opt/rapids-build-utils/manifest.yaml)"; + rapids_version="${rapids_branch#branch-}"; + curl -fsSL -o- https://raw.githubusercontent.com/trxcllnt/rapids-cmake/branch-24.04-cccl-2.4.0/rapids-cmake/cpm/patches/cccl/revert_pr_211.diff \ + | tee ~/rapids-cmake-revert_pr_211.diff; + curl -fsSL -o- "https://raw.githubusercontent.com/rapidsai/rapids-cmake/${rapids_branch}/rapids-cmake/cpm/versions.json" \ + | jq -r ".packages.CCCL *= {\"version\": \"2.5.0\", \"git_tag\": \"pull-request/1667\"}" \ + | jq -r "(.packages.CCCL.patches[] | select(.file == \"cccl/revert_pr_211.diff\")).file = \"${HOME}/rapids-cmake-revert_pr_211.diff\"" \ + | jq -r ".packages.cuco *= {\"git_url\": \"https://github.com/trxcllnt/cuCollections.git\", \"git_tag\": \"rapids-${rapids_version}-cccl-2.5.0\", \"always_download\": true}" \ + | tee ~/rapids-cmake-override-versions.json; sccache -z; - build-all --verbose; + build-all \ + -j$(nproc --ignore=1) -v \ + -DBUILD_CUML_BENCH=ON \ + -DBUILD_CUML_TESTS=ON \ + -DBUILD_CUML_MG_TESTS=ON \ + -DBUILD_PRIMS_TESTS=ON \ + -DCMAKE_CXX_FLAGS="-ftemplate-backtrace-limit=0" \ + -DCMAKE_CUDA_FLAGS="-ftemplate-backtrace-limit=0" \ + -DRAPIDS_CMAKE_CPM_DEFAULT_VERSION_FILE="${HOME}/rapids-cmake-override-versions.json"; sccache -s; From 011d93a2d70660d1d82300439b9fc3f4edd3268a Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 9 May 2024 20:58:03 +0000 Subject: [PATCH 08/17] remove -DBUILD_CUML_MG_TESTS=ON --- .github/workflows/pr.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d4f42d582e..2a9a25fcb3 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -151,7 +151,6 @@ jobs: -j$(nproc --ignore=1) -v \ -DBUILD_CUML_BENCH=ON \ -DBUILD_CUML_TESTS=ON \ - -DBUILD_CUML_MG_TESTS=ON \ -DBUILD_PRIMS_TESTS=ON \ -DCMAKE_CXX_FLAGS="-ftemplate-backtrace-limit=0" \ -DCMAKE_CUDA_FLAGS="-ftemplate-backtrace-limit=0" \ From bfbe3f5f10f8d61e5dd98e803a3e55c1956a1a92 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 9 May 2024 21:04:40 +0000 Subject: [PATCH 09/17] add multi-gpu dependencies to pip devcontainer --- .devcontainer/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9d35e3f97f..f69161d32c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,6 +7,11 @@ FROM ${BASE} as pip-base ENV DEFAULT_VIRTUAL_ENV=rapids +RUN apt update -y \ + && DEBIAN_FRONTEND=noninteractive apt install -y \ + libblas-dev liblapack-dev libopenmpi-dev \ + && rm -rf /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/*; + FROM ${BASE} as conda-base ENV DEFAULT_CONDA_ENV=rapids From 407de5c7faf46d65bb583d37506da76baf5ef116 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Mon, 13 May 2024 18:22:52 +0000 Subject: [PATCH 10/17] fix lint --- cpp/bench/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt index 8e428ba3db..4f8c312717 100644 --- a/cpp/bench/CMakeLists.txt +++ b/cpp/bench/CMakeLists.txt @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2019-2023, NVIDIA CORPORATION. +# Copyright (c) 2019-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 363a4aad367e0e5a8a382f69f07dd5b7ffc3ee16 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 14 May 2024 21:53:20 +0000 Subject: [PATCH 11/17] test rapids-cmake with CCCL 2.5 --- rapids_config.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rapids_config.cmake b/rapids_config.cmake index f064a5b497..aea0422b80 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,6 +26,9 @@ else() ) endif() +set(rapids-cmake-repo trxcllnt/rapids-cmake) +set(rapids-cmake-branch fea/cccl-2.5) + if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/CUML_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") file( DOWNLOAD From 8855bb05fbee9ebc79556ed774675f7a097184c2 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 14 May 2024 21:53:27 +0000 Subject: [PATCH 12/17] revert changes to pr.yaml --- .github/workflows/pr.yaml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2a9a25fcb3..933db0304d 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -136,23 +136,6 @@ jobs: cuda: '["12.2"]' extra-repo-deploy-key: CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY build_command: | - # Tell rapids-cmake to use custom CCCL and cuCollections forks - rapids_branch="$(yq '.x-git-defaults.tag' /opt/rapids-build-utils/manifest.yaml)"; - rapids_version="${rapids_branch#branch-}"; - curl -fsSL -o- https://raw.githubusercontent.com/trxcllnt/rapids-cmake/branch-24.04-cccl-2.4.0/rapids-cmake/cpm/patches/cccl/revert_pr_211.diff \ - | tee ~/rapids-cmake-revert_pr_211.diff; - curl -fsSL -o- "https://raw.githubusercontent.com/rapidsai/rapids-cmake/${rapids_branch}/rapids-cmake/cpm/versions.json" \ - | jq -r ".packages.CCCL *= {\"version\": \"2.5.0\", \"git_tag\": \"pull-request/1667\"}" \ - | jq -r "(.packages.CCCL.patches[] | select(.file == \"cccl/revert_pr_211.diff\")).file = \"${HOME}/rapids-cmake-revert_pr_211.diff\"" \ - | jq -r ".packages.cuco *= {\"git_url\": \"https://github.com/trxcllnt/cuCollections.git\", \"git_tag\": \"rapids-${rapids_version}-cccl-2.5.0\", \"always_download\": true}" \ - | tee ~/rapids-cmake-override-versions.json; sccache -z; - build-all \ - -j$(nproc --ignore=1) -v \ - -DBUILD_CUML_BENCH=ON \ - -DBUILD_CUML_TESTS=ON \ - -DBUILD_PRIMS_TESTS=ON \ - -DCMAKE_CXX_FLAGS="-ftemplate-backtrace-limit=0" \ - -DCMAKE_CUDA_FLAGS="-ftemplate-backtrace-limit=0" \ - -DRAPIDS_CMAKE_CPM_DEFAULT_VERSION_FILE="${HOME}/rapids-cmake-override-versions.json"; + build-all --verbose; sccache -s; From 0167aa7dc9051ab10db5670949d3ddedb4ac1662 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 23 May 2024 17:24:22 +0000 Subject: [PATCH 13/17] use devcontainers with ucx and openmpi prebuilt --- .devcontainer/Dockerfile | 2 +- .devcontainer/cuda11.8-pip/devcontainer.json | 6 +----- .devcontainer/cuda12.2-pip/devcontainer.json | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f69161d32c..b50414b08e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -9,7 +9,7 @@ ENV DEFAULT_VIRTUAL_ENV=rapids RUN apt update -y \ && DEBIAN_FRONTEND=noninteractive apt install -y \ - libblas-dev liblapack-dev libopenmpi-dev \ + libblas-dev liblapack-dev \ && rm -rf /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/*; FROM ${BASE} as conda-base diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json index e0fb0b22e0..7b6db70799 100644 --- a/.devcontainer/cuda11.8-pip/devcontainer.json +++ b/.devcontainer/cuda11.8-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "11.8", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:24.06-cpp-cuda11.8-ubuntu22.04" + "BASE": "rapidsai/devcontainers:24.06-cpp-cuda11.8-ucx1.15.0-openmpi-ubuntu22.04" } }, "runArgs": [ @@ -15,9 +15,6 @@ ], "hostRequirements": {"gpu": "optional"}, "features": { - "ghcr.io/rapidsai/devcontainers/features/ucx:24.6": { - "version": "1.15.0" - }, "ghcr.io/rapidsai/devcontainers/features/cuda:24.6": { "version": "11.8", "installcuBLAS": true, @@ -28,7 +25,6 @@ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {} }, "overrideFeatureInstallOrder": [ - "ghcr.io/rapidsai/devcontainers/features/ucx", "ghcr.io/rapidsai/devcontainers/features/cuda", "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils" ], diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json index 627f725a2b..f08d31f024 100644 --- a/.devcontainer/cuda12.2-pip/devcontainer.json +++ b/.devcontainer/cuda12.2-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "12.2", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:24.06-cpp-cuda12.2-ubuntu22.04" + "BASE": "rapidsai/devcontainers:24.06-cpp-cuda12.2-ucx1.15.0-openmpi-ubuntu22.04" } }, "runArgs": [ @@ -15,9 +15,6 @@ ], "hostRequirements": {"gpu": "optional"}, "features": { - "ghcr.io/rapidsai/devcontainers/features/ucx:24.6": { - "version": "1.15.0" - }, "ghcr.io/rapidsai/devcontainers/features/cuda:24.6": { "version": "12.2", "installcuBLAS": true, @@ -28,7 +25,6 @@ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {} }, "overrideFeatureInstallOrder": [ - "ghcr.io/rapidsai/devcontainers/features/ucx", "ghcr.io/rapidsai/devcontainers/features/cuda", "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils" ], From a107010930b750eb12d0220784a9cbb1804f60a2 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 23 May 2024 13:25:46 -0700 Subject: [PATCH 14/17] fix devcontainer name for codespaces --- .devcontainer/cuda11.8-conda/devcontainer.json | 2 +- .devcontainer/cuda11.8-pip/devcontainer.json | 2 +- .devcontainer/cuda12.2-conda/devcontainer.json | 2 +- .devcontainer/cuda12.2-pip/devcontainer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json index ee050cc5fc..822b27f3fe 100644 --- a/.devcontainer/cuda11.8-conda/devcontainer.json +++ b/.devcontainer/cuda11.8-conda/devcontainer.json @@ -11,7 +11,7 @@ "runArgs": [ "--rm", "--name", - "${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda11.8-conda" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.06-cuda11.8-conda" ], "hostRequirements": {"gpu": "optional"}, "features": { diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json index 7b6db70799..d2bf9e6dc9 100644 --- a/.devcontainer/cuda11.8-pip/devcontainer.json +++ b/.devcontainer/cuda11.8-pip/devcontainer.json @@ -11,7 +11,7 @@ "runArgs": [ "--rm", "--name", - "${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda11.8-pip" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.06-cuda11.8-pip" ], "hostRequirements": {"gpu": "optional"}, "features": { diff --git a/.devcontainer/cuda12.2-conda/devcontainer.json b/.devcontainer/cuda12.2-conda/devcontainer.json index 17ce672f3c..9a0fa0e594 100644 --- a/.devcontainer/cuda12.2-conda/devcontainer.json +++ b/.devcontainer/cuda12.2-conda/devcontainer.json @@ -11,7 +11,7 @@ "runArgs": [ "--rm", "--name", - "${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda12.2-conda" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.06-cuda12.2-conda" ], "hostRequirements": {"gpu": "optional"}, "features": { diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json index f08d31f024..4cd630f1c2 100644 --- a/.devcontainer/cuda12.2-pip/devcontainer.json +++ b/.devcontainer/cuda12.2-pip/devcontainer.json @@ -11,7 +11,7 @@ "runArgs": [ "--rm", "--name", - "${localEnv:USER}-rapids-${localWorkspaceFolderBasename}-24.06-cuda12.2-pip" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-24.06-cuda12.2-pip" ], "hostRequirements": {"gpu": "optional"}, "features": { From e21dd6c337983096e127385a5abdc15f3310f333 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 28 May 2024 12:32:59 -0700 Subject: [PATCH 15/17] revert changes to add cxx standard --- cpp/bench/CMakeLists.txt | 6 +----- cpp/test/CMakeLists.txt | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt index 4f8c312717..1eccd65ba4 100644 --- a/cpp/bench/CMakeLists.txt +++ b/cpp/bench/CMakeLists.txt @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2019-2024, NVIDIA CORPORATION. +# Copyright (c) 2019-2023, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -61,10 +61,6 @@ if(BUILD_CUML_BENCH) set_target_properties( ${CUML_CPP_BENCH_TARGET} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib" - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED ON - CUDA_STANDARD 17 - CUDA_STANDARD_REQUIRED ON ) install( diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index 2a04100cdf..0033c844ae 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -85,10 +85,6 @@ function(ConfigureTest) set_target_properties( ${_CUML_TEST_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib" - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED ON - CUDA_STANDARD 17 - CUDA_STANDARD_REQUIRED ON ) set(_CUML_TEST_COMPONENT_NAME testing) From 2656b16338b863537aab3cbc975df9f08dfa18c0 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 28 May 2024 13:33:37 -0700 Subject: [PATCH 16/17] Revert "revert changes to add cxx standard" This reverts commit e21dd6c337983096e127385a5abdc15f3310f333. --- cpp/bench/CMakeLists.txt | 6 +++++- cpp/test/CMakeLists.txt | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cpp/bench/CMakeLists.txt b/cpp/bench/CMakeLists.txt index 1eccd65ba4..4f8c312717 100644 --- a/cpp/bench/CMakeLists.txt +++ b/cpp/bench/CMakeLists.txt @@ -1,5 +1,5 @@ #============================================================================= -# Copyright (c) 2019-2023, NVIDIA CORPORATION. +# Copyright (c) 2019-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -61,6 +61,10 @@ if(BUILD_CUML_BENCH) set_target_properties( ${CUML_CPP_BENCH_TARGET} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib" + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CUDA_STANDARD 17 + CUDA_STANDARD_REQUIRED ON ) install( diff --git a/cpp/test/CMakeLists.txt b/cpp/test/CMakeLists.txt index 0033c844ae..2a04100cdf 100644 --- a/cpp/test/CMakeLists.txt +++ b/cpp/test/CMakeLists.txt @@ -85,6 +85,10 @@ function(ConfigureTest) set_target_properties( ${_CUML_TEST_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib" + CXX_STANDARD 17 + CXX_STANDARD_REQUIRED ON + CUDA_STANDARD 17 + CUDA_STANDARD_REQUIRED ON ) set(_CUML_TEST_COMPONENT_NAME testing) From ade4561490c582ff44109e7586c92980524034cd Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 28 May 2024 13:37:45 -0700 Subject: [PATCH 17/17] revert changes to rapids_config.cmake --- rapids_config.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/rapids_config.cmake b/rapids_config.cmake index aea0422b80..f064a5b497 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,9 +26,6 @@ else() ) endif() -set(rapids-cmake-repo trxcllnt/rapids-cmake) -set(rapids-cmake-branch fea/cccl-2.5) - if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/CUML_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") file( DOWNLOAD