Add nvhpc 26.1 images (#654)

Co-authored-by: ptaylor <paul.e.taylor@me.com>

Author: alliepiper

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:-}" ] \

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
 

features/src/nvhpc/devcontainer-feature.json

@@ -1,12 +1,13 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "26.4.0",
+  "version": "26.4.1",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "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."
     }
   },

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++

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 }