Skip to content

Commit 3970094

Browse files
authored
Add new nvhpc containers to matrix. (#474)
These are needed for CCCL testing.
1 parent fae7b98 commit 3970094

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

features/src/nvhpc/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A feature to install the NVHPC SDK
1515

1616
| Options Id | Description | Type | Default Value |
1717
|-----|-----|-----|-----|
18-
| version | Version of NVHPC SDK to install. | string | 24.9 |
18+
| version | Version of NVHPC SDK to install. | string | 25.1 |
1919

2020
## Customizations
2121

features/src/nvhpc/devcontainer-feature.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"version": {
88
"type": "string",
99
"proposals": [
10+
"25.1",
11+
"24.11",
1012
"24.9",
1113
"24.7",
1214
"24.5",
@@ -22,7 +24,7 @@
2224
"22.9",
2325
"22.7"
2426
],
25-
"default": "24.9",
27+
"default": "25.1",
2628
"description": "Version of NVHPC SDK to install."
2729
}
2830
},

features/test/nvhpc/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module list 1>&2
2424

2525
# Feature-specific tests
2626
# The 'check' command comes from the dev-container-features-test-lib.
27-
check "version" bash -c "echo '$NVHPC_VERSION' | grep '24.9'"
27+
check "version" bash -c "echo '$NVHPC_VERSION' | grep '25.1'"
2828
check "installed" stat /opt/nvidia/hpc_sdk
2929
check "nvc++ exists and is on path" which nvc++
3030
check "mpic++ exists and is on path" which mpic++

matrix.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ x-llvm-prev: &llvm_18 { name: "llvm", version: "18" }
2222
x-llvm-curr: &llvm_19 { name: "llvm", version: "19" }
2323
x-llvm-env: &llvm_env { CC: "clang", CXX: "clang++", CUDAHOSTCXX: "clang++" }
2424

25-
x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "24.7" }
26-
x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "24.9" }
25+
x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "24.11" }
26+
x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "25.1" }
2727

2828
x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" }
2929

0 commit comments

Comments
 (0)