From 2df8b4937d95ee7cf50ffcb6aa20ec96160c09ed Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Fri, 30 Jan 2026 10:42:04 -0500 Subject: [PATCH 1/3] Add nvhpc 26.1 images --- features/src/nvhpc/README.md | 2 +- features/src/nvhpc/devcontainer-feature.json | 3 ++- features/test/nvhpc/test.sh | 2 +- matrix.yml | 7 +++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/features/src/nvhpc/README.md b/features/src/nvhpc/README.md index fa020d01..3162aef9 100644 --- a/features/src/nvhpc/README.md +++ b/features/src/nvhpc/README.md @@ -15,7 +15,7 @@ A feature to install the NVHPC SDK | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| version | Version of NVHPC SDK to install. | string | 25.11 | +| version | Version of NVHPC SDK to install. | string | 26.1 | ## Customizations diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json index 4623630e..17a3ccad 100644 --- a/features/src/nvhpc/devcontainer-feature.json +++ b/features/src/nvhpc/devcontainer-feature.json @@ -7,6 +7,7 @@ "version": { "type": "string", "proposals": [ + "26.1", "25.11", "25.9", "25.7", @@ -29,7 +30,7 @@ "22.9", "22.7" ], - "default": "25.11", + "default": "26.1", "description": "Version of NVHPC SDK to install." } }, diff --git a/features/test/nvhpc/test.sh b/features/test/nvhpc/test.sh index 26b3fd03..da090e60 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 '25.11'" +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++ diff --git a/matrix.yml b/matrix.yml index d83a7409..4299aafc 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.9" } -x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "25.11" } +x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "25.11" } +x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "26.1" } x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" } @@ -91,8 +91,6 @@ include: - os: "ubuntu:22.04" images: - - { features: [*python, *dood, *nvhpc_prev, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *nvhpc_env } - - { features: [*python, *dood, *gcc_11, { <<: *cuda_prev_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *dood, *gcc_11, { <<: *cuda_prev_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *dood, *gcc_11, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } @@ -132,6 +130,7 @@ include: - os: "ubuntu:24.04" images: + - { features: [*python, *dood, *nvhpc_prev, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *nvhpc_env } - { features: [*python, *dood, *nvhpc_curr, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *nvhpc_env } - { features: [*python, *dood, *gcc_13, { <<: *cuda_prev_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } From e6ec08c2ba4a4b56b39ccee6141c8d2b3e938359 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 3 Feb 2026 13:28:53 -0800 Subject: [PATCH 2/3] don't set NVHPC_CUDA_HOME --- features/src/nvhpc/.bashrc | 1 - 1 file changed, 1 deletion(-) diff --git a/features/src/nvhpc/.bashrc b/features/src/nvhpc/.bashrc index 3b00221e..0bfffd56 100644 --- a/features/src/nvhpc/.bashrc +++ b/features/src/nvhpc/.bashrc @@ -3,7 +3,6 @@ export NVHPC_VERSION="${NVHPC_VERSION}"; export NVHPC_VERSION_MAJOR="${NVHPC_VERSION_MAJOR}"; export NVHPC_VERSION_MINOR="${NVHPC_VERSION_MINOR}"; export NVHPC_ROOT="${NVHPC_ROOT}"; -export NVHPC_CUDA_HOME="${NVHPC_CUDA_HOME}"; export NVHPC_MODULEFILE_DIRS=${NVHPC_MODULEFILE_DIRS}; if [ -z "${LIBRARY_PATH:-}" ] \ From 13e18be4a71630c1a389dc89b5295b7638e4bf46 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 3 Feb 2026 13:29:22 -0800 Subject: [PATCH 3/3] bump devcontainer feature 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 17a3ccad..b35ae53d 100644 --- a/features/src/nvhpc/devcontainer-feature.json +++ b/features/src/nvhpc/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "NVHPC SDK", "id": "nvhpc", - "version": "26.4.0", + "version": "26.4.1", "description": "A feature to install the NVHPC SDK", "options": { "version": {