Skip to content

Commit

Permalink
Use 12.8 everywhere.
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice committed Feb 5, 2025
1 parent a811cbb commit ca3c054
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions features/test/_global/cpp_llvm_cuda_nvhpc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0'";
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'";
check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'";
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '5'";
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.5 /usr/local/cuda;
check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda;
check "nvcc exists and is on path" which nvcc;

# Check NVHPC
Expand Down
6 changes: 3 additions & 3 deletions features/test/_global/cuda_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0'";
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'";
check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'";
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '5'";
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.5 /usr/local/cuda;
check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda;
check "nvcc exists and is on path" which nvcc;

# Check Rust
Expand Down
4 changes: 2 additions & 2 deletions features/test/_global/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"features": {
"rust": {},
"cuda": {
"version": "12.5"
"version": "12.8"
}
},
"overrideFeatureInstallOrder": [
Expand Down Expand Up @@ -44,7 +44,7 @@
"version": "16"
},
"cuda": {
"version": "12.5"
"version": "12.8"
},
"nvhpc": {
"version": "24.5"
Expand Down
6 changes: 3 additions & 3 deletions features/test/cuda/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0'";
check "CUDA version" bash -c "echo '$CUDA_VERSION' | grep '12.8.0'";
check "CUDA major version" bash -c "echo '$CUDA_VERSION_MAJOR' | grep '12'";
check "CUDA minor version" bash -c "echo '$CUDA_VERSION_MINOR' | grep '5'";
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.5 /usr/local/cuda
check "installed" stat /usr/local/cuda-12.8 /usr/local/cuda
check "nvcc exists and is on path" which nvcc

# Report result
Expand Down
2 changes: 1 addition & 1 deletion features/test/openmpi/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"image": "ubuntu:22.04",
"features": {
"cuda": {
"version": "12.5"
"version": "12.8"
},
"ucx": {
"version": "1.15.0"
Expand Down
4 changes: 2 additions & 2 deletions features/test/ucx/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"image": "ubuntu:22.04",
"features": {
"cuda": {
"version": "12.5"
"version": "12.8"
},
"ucx": {
"version": "1.14.1"
Expand All @@ -18,7 +18,7 @@
"image": "ubuntu:22.04",
"features": {
"cuda": {
"version": "12.5"
"version": "12.8"
},
"ucx": {
"version": "1.15.0-rc3"
Expand Down
4 changes: 2 additions & 2 deletions windows/image/installers/install-cuda.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Param(
[Parameter(Mandatory=$false)]
[string]
$cudaVersion="12.5.0"
$cudaVersion="12.8.0"
)

# Use System.Version to tokenize version
Expand All @@ -11,7 +11,7 @@ $major = $version.Major
$minor = $version.Minor
$build = $version.Build

# Minimum build is 0, not -1 as default in case "12.5" is passed
# Minimum build is 0, not -1 as default in case "12.8" is passed
if ($build -lt 0) {
$build = 0
}
Expand Down

0 comments on commit ca3c054

Please sign in to comment.