From 1a6d0ea04da35594d44dba4a7e13d9a788a20446 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 8 May 2025 15:32:38 +0000 Subject: [PATCH 1/3] Update to CUDA 12.9.0 --- .../devcontainer.json | 14 +++++++------- .../{cuda12.8-conda => cuda12.9-conda}/features | 0 .../devcontainer.json | 16 ++++++++-------- .../{cuda12.8-pip => cuda12.9-pip}/features | 0 .github/workflows/build-all-rapids-repos.yml | 2 +- features/src/cuda/README.md | 2 +- features/src/cuda/devcontainer-feature.json | 3 ++- features/src/cuda/install.sh | 2 +- features/test/_global/cpp_llvm_cuda_nvhpc.sh | 4 ++-- features/test/_global/cuda_rust.sh | 4 ++-- features/test/_global/scenarios.json | 4 ++-- features/test/cuda/test.sh | 4 ++-- features/test/openmpi/scenarios.json | 2 +- features/test/ucx/scenarios.json | 4 ++-- matrix.yml | 2 +- windows/image/installers/install-cuda.ps1 | 4 ++-- 16 files changed, 34 insertions(+), 33 deletions(-) rename .devcontainer/{cuda12.8-conda => cuda12.9-conda}/devcontainer.json (93%) rename .devcontainer/{cuda12.8-conda => cuda12.9-conda}/features (100%) rename .devcontainer/{cuda12.8-pip => cuda12.9-pip}/devcontainer.json (91%) rename .devcontainer/{cuda12.8-pip => cuda12.9-pip}/features (100%) diff --git a/.devcontainer/cuda12.8-conda/devcontainer.json b/.devcontainer/cuda12.9-conda/devcontainer.json similarity index 93% rename from .devcontainer/cuda12.8-conda/devcontainer.json rename to .devcontainer/cuda12.9-conda/devcontainer.json index e5c11d186..76236aad3 100644 --- a/.devcontainer/cuda12.8-conda/devcontainer.json +++ b/.devcontainer/cuda12.9-conda/devcontainer.json @@ -3,7 +3,7 @@ "context": "${localWorkspaceFolder}/.devcontainer", "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile", "args": { - "CUDA": "12.8", + "CUDA": "12.9", "PYTHON_PACKAGE_MANAGER": "conda", "BASE": "rapidsai/devcontainers:25.06-cpp-mambaforge-ubuntu22.04" } @@ -11,12 +11,12 @@ "runArgs": [ "--rm", "--name", - "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-conda" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.9-conda" ], "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { - "version": "12.8", + "version": "12.9", "installCompilers": false, "installProfilers": true, "installCTKLibraries": false, @@ -45,7 +45,7 @@ "./features/src/utils", "./features/src/rapids-build-utils" ], - "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.8-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], + "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.9-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"], "workspaceFolder": "/home/coder", "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent", @@ -66,10 +66,10 @@ "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.9-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" + "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" ], "customizations": { "vscode": { diff --git a/.devcontainer/cuda12.8-conda/features b/.devcontainer/cuda12.9-conda/features similarity index 100% rename from .devcontainer/cuda12.8-conda/features rename to .devcontainer/cuda12.9-conda/features diff --git a/.devcontainer/cuda12.8-pip/devcontainer.json b/.devcontainer/cuda12.9-pip/devcontainer.json similarity index 91% rename from .devcontainer/cuda12.8-pip/devcontainer.json rename to .devcontainer/cuda12.9-pip/devcontainer.json index 05571da64..aaa040f2a 100644 --- a/.devcontainer/cuda12.8-pip/devcontainer.json +++ b/.devcontainer/cuda12.9-pip/devcontainer.json @@ -3,20 +3,20 @@ "context": "${localWorkspaceFolder}/.devcontainer", "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile", "args": { - "CUDA": "12.8", + "CUDA": "12.9", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.8-ucx1.18.0-openmpi5.0.7-ubuntu22.04" + "BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.9-ucx1.18.0-openmpi5.0.7-ubuntu22.04" } }, "runArgs": [ "--rm", "--name", - "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-pip" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.9-pip" ], "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { - "version": "12.8", + "version": "12.9", "cuDNNVersion": "9", "installcuBLAS": true, "installcuDNN": true, @@ -33,7 +33,7 @@ "./features/src/utils", "./features/src/rapids-build-utils" ], - "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], + "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.9-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"], "workspaceFolder": "/home/coder", "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent", @@ -53,10 +53,10 @@ "source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.9-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" + "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" ], "customizations": { "vscode": { diff --git a/.devcontainer/cuda12.8-pip/features b/.devcontainer/cuda12.9-pip/features similarity index 100% rename from .devcontainer/cuda12.8-pip/features rename to .devcontainer/cuda12.9-pip/features diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml index 6ca6ee33f..c92653d1a 100644 --- a/.github/workflows/build-all-rapids-repos.yml +++ b/.github/workflows/build-all-rapids-repos.yml @@ -36,7 +36,7 @@ jobs: pull-requests: read with: arch: '["amd64", "arm64"]' - cuda: '["12.8"]' + cuda: '["12.9"]' node_type: cpu32 extra-repo-deploy-key: CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY timeout-minutes: 720 diff --git a/features/src/cuda/README.md b/features/src/cuda/README.md index ce7c2fa7b..318370041 100644 --- a/features/src/cuda/README.md +++ b/features/src/cuda/README.md @@ -15,7 +15,7 @@ A feature to install the NVIDIA CUDA Toolkit | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| version | Version of the CUDA Toolkit to install. | string | 12.8 | +| version | Version of the CUDA Toolkit to install. | string | 12.9 | | cuDNNVersion | Version of cuDNN to install. | string | 8 | | installCompilers | Install NVIDIA CUDA Compiler (nvcc) | boolean | true | | installProfilers | Install NVIDIA NSight Systems Profiler (nsys) | boolean | true | diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json index 63378cf83..8250f12de 100644 --- a/features/src/cuda/devcontainer-feature.json +++ b/features/src/cuda/devcontainer-feature.json @@ -7,6 +7,7 @@ "version": { "type": "string", "proposals": [ + "12.9", "12.8", "12.6", "12.5", @@ -24,7 +25,7 @@ "11.2", "11.1" ], - "default": "12.8", + "default": "12.9", "description": "Version of the CUDA Toolkit to install." }, "cuDNNVersion": { diff --git a/features/src/cuda/install.sh b/features/src/cuda/install.sh index c9a0251b2..87b063382 100644 --- a/features/src/cuda/install.sh +++ b/features/src/cuda/install.sh @@ -30,7 +30,7 @@ export OSNAME="$( echo "$ID$((major - (major % 2)))${minor}"; )"; -VERSION="${CUDA_VERSION:-${VERSION:-12.8.0}}"; +VERSION="${CUDA_VERSION:-${VERSION:-12.9.0}}"; if [[ "$NVARCH" == aarch64 ]]; then NVARCH="sbsa"; diff --git a/features/test/_global/cpp_llvm_cuda_nvhpc.sh b/features/test/_global/cpp_llvm_cuda_nvhpc.sh index b1b8d1376..47b9c6225 100644 --- a/features/test/_global/cpp_llvm_cuda_nvhpc.sh +++ b/features/test/_global/cpp_llvm_cuda_nvhpc.sh @@ -39,11 +39,11 @@ source dev-container-features-test-lib; check "gitlab-cli version" glab --version # Check CUDA -check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'"; +check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'"; check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'"; check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'"; check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'"; -check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda; +check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda; check "nvcc exists and is on path" which nvcc; # Check NVHPC diff --git a/features/test/_global/cuda_rust.sh b/features/test/_global/cuda_rust.sh index 444353df7..de75ee2ee 100644 --- a/features/test/_global/cuda_rust.sh +++ b/features/test/_global/cuda_rust.sh @@ -40,11 +40,11 @@ source dev-container-features-test-lib; >&2 echo "BASH_ENV=$BASH_ENV"; # Check CUDA -check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'"; +check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'"; check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'"; check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'"; check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'"; -check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda; +check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda; check "nvcc exists and is on path" which nvcc; # Check Rust diff --git a/features/test/_global/scenarios.json b/features/test/_global/scenarios.json index 345aa2632..ac1bce87c 100644 --- a/features/test/_global/scenarios.json +++ b/features/test/_global/scenarios.json @@ -4,7 +4,7 @@ "features": { "rust": {}, "cuda": { - "version": "12.8" + "version": "12.9" } }, "overrideFeatureInstallOrder": [ @@ -44,7 +44,7 @@ "version": "16" }, "cuda": { - "version": "12.8" + "version": "12.9" }, "nvhpc": { "version": "24.5" diff --git a/features/test/cuda/test.sh b/features/test/cuda/test.sh index b1781da61..19766a4c3 100644 --- a/features/test/cuda/test.sh +++ b/features/test/cuda/test.sh @@ -17,11 +17,11 @@ source dev-container-features-test-lib # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. -check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'"; +check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'"; check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'"; check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'"; check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'"; -check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda +check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda check "nvcc exists and is on path" which nvcc # Report result diff --git a/features/test/openmpi/scenarios.json b/features/test/openmpi/scenarios.json index a6e77236b..60cc78713 100644 --- a/features/test/openmpi/scenarios.json +++ b/features/test/openmpi/scenarios.json @@ -3,7 +3,7 @@ "image": "ubuntu:22.04", "features": { "cuda": { - "version": "12.8" + "version": "12.9" }, "ucx": { "version": "1.15.0" diff --git a/features/test/ucx/scenarios.json b/features/test/ucx/scenarios.json index 7439c5471..9081459e7 100644 --- a/features/test/ucx/scenarios.json +++ b/features/test/ucx/scenarios.json @@ -3,7 +3,7 @@ "image": "ubuntu:22.04", "features": { "cuda": { - "version": "12.8" + "version": "12.9" }, "ucx": { "version": "1.14.1" @@ -18,7 +18,7 @@ "image": "ubuntu:22.04", "features": { "cuda": { - "version": "12.8" + "version": "12.9" }, "ucx": { "version": "1.15.0-rc3" diff --git a/matrix.yml b/matrix.yml index c657a3206..9952d8f79 100644 --- a/matrix.yml +++ b/matrix.yml @@ -3,7 +3,7 @@ x-cuda-prev-max: &cuda_prev_max { name: "cuda", version: "12.9" } x-cuda-curr-min: &cuda_curr_min { name: "cuda", version: "12.0" } x-cuda-curr-max: &cuda_curr_max { name: "cuda", version: "12.9" } x-cuda-prev-max-rapids: &cuda_prev_max_rapids { name: "cuda", version: "11.8" } -x-cuda-curr-max-rapids: &cuda_curr_max_rapids { name: "cuda", version: "12.8" } +x-cuda-curr-max-rapids: &cuda_curr_max_rapids { name: "cuda", version: "12.9" } x-gcc-7: &gcc_7 { name: "gcc", version: "7" } x-gcc-8: &gcc_8 { name: "gcc", version: "8" } diff --git a/windows/image/installers/install-cuda.ps1 b/windows/image/installers/install-cuda.ps1 index 4f4dd0338..d07e30824 100644 --- a/windows/image/installers/install-cuda.ps1 +++ b/windows/image/installers/install-cuda.ps1 @@ -1,7 +1,7 @@ Param( [Parameter(Mandatory=$false)] [string] - $cudaVersion="12.8.0" + $cudaVersion="12.9.0" ) # Use System.Version to tokenize version @@ -11,7 +11,7 @@ $major = $version.Major $minor = $version.Minor $build = $version.Build -# Minimum build is 0, not -1 as default in case "12.8" is passed +# Minimum build is 0, not -1 as default in case "12.9" is passed if ($build -lt 0) { $build = 0 } From e3dcc39ec7377abb95c04826793bafa1904138cc Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 8 May 2025 16:05:50 -0700 Subject: [PATCH 2/3] Apply suggestions from code review --- features/test/_global/cpp_llvm_cuda_nvhpc.sh | 2 +- features/test/_global/cuda_rust.sh | 2 +- features/test/cuda/test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/test/_global/cpp_llvm_cuda_nvhpc.sh b/features/test/_global/cpp_llvm_cuda_nvhpc.sh index 47b9c6225..f820f0a89 100644 --- a/features/test/_global/cpp_llvm_cuda_nvhpc.sh +++ b/features/test/_global/cpp_llvm_cuda_nvhpc.sh @@ -41,7 +41,7 @@ check "gitlab-cli version" glab --version # Check CUDA check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'"; check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'"; -check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'"; +check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '9'"; check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'"; check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda; check "nvcc exists and is on path" which nvcc; diff --git a/features/test/_global/cuda_rust.sh b/features/test/_global/cuda_rust.sh index de75ee2ee..04bdab28f 100644 --- a/features/test/_global/cuda_rust.sh +++ b/features/test/_global/cuda_rust.sh @@ -42,7 +42,7 @@ source dev-container-features-test-lib; # Check CUDA check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'"; check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'"; -check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'"; +check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '9'"; check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'"; check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda; check "nvcc exists and is on path" which nvcc; diff --git a/features/test/cuda/test.sh b/features/test/cuda/test.sh index 19766a4c3..82df608e5 100644 --- a/features/test/cuda/test.sh +++ b/features/test/cuda/test.sh @@ -19,7 +19,7 @@ source dev-container-features-test-lib # The 'check' command comes from the dev-container-features-test-lib. check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'"; check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'"; -check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'"; +check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '9'"; check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'"; check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda check "nvcc exists and is on path" which nvcc From 4a29bbd2e85f4003cee6e2e8f5262b13521c9d7d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 13 May 2025 20:39:45 +0000 Subject: [PATCH 3/3] Revert RAPIDS max version and devcontainers to 12.8. Also build RAPIDS repos with 12.8. --- .../devcontainer.json | 14 +++++++------- .../{cuda12.9-conda => cuda12.8-conda}/features | 0 .../devcontainer.json | 16 ++++++++-------- .../{cuda12.9-pip => cuda12.8-pip}/features | 0 .github/workflows/build-all-rapids-repos.yml | 2 +- matrix.yml | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) rename .devcontainer/{cuda12.9-conda => cuda12.8-conda}/devcontainer.json (93%) rename .devcontainer/{cuda12.9-conda => cuda12.8-conda}/features (100%) rename .devcontainer/{cuda12.9-pip => cuda12.8-pip}/devcontainer.json (91%) rename .devcontainer/{cuda12.9-pip => cuda12.8-pip}/features (100%) diff --git a/.devcontainer/cuda12.9-conda/devcontainer.json b/.devcontainer/cuda12.8-conda/devcontainer.json similarity index 93% rename from .devcontainer/cuda12.9-conda/devcontainer.json rename to .devcontainer/cuda12.8-conda/devcontainer.json index 76236aad3..e5c11d186 100644 --- a/.devcontainer/cuda12.9-conda/devcontainer.json +++ b/.devcontainer/cuda12.8-conda/devcontainer.json @@ -3,7 +3,7 @@ "context": "${localWorkspaceFolder}/.devcontainer", "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile", "args": { - "CUDA": "12.9", + "CUDA": "12.8", "PYTHON_PACKAGE_MANAGER": "conda", "BASE": "rapidsai/devcontainers:25.06-cpp-mambaforge-ubuntu22.04" } @@ -11,12 +11,12 @@ "runArgs": [ "--rm", "--name", - "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.9-conda" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-conda" ], "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { - "version": "12.9", + "version": "12.8", "installCompilers": false, "installProfilers": true, "installCTKLibraries": false, @@ -45,7 +45,7 @@ "./features/src/utils", "./features/src/rapids-build-utils" ], - "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.9-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], + "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.8-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"], "workspaceFolder": "/home/coder", "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent", @@ -66,10 +66,10 @@ "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.9-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" + "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" ], "customizations": { "vscode": { diff --git a/.devcontainer/cuda12.9-conda/features b/.devcontainer/cuda12.8-conda/features similarity index 100% rename from .devcontainer/cuda12.9-conda/features rename to .devcontainer/cuda12.8-conda/features diff --git a/.devcontainer/cuda12.9-pip/devcontainer.json b/.devcontainer/cuda12.8-pip/devcontainer.json similarity index 91% rename from .devcontainer/cuda12.9-pip/devcontainer.json rename to .devcontainer/cuda12.8-pip/devcontainer.json index aaa040f2a..05571da64 100644 --- a/.devcontainer/cuda12.9-pip/devcontainer.json +++ b/.devcontainer/cuda12.8-pip/devcontainer.json @@ -3,20 +3,20 @@ "context": "${localWorkspaceFolder}/.devcontainer", "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile", "args": { - "CUDA": "12.9", + "CUDA": "12.8", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.9-ucx1.18.0-openmpi5.0.7-ubuntu22.04" + "BASE": "rapidsai/devcontainers:25.06-cpp-cuda12.8-ucx1.18.0-openmpi5.0.7-ubuntu22.04" } }, "runArgs": [ "--rm", "--name", - "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.9-pip" + "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.06-cuda12.8-pip" ], "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { - "version": "12.9", + "version": "12.8", "cuDNNVersion": "9", "installcuBLAS": true, "installcuDNN": true, @@ -33,7 +33,7 @@ "./features/src/utils", "./features/src/rapids-build-utils" ], - "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.9-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], + "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,rapidsmpf,raft,cuvs,cumlprims_mg,cuml,cugraph,cugraph-gnn,nx-cugraph}"], "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"], "workspaceFolder": "/home/coder", "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent", @@ -53,10 +53,10 @@ "source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.9-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.8-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/.devcontainer/cuda12.9-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" + "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.devcontainer/cuda12.8-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent" ], "customizations": { "vscode": { diff --git a/.devcontainer/cuda12.9-pip/features b/.devcontainer/cuda12.8-pip/features similarity index 100% rename from .devcontainer/cuda12.9-pip/features rename to .devcontainer/cuda12.8-pip/features diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml index c92653d1a..6ca6ee33f 100644 --- a/.github/workflows/build-all-rapids-repos.yml +++ b/.github/workflows/build-all-rapids-repos.yml @@ -36,7 +36,7 @@ jobs: pull-requests: read with: arch: '["amd64", "arm64"]' - cuda: '["12.9"]' + cuda: '["12.8"]' node_type: cpu32 extra-repo-deploy-key: CUMLPRIMS_SSH_PRIVATE_DEPLOY_KEY timeout-minutes: 720 diff --git a/matrix.yml b/matrix.yml index 9952d8f79..c657a3206 100644 --- a/matrix.yml +++ b/matrix.yml @@ -3,7 +3,7 @@ x-cuda-prev-max: &cuda_prev_max { name: "cuda", version: "12.9" } x-cuda-curr-min: &cuda_curr_min { name: "cuda", version: "12.0" } x-cuda-curr-max: &cuda_curr_max { name: "cuda", version: "12.9" } x-cuda-prev-max-rapids: &cuda_prev_max_rapids { name: "cuda", version: "11.8" } -x-cuda-curr-max-rapids: &cuda_curr_max_rapids { name: "cuda", version: "12.9" } +x-cuda-curr-max-rapids: &cuda_curr_max_rapids { name: "cuda", version: "12.8" } x-gcc-7: &gcc_7 { name: "gcc", version: "7" } x-gcc-8: &gcc_8 { name: "gcc", version: "8" }