Skip to content

Commit c92e78e

Browse files
ericnieblerericniebler
authored
Merge pull request #1562 from trxcllnt/fea/update-compiler-versions
Update CI and devcontainer compiler versions
2 parents c9d272a + bb7705b commit c92e78e

File tree

6 files changed

+34
-19
lines changed

6 files changed

+34
-19
lines changed

.devcontainer/nvhpc24.3/devcontainer.json renamed to .devcontainer/llvm19-cuda12.0/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "rapidsai/devcontainers:24.12-cpp-nvhpc24.9-ubuntu22.04",
2+
"image": "rapidsai/devcontainers:25.08-cpp-llvm19-cuda12.0",
33

44
"hostRequirements": { "gpu": "optional" },
55

.devcontainer/llvm18-cuda12.0/devcontainer.json renamed to .devcontainer/llvm19-cuda12.9/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "rapidsai/devcontainers:24.12-cpp-llvm18-cuda12.0-ubuntu22.04",
2+
"image": "rapidsai/devcontainers:25.08-cpp-llvm19-cuda12.9",
33

44
"hostRequirements": { "gpu": "optional" },
55

.devcontainer/llvm18-cuda12.4/devcontainer.json renamed to .devcontainer/nvhpc25.5/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "rapidsai/devcontainers:24.12-cpp-llvm18-cuda12.6-ubuntu22.04",
2+
"image": "rapidsai/devcontainers:25.08-cpp-nvhpc25.5",
33

44
"hostRequirements": { "gpu": "optional" },
55

‎.github/workflows/ci.cpu.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- { name: "CPU (clang 13, Debug, ubuntu 20.04)", build: "Debug", tag: llvm13-cuda12.6-ubuntu20.04, cxxflags: "-stdlib=libc++" }
24-
- { name: "CPU (clang 13, Release, ubuntu 20.04)", build: "Release", tag: llvm13-cuda12.6-ubuntu20.04, cxxflags: "-stdlib=libc++" }
25-
- { name: "CPU (gcc 11, Debug, ubuntu 22.04)", build: "Debug", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "", }
26-
- { name: "CPU (gcc 11, Release, ubuntu 22.04)", build: "Release", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "", }
27-
- { name: "CPU (gcc 11, Release, ubuntu 22.04, TSAN)", build: "Release", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "-fsanitize=thread" }
28-
- { name: "CPU (gcc 11, Release, ubuntu 22.04, ASAN)", build: "Release", tag: gcc11-cuda12.6-ubuntu22.04, cxxflags: "-fsanitize=address" }
23+
- { name: "CPU (clang 14, Debug)", build: "Debug", tag: llvm14-cuda12.9, cxxflags: "-stdlib=libc++" }
24+
- { name: "CPU (clang 14, Release)", build: "Release", tag: llvm14-cuda12.9, cxxflags: "-stdlib=libc++" }
25+
- { name: "CPU (gcc 11, Debug)", build: "Debug", tag: gcc11-cuda12.9, cxxflags: "", }
26+
- { name: "CPU (gcc 11, Release)", build: "Release", tag: gcc11-cuda12.9, cxxflags: "", }
27+
- { name: "CPU (gcc 11, Release, TSAN)", build: "Release", tag: gcc11-cuda12.9, cxxflags: "-fsanitize=thread" }
28+
- { name: "CPU (gcc 11, Release, ASAN)", build: "Release", tag: gcc11-cuda12.9, cxxflags: "-fsanitize=address" }
2929
container:
3030
options: -u root
31-
image: rapidsai/devcontainers:24.12-cpp-${{matrix.tag}}
31+
image: rapidsai/devcontainers:25.08-cpp-${{ matrix.tag }}
3232
env:
3333
SCCACHE_REGION: "us-east-2"
3434
SCCACHE_BUCKET: "rapids-sccache-devs"
@@ -111,8 +111,8 @@ jobs:
111111
- name: Build and test CPU schedulers (Windows)
112112
shell: pwsh
113113
run: |
114-
docker pull rapidsai/devcontainers:24.12-cuda12.6-cl14.39-windows2022
115-
docker run --isolation=process -v "$(pwd):C:/stdexec" rapidsai/devcontainers:24.12-cuda12.6-cl14.39-windows2022 powershell C:/stdexec/.github/workflows/test-windows.ps1 -Compiler '${{ matrix.compiler }}' -Config '${{ matrix.build }}'
114+
docker pull rapidsai/devcontainers:25.08-cuda12.9-cl14.43
115+
docker run --isolation=process -v "$(pwd):C:/stdexec" rapidsai/devcontainers:25.08-cuda12.9-cl14.43 powershell C:/stdexec/.github/workflows/test-windows.ps1 -Compiler '${{ matrix.compiler }}' -Config '${{ matrix.build }}'
116116
117117
ci-cpu-windows:
118118
runs-on: windows-latest

