From 7bc60facc61ab17913ffec44b3408816850e7ca7 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 4 Dec 2025 19:20:36 +0000 Subject: [PATCH 1/6] Add CTK 13.1 to matrix. --- ci/matrix.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/matrix.yaml b/ci/matrix.yaml index 34e39cc9078..f2c3d5d5e8a 100644 --- a/ci/matrix.yaml +++ b/ci/matrix.yaml @@ -345,7 +345,8 @@ all_stds: [17, 20] ctk_versions: 12.0: { stds: [17, 20] } 12.9: { stds: [17, 20], alias: ['12.X', 'nvhpc-prev', 'pybuild', 'clang-cuda'] } - 13.0: { stds: [17, 20], alias: ['13.X', 'nvhpc'] } + 13.0: { stds: [17, 20], alias: ['nvhpc'] } + 13.1: { stds: [17, 20], alias: ['13.X'] } device_compilers: nvcc: # Version / stds are taken from CTK From 18d8dcfea560bc8bb9d9868736c2d1df2fd73419 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 4 Dec 2025 19:21:12 +0000 Subject: [PATCH 2/6] Add 13.1 devcontainers. --- .../cuda13.1-gcc11/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-gcc12/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-gcc13/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-gcc14/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-llvm15/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-llvm16/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-llvm17/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-llvm18/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-llvm19/devcontainer.json | 69 +++++++++++++++++++ .../cuda13.1-llvm20/devcontainer.json | 69 +++++++++++++++++++ .devcontainer/devcontainer.json | 12 ++-- 11 files changed, 696 insertions(+), 6 deletions(-) create mode 100644 .devcontainer/cuda13.1-gcc11/devcontainer.json create mode 100644 .devcontainer/cuda13.1-gcc12/devcontainer.json create mode 100644 .devcontainer/cuda13.1-gcc13/devcontainer.json create mode 100644 .devcontainer/cuda13.1-gcc14/devcontainer.json create mode 100644 .devcontainer/cuda13.1-llvm15/devcontainer.json create mode 100644 .devcontainer/cuda13.1-llvm16/devcontainer.json create mode 100644 .devcontainer/cuda13.1-llvm17/devcontainer.json create mode 100644 .devcontainer/cuda13.1-llvm18/devcontainer.json create mode 100644 .devcontainer/cuda13.1-llvm19/devcontainer.json create mode 100644 .devcontainer/cuda13.1-llvm20/devcontainer.json diff --git a/.devcontainer/cuda13.1-gcc11/devcontainer.json b/.devcontainer/cuda13.1-gcc11/devcontainer.json new file mode 100644 index 00000000000..c85721d28c8 --- /dev/null +++ b/.devcontainer/cuda13.1-gcc11/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-gcc11-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-gcc11" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-gcc11", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "gcc", + "CCCL_HOST_COMPILER_VERSION": "11", + "CCCL_BUILD_INFIX": "cuda13.1-gcc11", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-gcc11" +} diff --git a/.devcontainer/cuda13.1-gcc12/devcontainer.json b/.devcontainer/cuda13.1-gcc12/devcontainer.json new file mode 100644 index 00000000000..14f31e6d8eb --- /dev/null +++ b/.devcontainer/cuda13.1-gcc12/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-gcc12-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-gcc12" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-gcc12", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "gcc", + "CCCL_HOST_COMPILER_VERSION": "12", + "CCCL_BUILD_INFIX": "cuda13.1-gcc12", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-gcc12" +} diff --git a/.devcontainer/cuda13.1-gcc13/devcontainer.json b/.devcontainer/cuda13.1-gcc13/devcontainer.json new file mode 100644 index 00000000000..5eb06265b65 --- /dev/null +++ b/.devcontainer/cuda13.1-gcc13/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-gcc13-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-gcc13" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-gcc13", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "gcc", + "CCCL_HOST_COMPILER_VERSION": "13", + "CCCL_BUILD_INFIX": "cuda13.1-gcc13", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-gcc13" +} diff --git a/.devcontainer/cuda13.1-gcc14/devcontainer.json b/.devcontainer/cuda13.1-gcc14/devcontainer.json new file mode 100644 index 00000000000..7666681fc63 --- /dev/null +++ b/.devcontainer/cuda13.1-gcc14/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-gcc14-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-gcc14" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-gcc14", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "gcc", + "CCCL_HOST_COMPILER_VERSION": "14", + "CCCL_BUILD_INFIX": "cuda13.1-gcc14", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-gcc14" +} diff --git a/.devcontainer/cuda13.1-llvm15/devcontainer.json b/.devcontainer/cuda13.1-llvm15/devcontainer.json new file mode 100644 index 00000000000..cd5593bfe21 --- /dev/null +++ b/.devcontainer/cuda13.1-llvm15/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-llvm15-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-llvm15" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-llvm15", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "llvm", + "CCCL_HOST_COMPILER_VERSION": "15", + "CCCL_BUILD_INFIX": "cuda13.1-llvm15", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-llvm15" +} diff --git a/.devcontainer/cuda13.1-llvm16/devcontainer.json b/.devcontainer/cuda13.1-llvm16/devcontainer.json new file mode 100644 index 00000000000..f48655a62fa --- /dev/null +++ b/.devcontainer/cuda13.1-llvm16/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-llvm16-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-llvm16" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-llvm16", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "llvm", + "CCCL_HOST_COMPILER_VERSION": "16", + "CCCL_BUILD_INFIX": "cuda13.1-llvm16", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-llvm16" +} diff --git a/.devcontainer/cuda13.1-llvm17/devcontainer.json b/.devcontainer/cuda13.1-llvm17/devcontainer.json new file mode 100644 index 00000000000..ee500e3cf51 --- /dev/null +++ b/.devcontainer/cuda13.1-llvm17/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-llvm17-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-llvm17" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-llvm17", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "llvm", + "CCCL_HOST_COMPILER_VERSION": "17", + "CCCL_BUILD_INFIX": "cuda13.1-llvm17", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-llvm17" +} diff --git a/.devcontainer/cuda13.1-llvm18/devcontainer.json b/.devcontainer/cuda13.1-llvm18/devcontainer.json new file mode 100644 index 00000000000..04405cb5524 --- /dev/null +++ b/.devcontainer/cuda13.1-llvm18/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-llvm18-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-llvm18" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-llvm18", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "llvm", + "CCCL_HOST_COMPILER_VERSION": "18", + "CCCL_BUILD_INFIX": "cuda13.1-llvm18", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-llvm18" +} diff --git a/.devcontainer/cuda13.1-llvm19/devcontainer.json b/.devcontainer/cuda13.1-llvm19/devcontainer.json new file mode 100644 index 00000000000..17846f31b51 --- /dev/null +++ b/.devcontainer/cuda13.1-llvm19/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-llvm19-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-llvm19" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-llvm19", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "llvm", + "CCCL_HOST_COMPILER_VERSION": "19", + "CCCL_BUILD_INFIX": "cuda13.1-llvm19", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-llvm19" +} diff --git a/.devcontainer/cuda13.1-llvm20/devcontainer.json b/.devcontainer/cuda13.1-llvm20/devcontainer.json new file mode 100644 index 00000000000..9c1c20d8fde --- /dev/null +++ b/.devcontainer/cuda13.1-llvm20/devcontainer.json @@ -0,0 +1,69 @@ +{ + "shutdownAction": "stopContainer", + "image": "rapidsai/devcontainers:25.12-cpp-llvm20-cuda13.1", + "runArgs": [ + "--init", + "--name", + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-llvm20" + ], + "hostRequirements": { + "gpu": "optional" + }, + "initializeCommand": [ + "/bin/bash", + "-c", + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/{build,wheelhouse}; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build >/dev/null; docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/wheelhouse --opt o=bind cccl-wheelhouse >/dev/null; else docker volume create cccl-build >/dev/null; docker volume create cccl-wheelhouse >/dev/null; fi;" + ], + "postAttachCommand": [ + "/bin/bash", + "-c", + "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi" + ], + "containerEnv": { + "SCCACHE_REGION": "us-east-2", + "SCCACHE_BUCKET": "rapids-sccache-devs", + "SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE": "true", + "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", + "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", + "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", + "DEVCONTAINER_NAME": "cuda13.1-llvm20", + "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", + "CCCL_CUDA_VERSION": "13.1", + "CCCL_HOST_COMPILER": "llvm", + "CCCL_HOST_COMPILER_VERSION": "20", + "CCCL_BUILD_INFIX": "cuda13.1-llvm20", + "CCCL_CUDA_EXTENDED": "false", + "HOST_WORKSPACE": "${localWorkspaceFolder}" + }, + "workspaceFolder": "/home/coder/cccl", + "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/cccl,type=bind,consistency=consistent", + "mounts": [ + "source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent", + "source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent", + "source=cccl-build,target=/home/coder/cccl/build", + "source=cccl-wheelhouse,target=/home/coder/cccl/wheelhouse" + ], + "customizations": { + "vscode": { + "extensions": [ + "llvm-vs-code-extensions.vscode-clangd", + "seaube.clangformat", + "nvidia.nsight-vscode-edition", + "ms-vscode.cmake-tools" + ], + "settings": { + "editor.defaultFormatter": "seaube.clangformat", + "editor.formatOnSave": true, + "clang-format.executable": "/usr/bin/clang-format", + "clangd.arguments": [ + "--header-insertion=never", + "--compile-commands-dir=${workspaceFolder}" + ], + "files.eol": "\n", + "files.trimTrailingWhitespace": true + } + } + }, + "name": "cuda13.1-llvm20" +} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0291805af43..31326426d24 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,10 +1,10 @@ { "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.12-cpp-gcc14-cuda13.0", + "image": "rapidsai/devcontainers:25.12-cpp-gcc14-cuda13.1", "runArgs": [ "--init", "--name", - "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.0-gcc14" + "${localEnv:USER:anon}-${localWorkspaceFolderBasename}-cuda13.1-gcc14" ], "hostRequirements": { "gpu": "optional" @@ -26,12 +26,12 @@ "SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX": "cccl-preprocessor-cache", "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda13.0-gcc14", + "DEVCONTAINER_NAME": "cuda13.1-gcc14", "DEVCONTAINER_UTILS_ENABLE_SCCACHE_DIST": "1", - "CCCL_CUDA_VERSION": "13.0", + "CCCL_CUDA_VERSION": "13.1", "CCCL_HOST_COMPILER": "gcc", "CCCL_HOST_COMPILER_VERSION": "14", - "CCCL_BUILD_INFIX": "cuda13.0-gcc14", + "CCCL_BUILD_INFIX": "cuda13.1-gcc14", "CCCL_CUDA_EXTENDED": "false", "HOST_WORKSPACE": "${localWorkspaceFolder}" }, @@ -65,5 +65,5 @@ } } }, - "name": "cuda13.0-gcc14" + "name": "cuda13.1-gcc14" } From c2529220b52389d3aa6a701bb3c0d6f38f1e1ba4 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Fri, 5 Dec 2025 14:21:45 +0000 Subject: [PATCH 3/6] Update misc bits to CTK 13.1. --- .github/workflows/build-matx.yml | 2 +- .github/workflows/build-pytorch.yml | 2 +- .github/workflows/git-bisect.yml | 2 +- AGENTS.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-matx.yml b/.github/workflows/build-matx.yml index 5f3eb59aca9..d404d0d4e54 100644 --- a/.github/workflows/build-matx.yml +++ b/.github/workflows/build-matx.yml @@ -92,7 +92,7 @@ jobs: .devcontainer/launch.sh \ --docker \ - --cuda 12.9 \ + --cuda 13.1 \ --host gcc14 \ --cuda-ext \ --env "CCCL_TAG=${CCCL_TAG}" \ diff --git a/.github/workflows/build-pytorch.yml b/.github/workflows/build-pytorch.yml index 6b7ac233320..a1b23c00f3d 100644 --- a/.github/workflows/build-pytorch.yml +++ b/.github/workflows/build-pytorch.yml @@ -82,7 +82,7 @@ jobs: .devcontainer/launch.sh \ --docker \ - --cuda 13.0 \ + --cuda 13.1 \ --host gcc14 \ --cuda-ext \ --env "CCCL_TAG=${CCCL_TAG}" \ diff --git a/.github/workflows/git-bisect.yml b/.github/workflows/git-bisect.yml index a047221360f..daec9e85fe6 100644 --- a/.github/workflows/git-bisect.yml +++ b/.github/workflows/git-bisect.yml @@ -15,7 +15,7 @@ on: launch_args: description: "'.devcontainer/launch.sh -d' add'l args. Ex: '--cuda 12.9 --host gcc13'" required: false - default: "--cuda 13.0 --host gcc14" + default: "--cuda 13.1 --host gcc14" type: string preset: description: "CMake preset. Ex: cub-cpp20" diff --git a/AGENTS.md b/AGENTS.md index 7b9534c9245..293df730921 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -54,7 +54,7 @@ Common options: Example: ```bash -.devcontainer/launch.sh -d --cuda 13.0 --host gcc14 --