From 3e37724eb3ba9cc0417e34ca89660cb602ae2154 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 3 Dec 2024 09:57:45 -0800 Subject: [PATCH] Update RAPIDS to 25.02. (#2967) * Update RAPIDS to 25.02. * Remove RAFT BUILD_ANN_BENCH option. * Rename KvikIO to kvikio. * Add back cugraph-ops until it's completely purged from RAPIDS upstream dependencies. * Update devcontainers. --- .devcontainer/cuda11.1-gcc6/devcontainer.json | 2 +- .devcontainer/cuda11.1-gcc7/devcontainer.json | 2 +- .devcontainer/cuda11.1-gcc8/devcontainer.json | 2 +- .devcontainer/cuda11.1-gcc9/devcontainer.json | 2 +- .../cuda11.1-llvm9/devcontainer.json | 2 +- .../cuda11.8-gcc11/devcontainer.json | 2 +- .../cuda12.0-gcc10/devcontainer.json | 2 +- .../cuda12.0-gcc11/devcontainer.json | 2 +- .../cuda12.0-gcc12/devcontainer.json | 2 +- .devcontainer/cuda12.0-gcc9/devcontainer.json | 2 +- .../cuda12.0-llvm10/devcontainer.json | 2 +- .../cuda12.0-llvm11/devcontainer.json | 2 +- .../cuda12.0-llvm12/devcontainer.json | 2 +- .../cuda12.0-llvm13/devcontainer.json | 2 +- .../cuda12.0-llvm14/devcontainer.json | 2 +- .../cuda12.0-llvm9/devcontainer.json | 2 +- .../cuda12.5-gcc10/devcontainer.json | 2 +- .../cuda12.5-gcc11/devcontainer.json | 2 +- .../cuda12.5-gcc12/devcontainer.json | 2 +- .../cuda12.5-gcc13/devcontainer.json | 2 +- .devcontainer/cuda12.5-gcc7/devcontainer.json | 2 +- .devcontainer/cuda12.5-gcc8/devcontainer.json | 2 +- .devcontainer/cuda12.5-gcc9/devcontainer.json | 2 +- .../cuda12.5-llvm10/devcontainer.json | 2 +- .../cuda12.5-llvm11/devcontainer.json | 2 +- .../cuda12.5-llvm12/devcontainer.json | 2 +- .../cuda12.5-llvm13/devcontainer.json | 2 +- .../cuda12.5-llvm14/devcontainer.json | 2 +- .../cuda12.5-llvm15/devcontainer.json | 2 +- .../cuda12.5-llvm16/devcontainer.json | 2 +- .../cuda12.5-llvm17/devcontainer.json | 2 +- .../cuda12.5-llvm9/devcontainer.json | 2 +- .../cuda12.5-oneapi2023.2.0/devcontainer.json | 2 +- .devcontainer/devcontainer.json | 2 +- .github/workflows/build-rapids.yml | 35 +++++++++---------- ci/matrix.yaml | 2 +- ci/rapids/cuda12.5-conda/devcontainer.json | 32 ++++++++++++----- ci/rapids/post-create-command.sh | 2 +- 38 files changed, 76 insertions(+), 63 deletions(-) diff --git a/.devcontainer/cuda11.1-gcc6/devcontainer.json b/.devcontainer/cuda11.1-gcc6/devcontainer.json index 401a33ba59f..bf3acaec852 100644 --- a/.devcontainer/cuda11.1-gcc6/devcontainer.json +++ b/.devcontainer/cuda11.1-gcc6/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc6-cuda11.1", + "image": "rapidsai/devcontainers:25.02-cpp-gcc6-cuda11.1", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda11.1-gcc7/devcontainer.json b/.devcontainer/cuda11.1-gcc7/devcontainer.json index 5298b391438..e376e1671ff 100644 --- a/.devcontainer/cuda11.1-gcc7/devcontainer.json +++ b/.devcontainer/cuda11.1-gcc7/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc7-cuda11.1", + "image": "rapidsai/devcontainers:25.02-cpp-gcc7-cuda11.1", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda11.1-gcc8/devcontainer.json b/.devcontainer/cuda11.1-gcc8/devcontainer.json index 27ca3c28a00..fcaf7c9881d 100644 --- a/.devcontainer/cuda11.1-gcc8/devcontainer.json +++ b/.devcontainer/cuda11.1-gcc8/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc8-cuda11.1", + "image": "rapidsai/devcontainers:25.02-cpp-gcc8-cuda11.1", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda11.1-gcc9/devcontainer.json b/.devcontainer/cuda11.1-gcc9/devcontainer.json index ff592b79f54..93e90b2dddd 100644 --- a/.devcontainer/cuda11.1-gcc9/devcontainer.json +++ b/.devcontainer/cuda11.1-gcc9/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda11.1", + "image": "rapidsai/devcontainers:25.02-cpp-gcc9-cuda11.1", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda11.1-llvm9/devcontainer.json b/.devcontainer/cuda11.1-llvm9/devcontainer.json index e8a167e1c97..ce3976a368c 100644 --- a/.devcontainer/cuda11.1-llvm9/devcontainer.json +++ b/.devcontainer/cuda11.1-llvm9/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm9-cuda11.1", + "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda11.1", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda11.8-gcc11/devcontainer.json b/.devcontainer/cuda11.8-gcc11/devcontainer.json index cdb8a4250b6..77bbc3eb28a 100644 --- a/.devcontainer/cuda11.8-gcc11/devcontainer.json +++ b/.devcontainer/cuda11.8-gcc11/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda11.8", + "image": "rapidsai/devcontainers:25.02-cpp-gcc11-cuda11.8", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-gcc10/devcontainer.json b/.devcontainer/cuda12.0-gcc10/devcontainer.json index 4d081b3125f..b62f93d6c5d 100644 --- a/.devcontainer/cuda12.0-gcc10/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc10/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc10-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-gcc10-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-gcc11/devcontainer.json b/.devcontainer/cuda12.0-gcc11/devcontainer.json index 4dd297c4126..7b307949b8a 100644 --- a/.devcontainer/cuda12.0-gcc11/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc11/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-gcc11-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-gcc12/devcontainer.json b/.devcontainer/cuda12.0-gcc12/devcontainer.json index 660e98109f0..d2d2c5f6bce 100644 --- a/.devcontainer/cuda12.0-gcc12/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc12/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc12-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-gcc12-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-gcc9/devcontainer.json b/.devcontainer/cuda12.0-gcc9/devcontainer.json index 1f781d5852a..94359fc91dd 100644 --- a/.devcontainer/cuda12.0-gcc9/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc9/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-gcc9-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-llvm10/devcontainer.json b/.devcontainer/cuda12.0-llvm10/devcontainer.json index e716b5eb6ce..be61fb780d6 100644 --- a/.devcontainer/cuda12.0-llvm10/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm10/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm10-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-llvm10-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-llvm11/devcontainer.json b/.devcontainer/cuda12.0-llvm11/devcontainer.json index 399b306075c..6b90cbf11c6 100644 --- a/.devcontainer/cuda12.0-llvm11/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm11/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm11-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-llvm11-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-llvm12/devcontainer.json b/.devcontainer/cuda12.0-llvm12/devcontainer.json index d977c15ff33..1c46f19b4a1 100644 --- a/.devcontainer/cuda12.0-llvm12/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm12/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm12-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-llvm12-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-llvm13/devcontainer.json b/.devcontainer/cuda12.0-llvm13/devcontainer.json index 016695d62c9..d00f9ecb824 100644 --- a/.devcontainer/cuda12.0-llvm13/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm13/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm13-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-llvm13-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-llvm14/devcontainer.json b/.devcontainer/cuda12.0-llvm14/devcontainer.json index 1fc144da6f9..91dac92b685 100644 --- a/.devcontainer/cuda12.0-llvm14/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm14/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm14-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-llvm14-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.0-llvm9/devcontainer.json b/.devcontainer/cuda12.0-llvm9/devcontainer.json index 8bd0756dd4f..ff78453b05b 100644 --- a/.devcontainer/cuda12.0-llvm9/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm9/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm9-cuda12.0", + "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda12.0", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc10/devcontainer.json b/.devcontainer/cuda12.5-gcc10/devcontainer.json index 61459a25fcc..567e6ad343a 100644 --- a/.devcontainer/cuda12.5-gcc10/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc10/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc10-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc10-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc11/devcontainer.json b/.devcontainer/cuda12.5-gcc11/devcontainer.json index 184de8734cc..777b5346779 100644 --- a/.devcontainer/cuda12.5-gcc11/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc11/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc11-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc12/devcontainer.json b/.devcontainer/cuda12.5-gcc12/devcontainer.json index 1d16b6aa614..77a5f7572a5 100644 --- a/.devcontainer/cuda12.5-gcc12/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc12/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc12-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc12-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc13/devcontainer.json b/.devcontainer/cuda12.5-gcc13/devcontainer.json index 0f3fbb36f5e..fb70d7afad4 100644 --- a/.devcontainer/cuda12.5-gcc13/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc13/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc13-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc7/devcontainer.json b/.devcontainer/cuda12.5-gcc7/devcontainer.json index 9d5d356ad5d..a35f4c675a9 100644 --- a/.devcontainer/cuda12.5-gcc7/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc7/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc7-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc7-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc8/devcontainer.json b/.devcontainer/cuda12.5-gcc8/devcontainer.json index 10b44d31f1c..2a7e94802c8 100644 --- a/.devcontainer/cuda12.5-gcc8/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc8/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc8-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc8-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-gcc9/devcontainer.json b/.devcontainer/cuda12.5-gcc9/devcontainer.json index 333c11b3cc8..09e31086d69 100644 --- a/.devcontainer/cuda12.5-gcc9/devcontainer.json +++ b/.devcontainer/cuda12.5-gcc9/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc9-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm10/devcontainer.json b/.devcontainer/cuda12.5-llvm10/devcontainer.json index 8e3e19d4fc8..91becad234b 100644 --- a/.devcontainer/cuda12.5-llvm10/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm10/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm10-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm10-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm11/devcontainer.json b/.devcontainer/cuda12.5-llvm11/devcontainer.json index a216720e5d8..ef91547bec4 100644 --- a/.devcontainer/cuda12.5-llvm11/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm11/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm11-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm11-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm12/devcontainer.json b/.devcontainer/cuda12.5-llvm12/devcontainer.json index e1cbc4ecb77..cf88a028d9f 100644 --- a/.devcontainer/cuda12.5-llvm12/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm12/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm12-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm12-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm13/devcontainer.json b/.devcontainer/cuda12.5-llvm13/devcontainer.json index 6fbbf56b79d..92c724b9ee5 100644 --- a/.devcontainer/cuda12.5-llvm13/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm13/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm13-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm13-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm14/devcontainer.json b/.devcontainer/cuda12.5-llvm14/devcontainer.json index b8528e989f5..3704bc7a850 100644 --- a/.devcontainer/cuda12.5-llvm14/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm14/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm14-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm14-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm15/devcontainer.json b/.devcontainer/cuda12.5-llvm15/devcontainer.json index 768d3163ee6..a9e3d4479e2 100644 --- a/.devcontainer/cuda12.5-llvm15/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm15/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm15-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm15-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm16/devcontainer.json b/.devcontainer/cuda12.5-llvm16/devcontainer.json index 8ba700fa4e1..39d990ac5cb 100644 --- a/.devcontainer/cuda12.5-llvm16/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm16/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm16-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm16-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm17/devcontainer.json b/.devcontainer/cuda12.5-llvm17/devcontainer.json index 0de5689fdc3..d8a8ced091d 100644 --- a/.devcontainer/cuda12.5-llvm17/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm17/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm17-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm17-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-llvm9/devcontainer.json b/.devcontainer/cuda12.5-llvm9/devcontainer.json index d34ae018443..4b812255810 100644 --- a/.devcontainer/cuda12.5-llvm9/devcontainer.json +++ b/.devcontainer/cuda12.5-llvm9/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-llvm9-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/cuda12.5-oneapi2023.2.0/devcontainer.json b/.devcontainer/cuda12.5-oneapi2023.2.0/devcontainer.json index a530527cac7..221cfe72d82 100644 --- a/.devcontainer/cuda12.5-oneapi2023.2.0/devcontainer.json +++ b/.devcontainer/cuda12.5-oneapi2023.2.0/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-oneapi2023.2.0-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-oneapi2023.2.0-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0f3fbb36f5e..fb70d7afad4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:24.10-cpp-gcc13-cuda12.5", + "image": "rapidsai/devcontainers:25.02-cpp-gcc13-cuda12.5", "hostRequirements": { "gpu": "optional" }, diff --git a/.github/workflows/build-rapids.yml b/.github/workflows/build-rapids.yml index 2d0cfa6f761..5f29186e819 100644 --- a/.github/workflows/build-rapids.yml +++ b/.github/workflows/build-rapids.yml @@ -36,10 +36,9 @@ jobs: fail-fast: false matrix: include: - - { cuda: '12.5', libs: 'rmm KvikIO cudf cudf_kafka cuspatial', } - - { cuda: '12.5', libs: 'rmm ucxx raft cuvs', } - - { cuda: '12.5', libs: 'rmm ucxx raft cumlprims_mg cuml', } - - { cuda: '12.5', libs: 'rmm ucxx raft cugraph-ops wholegraph cugraph' } + - { cuda: '12.5', libs: 'rmm kvikio cudf cudf_kafka cuspatial' } + - { cuda: '12.5', libs: 'rmm ucxx raft cuvs cumlprims_mg cuml' } + - { cuda: '12.5', libs: 'rmm ucxx raft cugraph-ops cugraph cugraph-gnn'} permissions: id-token: write contents: read @@ -61,20 +60,20 @@ jobs: CI: true RAPIDS_LIBS: ${{ matrix.libs }} # Uncomment any of these to customize the git repo and branch for a RAPIDS lib: - # RAPIDS_cmake_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cudf_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cudf_kafka_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cugraph_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cugraph_ops_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cuml_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cumlprims_mg_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cuspatial_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_cuvs_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_KvikIO_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_raft_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_rmm_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' - # RAPIDS_ucxx_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-0.40"}' - # RAPIDS_wholegraph_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-24.10"}' + # RAPIDS_cmake_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cudf_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cudf_kafka_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cugraph_ops_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cugraph_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cugraph_gnn_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cuml_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cumlprims_mg_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cuspatial_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_cuvs_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_kvikio_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_raft_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_rmm_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-25.02"}' + # RAPIDS_ucxx_GIT_REPO: '{"upstream": "rapidsai", "tag": "branch-0.42"}' run: | cat <<"EOF" > "$RUNNER_TEMP/ci-entrypoint.sh" #! /usr/bin/env bash diff --git a/ci/matrix.yaml b/ci/matrix.yaml index e8f746f57f1..4ccaf97485b 100644 --- a/ci/matrix.yaml +++ b/ci/matrix.yaml @@ -80,7 +80,7 @@ workflows: # The version of the devcontainer images to use from https://hub.docker.com/r/rapidsai/devcontainers -devcontainer_version: '24.10' +devcontainer_version: '25.02' # All supported C++ standards: all_stds: [11, 14, 17, 20] diff --git a/ci/rapids/cuda12.5-conda/devcontainer.json b/ci/rapids/cuda12.5-conda/devcontainer.json index 8ec1a35d43a..9e57663c617 100644 --- a/ci/rapids/cuda12.5-conda/devcontainer.json +++ b/ci/rapids/cuda12.5-conda/devcontainer.json @@ -1,13 +1,15 @@ { - "image": "rapidsai/devcontainers:24.10-cpp-mambaforge-ubuntu22.04", + "image": "rapidsai/devcontainers:25.02-cpp-mambaforge-ubuntu22.04", "runArgs": [ "--rm", "--name", - "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-rapids-24.10-cuda12.5-conda" + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-rapids-25.02-cuda12.5-conda" ], - "hostRequirements": {"gpu": "optional"}, + "hostRequirements": { + "gpu": "optional" + }, "features": { - "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.10": {} + "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.2": {} }, "overrideFeatureInstallOrder": [ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils" @@ -37,13 +39,25 @@ "RAPIDS_cumlprims_mg_GIT_REPO": "${localEnv:RAPIDS_cumlprims_mg_GIT_REPO}", "RAPIDS_cuml_GIT_REPO": "${localEnv:RAPIDS_cuml_GIT_REPO}", "RAPIDS_cugraph_ops_GIT_REPO": "${localEnv:RAPIDS_cugraph_ops_GIT_REPO}", - "RAPIDS_wholegraph_GIT_REPO": "${localEnv:RAPIDS_wholegraph_GIT_REPO}", "RAPIDS_cugraph_GIT_REPO": "${localEnv:RAPIDS_cugraph_GIT_REPO}", + "RAPIDS_cugraph_gnn_GIT_REPO": "${localEnv:RAPIDS_cugraph_gnn_GIT_REPO}", "RAPIDS_cuspatial_GIT_REPO": "${localEnv:RAPIDS_cuspatial_GIT_REPO}" }, - "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config} ${localWorkspaceFolder}/ci/rapids/.{conda,log/devcontainer-utils} ${localWorkspaceFolder}/ci/rapids/.repos/{rmm,kvikio,ucxx,cudf,raft,cuvs,cuml,wholegraph,cugraph,cuspatial}"], - "postCreateCommand": ["/bin/bash", "-c", "if [ ${CI:-false} = 'false' ]; then . /home/coder/cccl/ci/rapids/post-create-command.sh; fi"], - "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"], + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config} ${localWorkspaceFolder}/ci/rapids/.{conda,log/devcontainer-utils} ${localWorkspaceFolder}/ci/rapids/.repos/{rmm,kvikio,ucxx,cudf,raft,cuvs,cuml,cugraph,cugraph-gnn,cuspatial}" + ], + "postCreateCommand": [ + "/bin/bash", + "-c", + "if [ ${CI:-false} = 'false' ]; then . /home/coder/cccl/ci/rapids/post-create-command.sh; fi" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent", "mounts": [ @@ -57,8 +71,8 @@ "source=${localWorkspaceFolder}/ci/rapids/.repos/raft,target=/home/coder/raft,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/ci/rapids/.repos/cuvs,target=/home/coder/cuvs,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/ci/rapids/.repos/cuml,target=/home/coder/cuml,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/ci/rapids/.repos/wholegraph,target=/home/coder/wholegraph,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/ci/rapids/.repos/cugraph,target=/home/coder/cugraph,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/ci/rapids/.repos/cugraph-gnn,target=/home/coder/cugraph-gnn,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/ci/rapids/.repos/cuspatial,target=/home/coder/cuspatial,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/ci/rapids/.conda,target=/home/coder/.conda,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/ci/rapids/.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent" diff --git a/ci/rapids/post-create-command.sh b/ci/rapids/post-create-command.sh index 8c08b5f6540..62f319b98bb 100755 --- a/ci/rapids/post-create-command.sh +++ b/ci/rapids/post-create-command.sh @@ -69,7 +69,7 @@ _create_rapids_cmake_override_json() { | tee ~/rapids-cmake-override-versions.json; # Define default CMake args for each repo - local -a cmake_args=(BUILD_TESTS BUILD_BENCHMARKS BUILD_ANN_BENCH BUILD_PRIMS_BENCH BUILD_CUGRAPH_MG_TESTS); + local -a cmake_args=(BUILD_TESTS BUILD_BENCHMARKS BUILD_PRIMS_BENCH BUILD_CUGRAPH_MG_TESTS); # Enable tests cmake_args=("${cmake_args[@]/#/"-D"}"); cmake_args=("${cmake_args[@]/%/"=${RAPIDS_ENABLE_TESTS:-ON}"}");