‎.github/workflows/ci.gpu.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- { name: "clang 18", cuda: "12.0", cxx: "clang++", build: "Release", tag: "llvm18-cuda12.0", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
24-
- { name: "clang 18", cuda: "12.6", cxx: "clang++", build: "Release", tag: "llvm18-cuda12.6", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
25-
- { name: "nvc++ 24.9", cuda: "12.6", cxx: "mpic++", build: "Release", tag: "nvhpc24.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
26-
- { name: "nvc++ 24.9", cuda: "12.6", cxx: "mpic++", build: "Debug", tag: "nvhpc24.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
23+
- { name: "clang 19", cuda: "12.0", cxx: "clang++", build: "Release", tag: "llvm19-cuda12.0", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
24+
- { name: "clang 19", cuda: "12.9", cxx: "clang++", build: "Release", tag: "llvm19-cuda12.9", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
25+
- { name: "nvc++ 25.5", cuda: "12.9", cxx: "mpic++", build: "Release", tag: "nvhpc25.5", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
26+
- { name: "nvc++ 25.5", cuda: "12.9", cxx: "mpic++", build: "Debug", tag: "nvhpc25.5", gpu: "v100", sm: "70", driver: "latest", arch: "amd64" }
2727
runs-on: linux-${{ matrix.arch }}-gpu-${{ matrix.gpu }}-${{ matrix.driver }}-1
2828
container:
2929
options: -u root
30-
image: rapidsai/devcontainers:24.12-cpp-${{ matrix.tag }}-ubuntu22.04
30+
image: rapidsai/devcontainers:25.08-cpp-${{ matrix.tag }}
3131
env:
3232
SCCACHE_REGION: "us-east-2"
3333
SCCACHE_BUCKET: "rapids-sccache-devs"

‎CMakeLists.txt‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,25 @@ if(STDEXEC_ENABLE_CUDA)
312312
target_compile_features(nvexec INTERFACE cuda_std_20)
313313
target_link_libraries(nvexec INTERFACE STDEXEC::stdexec)
314314

315+
set(_gpus)
316+
foreach(_arch IN LISTS CMAKE_CUDA_ARCHITECTURES)
317+
if(_arch MATCHES "-real")
318+
string(REPLACE "-real" "" _arch "${_arch}")
319+
string(PREPEND _arch "cc")
320+
elseif(_arch MATCHES "-virtual")
321+
string(REPLACE "-virtual" "" _arch "${_arch}")
322+
string(PREPEND _arch "cc")
323+
elseif(_arch MATCHES "^[0-9]+$")
324+
string(PREPEND _arch "cc")
325+
endif()
326+
list(APPEND _gpus "${_arch}")
327+
endforeach()
328+
list(JOIN _gpus "," _gpus)
329+
315330
target_compile_options(nvexec INTERFACE
316-
$<$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>:-stdpar -gpu=cc${CMAKE_CUDA_ARCHITECTURES}>)
331+
$<$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>:-stdpar -gpu=${_gpus}>)
317332
target_link_options(nvexec INTERFACE
318-
$<$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>:-stdpar -gpu=cc${CMAKE_CUDA_ARCHITECTURES}>)
333+
$<$<AND:$<CXX_COMPILER_ID:NVHPC>,$<COMPILE_LANGUAGE:CXX>>:-stdpar -gpu=${_gpus}>)
319334

320335
install(TARGETS nvexec
321336
EXPORT stdexec-exports

0 commit comments

Comments
 (0)