Merge branch 'main' into fea/automate_release_update_tag

NVIDIA · Dec 4, 2024 · 861e24d · 861e24d
2 parents ded85fe + 8977deb
commit 861e24d
Show file tree

Hide file tree

Showing 94 changed files with 997 additions and 843 deletions.
diff --git a/.devcontainer/cuda11.1-gcc6/devcontainer.json b/.devcontainer/cuda11.1-gcc6/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-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
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm9-cuda12.0",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda12.0",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.5-nvhpc24.7/devcontainer.json b/.devcontainer/cuda12.5-nvhpc24.7/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-nvhpc24.7",
+  "image": "rapidsai/devcontainers:25.02-cpp-nvhpc24.7",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc10/devcontainer.json b/.devcontainer/cuda12.6-gcc10/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc10-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc10-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc11/devcontainer.json b/.devcontainer/cuda12.6-gcc11/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc11-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc11-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc12/devcontainer.json b/.devcontainer/cuda12.6-gcc12/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc12-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc12-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc13/devcontainer.json b/.devcontainer/cuda12.6-gcc13/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc13-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc7/devcontainer.json b/.devcontainer/cuda12.6-gcc7/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc7-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc7-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc8/devcontainer.json b/.devcontainer/cuda12.6-gcc8/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc8-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc8-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-gcc9/devcontainer.json b/.devcontainer/cuda12.6-gcc9/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc9-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc9-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm10/devcontainer.json b/.devcontainer/cuda12.6-llvm10/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm10-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm10-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm11/devcontainer.json b/.devcontainer/cuda12.6-llvm11/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm11-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm11-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm12/devcontainer.json b/.devcontainer/cuda12.6-llvm12/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm12-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm12-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm13/devcontainer.json b/.devcontainer/cuda12.6-llvm13/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm13-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm13-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm14/devcontainer.json b/.devcontainer/cuda12.6-llvm14/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm14-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm14-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm15/devcontainer.json b/.devcontainer/cuda12.6-llvm15/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm15-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm15-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm16/devcontainer.json b/.devcontainer/cuda12.6-llvm16/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm16-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm16-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm17/devcontainer.json b/.devcontainer/cuda12.6-llvm17/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm17-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm17-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm18/devcontainer.json b/.devcontainer/cuda12.6-llvm18/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm18-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm18-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-llvm9/devcontainer.json b/.devcontainer/cuda12.6-llvm9/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-llvm9-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6-oneapi2023.2.0/devcontainer.json b/.devcontainer/cuda12.6-oneapi2023.2.0/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-oneapi2023.2.0-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-oneapi2023.2.0-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/cuda12.6ext-gcc13/devcontainer.json b/.devcontainer/cuda12.6ext-gcc13/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6ext",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc13-cuda12.6ext",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "shutdownAction": "stopContainer",
-  "image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6",
+  "image": "rapidsai/devcontainers:25.02-cpp-gcc13-cuda12.6",
   "hostRequirements": {
     "gpu": "optional"
   },

diff --git 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/benchmarks/scripts/cccl/bench/bench.py b/benchmarks/scripts/cccl/bench/bench.py
@@ -242,10 +242,10 @@ def device_json(algname):
 
 def get_device_name(device):
     gpu_name = device["name"]
-    bw = device["global_memory_bus_width"]
+    bus_width = device["global_memory_bus_width"]
     sms = device["number_of_sms"]
     ecc = "eccon" if device["ecc_state"] else "eccoff"
-    name = "{} ({}, {}, {})".format(gpu_name, bw, sms, ecc)
+    name = "{} ({}, {}, {})".format(gpu_name, bus_width, sms, ecc)
     return name.replace('NVIDIA ', '')