Skip to content

Commit c9f60f0

Browse files
authored
Merge pull request rapidsai#514 from rapidsai/branch-25.06
Forward-merge branch-25.06 into branch-25.08
2 parents 9f8743a + b459d48 commit c9f60f0

File tree

10 files changed

+20
-19
lines changed

10 files changed

+20
-19
lines changed

features/src/cuda/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A feature to install the NVIDIA CUDA Toolkit
1515

1616
| Options Id | Description | Type | Default Value |
1717
|-----|-----|-----|-----|
18-
| version | Version of the CUDA Toolkit to install. | string | 12.8 |
18+
| version | Version of the CUDA Toolkit to install. | string | 12.9 |
1919
| cuDNNVersion | Version of cuDNN to install. | string | 8 |
2020
| installCompilers | Install NVIDIA CUDA Compiler (nvcc) | boolean | true |
2121
| installProfilers | Install NVIDIA NSight Systems Profiler (nsys) | boolean | true |

features/src/cuda/devcontainer-feature.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"version": {
88
"type": "string",
99
"proposals": [
10+
"12.9",
1011
"12.8",
1112
"12.6",
1213
"12.5",
@@ -24,7 +25,7 @@
2425
"11.2",
2526
"11.1"
2627
],
27-
"default": "12.8",
28+
"default": "12.9",
2829
"description": "Version of the CUDA Toolkit to install."
2930
},
3031
"cuDNNVersion": {

features/src/cuda/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export OSNAME="$(
3030
echo "$ID$((major - (major % 2)))${minor}";
3131
)";
3232

33-
VERSION="${CUDA_VERSION:-${VERSION:-12.8.0}}";
33+
VERSION="${CUDA_VERSION:-${VERSION:-12.9.0}}";
3434

3535
if [[ "$NVARCH" == aarch64 ]]; then
3636
NVARCH="sbsa";

features/test/_global/cpp_llvm_cuda_nvhpc.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ source dev-container-features-test-lib;
3939
check "gitlab-cli version" glab --version
4040

4141
# Check CUDA
42-
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'";
42+
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'";
4343
check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'";
44-
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'";
44+
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '9'";
4545
check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'";
46-
check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda;
46+
check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda;
4747
check "nvcc exists and is on path" which nvcc;
4848

4949
# Check NVHPC

features/test/_global/cuda_rust.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ source dev-container-features-test-lib;
4040
>&2 echo "BASH_ENV=$BASH_ENV";
4141

4242
# Check CUDA
43-
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'";
43+
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'";
4444
check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'";
45-
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'";
45+
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '9'";
4646
check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'";
47-
check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda;
47+
check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda;
4848
check "nvcc exists and is on path" which nvcc;
4949

5050
# Check Rust

features/test/_global/scenarios.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"features": {
55
"rust": {},
66
"cuda": {
7-
"version": "12.8"
7+
"version": "12.9"
88
}
99
},
1010
"overrideFeatureInstallOrder": [
@@ -44,7 +44,7 @@
4444
"version": "16"
4545
},
4646
"cuda": {
47-
"version": "12.8"
47+
"version": "12.9"
4848
},
4949
"nvhpc": {
5050
"version": "24.5"

features/test/cuda/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ source dev-container-features-test-lib
1717

1818
# Feature-specific tests
1919
# The 'check' command comes from the dev-container-features-test-lib.
20-
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'";
20+
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.9.0'";
2121
check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'";
22-
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '8'";
22+
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '9'";
2323
check "CUDA patch version" bash -c "echo '$CUDA_VERSION_PATCH' | grep '0'";
24-
check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda
24+
check "installed" stat /usr/local/cuda-12.9 /usr/local/cuda
2525
check "nvcc exists and is on path" which nvcc
2626

2727
# Report result

features/test/openmpi/scenarios.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"image": "ubuntu:22.04",
44
"features": {
55
"cuda": {
6-
"version": "12.8"
6+
"version": "12.9"
77
},
88
"ucx": {
99
"version": "1.15.0"

features/test/ucx/scenarios.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"image": "ubuntu:22.04",
44
"features": {
55
"cuda": {
6-
"version": "12.8"
6+
"version": "12.9"
77
},
88
"ucx": {
99
"version": "1.14.1"
@@ -18,7 +18,7 @@
1818
"image": "ubuntu:22.04",
1919
"features": {
2020
"cuda": {
21-
"version": "12.8"
21+
"version": "12.9"
2222
},
2323
"ucx": {
2424
"version": "1.15.0-rc3"

windows/image/installers/install-cuda.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Param(
22
[Parameter(Mandatory=$false)]
33
[string]
4-
$cudaVersion="12.8.0"
4+
$cudaVersion="12.9.0"
55
)
66

77
# Use System.Version to tokenize version
@@ -11,7 +11,7 @@ $major = $version.Major
1111
$minor = $version.Minor
1212
$build = $version.Build
1313

14-
# Minimum build is 0, not -1 as default in case "12.8" is passed
14+
# Minimum build is 0, not -1 as default in case "12.9" is passed
1515
if ($build -lt 0) {
1616
$build = 0
1717
}

0 commit comments

Comments
 (0)