From a94cbbe45d0cbe45f9b93a5c0d25f8322dc8c6ad Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 10 Sep 2026 09:31:20 -0700
Subject: [PATCH] bump nvhpc to v26.7

---
 features/src/nvhpc/devcontainer-feature.json | 5 +++--
 features/test/_global/cpp_llvm_cuda_nvhpc.sh | 2 +-
 features/test/_global/scenarios.json         | 2 +-
 features/test/nvhpc/test.sh                  | 2 +-
 matrix.yml                                   | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
index cf9570fe1..6b882d5ce 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.12.0",
+  "version": "26.12.1",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {
       "type": "string",
       "proposals": [
+        "26.7",
         "26.5",
         "26.3",
         "26.1",
@@ -32,7 +33,7 @@
         "22.9",
         "22.7"
       ],
-      "default": "26.5",
+      "default": "26.7",
       "description": "Version of NVHPC SDK to install."
     }
   },
diff --git a/features/test/_global/cpp_llvm_cuda_nvhpc.sh b/features/test/_global/cpp_llvm_cuda_nvhpc.sh
index a78300a16..e0b8e4d40 100644
--- a/features/test/_global/cpp_llvm_cuda_nvhpc.sh
+++ b/features/test/_global/cpp_llvm_cuda_nvhpc.sh
@@ -55,7 +55,7 @@ ls -all "$NVHPC_ROOT"/ 1>&2;
 
 module list 1>&2;
 
-check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.5'";
+check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.7'";
 check "installed" stat /opt/nvidia/hpc_sdk;
 check "nvc++ exists and is on path" which nvc++;
 
diff --git a/features/test/_global/scenarios.json b/features/test/_global/scenarios.json
index dee52eda9..dee80c5aa 100644
--- a/features/test/_global/scenarios.json
+++ b/features/test/_global/scenarios.json
@@ -47,7 +47,7 @@
         "version": "12.9"
       },
       "nvhpc": {
-        "version": "26.5"
+        "version": "26.7"
       },
       "utils": {}
     },
diff --git a/features/test/nvhpc/test.sh b/features/test/nvhpc/test.sh
index 142fdea41..6e990e63f 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.5'"
+check "version" bash -c "echo '$NVHPC_VERSION' | grep '26.7'"
 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 18a4b950b..3ead4a607 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -31,8 +31,8 @@ x-llvm-21: &llvm_21 { name: "llvm", version: "21" }
 x-llvm-22: &llvm_22 { name: "llvm", version: "22" }
 x-llvm-env: &llvm_env { CC: "clang", CXX: "clang++", CUDAHOSTCXX: "clang++" }
 
-x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "26.3" }
-x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "26.5" }
+x-nvhpc-prev: &nvhpc_prev { name: "nvhpc", version: "26.5" }
+x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "26.7" }
 
 x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" }