From e75bf4a141da336d880ae6ee12a3244024fadadd Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 31 Mar 2026 09:16:33 -0700 Subject: [PATCH 1/4] bump to nvhpc 26.3 --- matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix.yml b/matrix.yml index fdcdddaf..6717607c 100644 --- a/matrix.yml +++ b/matrix.yml @@ -28,8 +28,8 @@ x-llvm-20: &llvm_20 { name: "llvm", version: "20" } x-llvm-21: &llvm_21 { name: "llvm", version: "21" } x-llvm-env: &llvm_env { CC: "clang", CXX: "clang++", CUDAHOSTCXX: "clang++" } -x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "25.11" } -x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "26.1" } +x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "26.1" } +x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "26.3" } x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" } From 196da88f5ea5b71e5419c6ede41bcc31de371667 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 31 Mar 2026 09:22:02 -0700 Subject: [PATCH 2/4] bump latest version to 26.3, add tests for 26.1 --- features/src/nvhpc/devcontainer-feature.json | 3 +- features/test/nvhpc/nvhpc_26_1.sh | 33 ++++++++++++++++++++ features/test/nvhpc/scenarios.json | 8 +++++ features/test/nvhpc/test.sh | 2 +- 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 features/test/nvhpc/nvhpc_26_1.sh diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json index 83857f1b..9d6b093c 100644 --- a/features/src/nvhpc/devcontainer-feature.json +++ b/features/src/nvhpc/devcontainer-feature.json @@ -1,12 +1,13 @@ { "name": "NVHPC SDK", "id": "nvhpc", - "version": "26.6.0", + "version": "26.6.1", "description": "A feature to install the NVHPC SDK", "options": { "version": { "type": "string", "proposals": [ + "26.3", "26.1", "25.11", "25.9", diff --git a/features/test/nvhpc/nvhpc_26_1.sh b/features/test/nvhpc/nvhpc_26_1.sh new file mode 100644 index 00000000..da090e60 --- /dev/null +++ b/features/test/nvhpc/nvhpc_26_1.sh @@ -0,0 +1,33 @@ +#! /usr/bin/env bash + +# This test can be run with the following command (from the root of this repo) +# ``` +# npx --package=@devcontainers/cli -c 'devcontainer features test \ +# --features nvhpc \ +# --base-image ubuntu:22.04 .' +# ``` + +set -e + +# Optional: Import test library bundled with the devcontainer CLI +source dev-container-features-test-lib + +env | grep NVHPC 1>&2 +ls -all "$NVHPC_ROOT"/ 1>&2 + +>&2 echo "BASH_ENV=$BASH_ENV" +>&2 echo "PATH=$PATH" +module list 1>&2 + +# Feature-specific tests +# The 'check' command comes from the dev-container-features-test-lib. +check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.1'" +check "installed" stat /opt/nvidia/hpc_sdk +check "nvcc exists and is on path" which nvcc +check "nvc++ exists and is on path" which nvc++ +check "mpic++ exists and is on path" which mpic++ +check "mpic++ --version does not error" mpic++ --version + +# Report result +# If any of the checks above exited with a non-zero exit code, the test will fail. +reportResults diff --git a/features/test/nvhpc/scenarios.json b/features/test/nvhpc/scenarios.json index 52034c21..5397c5a7 100644 --- a/features/test/nvhpc/scenarios.json +++ b/features/test/nvhpc/scenarios.json @@ -30,5 +30,13 @@ "version": "25.11" } } + }, + "nvhpc_26_1": { + "image": "ubuntu:24.04", + "features": { + "nvhpc": { + "version": "26.1" + } + } } } diff --git a/features/test/nvhpc/test.sh b/features/test/nvhpc/test.sh index da090e60..3ee148fc 100644 --- a/features/test/nvhpc/test.sh +++ b/features/test/nvhpc/test.sh @@ -21,7 +21,7 @@ module list 1>&2 # Feature-specific tests # The 'check' command comes from the dev-container-features-test-lib. -check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.1'" +check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.3'" check "installed" stat /opt/nvidia/hpc_sdk check "nvcc exists and is on path" which nvcc check "nvc++ exists and is on path" which nvc++ From 67bba1fa963c275d08668c860e00832550b5955a Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 31 Mar 2026 09:47:29 -0700 Subject: [PATCH 3/4] update default nvhpc version --- features/src/nvhpc/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json index 9d6b093c..3728194f 100644 --- a/features/src/nvhpc/devcontainer-feature.json +++ b/features/src/nvhpc/devcontainer-feature.json @@ -31,7 +31,7 @@ "22.9", "22.7" ], - "default": "26.1", + "default": "26.3", "description": "Version of NVHPC SDK to install." } }, From 37761898c06975dee41d67ca591f8992bc6dd455 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 31 Mar 2026 11:17:01 -0700 Subject: [PATCH 4/4] remove nvhpc 26.1 scenario test --- features/test/nvhpc/nvhpc_26_1.sh | 33 ------------------------------ features/test/nvhpc/scenarios.json | 8 -------- 2 files changed, 41 deletions(-) delete mode 100644 features/test/nvhpc/nvhpc_26_1.sh diff --git a/features/test/nvhpc/nvhpc_26_1.sh b/features/test/nvhpc/nvhpc_26_1.sh deleted file mode 100644 index da090e60..00000000 --- a/features/test/nvhpc/nvhpc_26_1.sh +++ /dev/null @@ -1,33 +0,0 @@ -#! /usr/bin/env bash - -# This test can be run with the following command (from the root of this repo) -# ``` -# npx --package=@devcontainers/cli -c 'devcontainer features test \ -# --features nvhpc \ -# --base-image ubuntu:22.04 .' -# ``` - -set -e - -# Optional: Import test library bundled with the devcontainer CLI -source dev-container-features-test-lib - -env | grep NVHPC 1>&2 -ls -all "$NVHPC_ROOT"/ 1>&2 - ->&2 echo "BASH_ENV=$BASH_ENV" ->&2 echo "PATH=$PATH" -module list 1>&2 - -# Feature-specific tests -# The 'check' command comes from the dev-container-features-test-lib. -check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.1'" -check "installed" stat /opt/nvidia/hpc_sdk -check "nvcc exists and is on path" which nvcc -check "nvc++ exists and is on path" which nvc++ -check "mpic++ exists and is on path" which mpic++ -check "mpic++ --version does not error" mpic++ --version - -# Report result -# If any of the checks above exited with a non-zero exit code, the test will fail. -reportResults diff --git a/features/test/nvhpc/scenarios.json b/features/test/nvhpc/scenarios.json index 5397c5a7..52034c21 100644 --- a/features/test/nvhpc/scenarios.json +++ b/features/test/nvhpc/scenarios.json @@ -30,13 +30,5 @@ "version": "25.11" } } - }, - "nvhpc_26_1": { - "image": "ubuntu:24.04", - "features": { - "nvhpc": { - "version": "26.1" - } - } } }