Skip to content

Commit 69a88fc

Browse files
authored
Merge pull request #546 from rapidsai/branch-25.08
Forward-merge branch-25.08 into branch-25.10
2 parents 0d46bfc + b94b76d commit 69a88fc

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

features/src/nvhpc/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 NVHPC SDK
1515

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

2020
## Customizations
2121

features/src/nvhpc/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+
"25.7",
1011
"25.5",
1112
"25.3",
1213
"25.1",
@@ -26,7 +27,7 @@
2627
"22.9",
2728
"22.7"
2829
],
29-
"default": "25.5",
30+
"default": "25.7",
3031
"description": "Version of NVHPC SDK to install."
3132
}
3233
},

features/test/nvhpc/test.sh

Lines changed: 1 addition & 1 deletion
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 '25.5'"
27+
check "version" bash -c "echo '$NVHPC_VERSION' | grep '25.7'"
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ x-llvm-prev: &llvm_18 { name: "llvm", version: "18" }
2626
x-llvm-curr: &llvm_19 { name: "llvm", version: "19" }
2727
x-llvm-env: &llvm_env { CC: "clang", CXX: "clang++", CUDAHOSTCXX: "clang++" }
2828

29-
x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "25.3" }
30-
x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "25.5" }
29+
x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "25.5" }
30+
x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "25.7" }
3131

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

0 commit comments

Comments
 (0)