use more recent versions of nvhpc in CI

.devcontainer/gcc11-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-gcc11-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-gcc11-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/gcc12-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-gcc12-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-gcc12-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/gcc13-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-gcc13-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-gcc13-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/gcc14-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-gcc14-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-gcc14-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/gcc15-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-gcc15-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-gcc15-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/llvm16-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-llvm16-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-llvm16-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/llvm22-cuda12.0/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-llvm22-cuda12.0",
+  "image": "rapidsai/devcontainers:26.12-cpp-llvm22-cuda12.0",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/llvm22-cuda12.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-llvm22-cuda12.9",
+  "image": "rapidsai/devcontainers:26.12-cpp-llvm22-cuda12.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/llvm22-cuda13.2/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-llvm22-cuda13.2",
+  "image": "rapidsai/devcontainers:26.12-cpp-llvm22-cuda13.2",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/nvhpc26.1/devcontainer.json → .devcontainer/nvhpc26.5/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-nvhpc26.1",
+  "image": "rapidsai/devcontainers:26.12-cpp-nvhpc26.5",
 
   "hostRequirements": { "gpu": "optional" },
 

.devcontainer/nvhpc26.3/devcontainer.json → .devcontainer/nvhpc26.9/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "rapidsai/devcontainers:26.08-cpp-nvhpc26.3",
+  "image": "rapidsai/devcontainers:26.12-cpp-nvhpc26.9",
 
   "hostRequirements": { "gpu": "optional" },
 

.github/workflows/ci.gpu.yml

@@ -21,14 +21,14 @@ jobs:
         include:
           - { name: "clang 22",    cuda: "12.0", cxx: "clang++", build: "Release", tag: "llvm22-cuda12.0", gpu: "v100", sm: "70", driver: "latest", arch: "amd64", flags: "-Wno-deprecated-declarations" }
           - { name: "clang 22",    cuda: "12.9", cxx: "clang++", build: "Release", tag: "llvm22-cuda12.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64", flags: "" }
-          - { name: "nvc++ 26.1",  cuda: "13.1", cxx: "mpic++",  build: "Release", tag: "nvhpc26.1",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
-          - { name: "nvc++ 26.1",  cuda: "13.1", cxx: "mpic++",  build: "Debug",   tag: "nvhpc26.1",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
-          - { name: "nvc++ 26.3",  cuda: "13.1", cxx: "mpic++",  build: "Release", tag: "nvhpc26.3",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
-          - { name: "nvc++ 26.3",  cuda: "13.1", cxx: "mpic++",  build: "Debug",   tag: "nvhpc26.3",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
+          - { name: "nvc++ 26.5",  cuda: "13.2", cxx: "mpic++",  build: "Release", tag: "nvhpc26.5",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
+          - { name: "nvc++ 26.5",  cuda: "13.2", cxx: "mpic++",  build: "Debug",   tag: "nvhpc26.5",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
+          - { name: "nvc++ 26.9",  cuda: "13.3", cxx: "mpic++",  build: "Release", tag: "nvhpc26.9",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
+          - { name: "nvc++ 26.9",  cuda: "13.3", cxx: "mpic++",  build: "Debug",   tag: "nvhpc26.9",       gpu: "l4",   sm: "75", driver: "latest", arch: "amd64", flags: "" }
     runs-on: linux-${{ matrix.arch }}-gpu-${{ matrix.gpu }}-${{ matrix.driver }}-1
     container:
       options: -u root
-      image: rapidsai/devcontainers:26.08-cpp-${{ matrix.tag }}
+      image: rapidsai/devcontainers:26.12-cpp-${{ matrix.tag }}
       env:
         NVIDIA_VISIBLE_DEVICES: "${{ env.NVIDIA_VISIBLE_DEVICES }}"
     permissions:

README.md

@@ -75,7 +75,7 @@ int main() {
 | Clang | 16 | |
 | MSVC | 14.43 | |
 | Xcode (Apple Clang) | 16 | |
-| nvc++ | 25.9 | required for [GPU support](#gpu-support) |
+| nvc++ | 26.5 | required for [GPU support](#gpu-support) |
 
 Requires `-std=c++20` or later.
 

include/stdexec/__detail/__execution_legacy.hpp

@@ -18,7 +18,17 @@
 #include "__config.hpp"
 
 #if !STDEXEC_NO_STDCPP_EXECUTION_POLICY()
-#  include <execution>  // IWYU pragma: keep
+// NVHPC's <execution> re-includes <stdexec/execution.hpp>. Including that from here, while
+// headers such as __bulk.hpp are only partially parsed, creates an include cycle that leaves
+// those headers' contents undefined for the headers pulled in by the cycle. Suppress NVHPC's
+// stdexec include; it is still honored the next time <execution> is included.
+#  if STDEXEC_NVHPC() && !defined(_NVHPC_STDEXEC_INCLUDE_IN_PROGRESS)
+#    define _NVHPC_STDEXEC_INCLUDE_IN_PROGRESS
+#    include <execution>  // IWYU pragma: keep
+#    undef _NVHPC_STDEXEC_INCLUDE_IN_PROGRESS
+#  else
+#    include <execution>  // IWYU pragma: keep
+#  endif
 #endif
 
 #include "__prologue.hpp"