From daa147dd330a35b913c7c67bd9b2829884d0c763 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 9 Jan 2025 17:20:50 -0500 Subject: [PATCH] Drop clang<14 from CI, update devcontainers. (#3309) Co-authored-by: Bernhard Manfred Gruber --- .../cuda12.0-llvm10/devcontainer.json | 54 ------------------- .../cuda12.0-llvm11/devcontainer.json | 54 ------------------- .../cuda12.0-llvm12/devcontainer.json | 54 ------------------- .../cuda12.0-llvm13/devcontainer.json | 54 ------------------- .../cuda12.0-llvm9/devcontainer.json | 54 ------------------- .../cuda12.6-llvm10/devcontainer.json | 54 ------------------- .../cuda12.6-llvm11/devcontainer.json | 54 ------------------- .../cuda12.6-llvm12/devcontainer.json | 54 ------------------- .../cuda12.6-llvm13/devcontainer.json | 54 ------------------- .../cuda12.6-llvm9/devcontainer.json | 54 ------------------- ci/matrix.yaml | 25 ++++----- 11 files changed, 9 insertions(+), 556 deletions(-) delete mode 100644 .devcontainer/cuda12.0-llvm10/devcontainer.json delete mode 100644 .devcontainer/cuda12.0-llvm11/devcontainer.json delete mode 100644 .devcontainer/cuda12.0-llvm12/devcontainer.json delete mode 100644 .devcontainer/cuda12.0-llvm13/devcontainer.json delete mode 100644 .devcontainer/cuda12.0-llvm9/devcontainer.json delete mode 100644 .devcontainer/cuda12.6-llvm10/devcontainer.json delete mode 100644 .devcontainer/cuda12.6-llvm11/devcontainer.json delete mode 100644 .devcontainer/cuda12.6-llvm12/devcontainer.json delete mode 100644 .devcontainer/cuda12.6-llvm13/devcontainer.json delete mode 100644 .devcontainer/cuda12.6-llvm9/devcontainer.json diff --git a/.devcontainer/cuda12.0-llvm10/devcontainer.json b/.devcontainer/cuda12.0-llvm10/devcontainer.json deleted file mode 100644 index 6f75525f808..00000000000 --- a/.devcontainer/cuda12.0-llvm10/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm10-cuda12.0", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-llvm10", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "10", - "CCCL_BUILD_INFIX": "cuda12.0-llvm10", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.0-llvm10" -} diff --git a/.devcontainer/cuda12.0-llvm11/devcontainer.json b/.devcontainer/cuda12.0-llvm11/devcontainer.json deleted file mode 100644 index fd21f30fbd3..00000000000 --- a/.devcontainer/cuda12.0-llvm11/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm11-cuda12.0", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-llvm11", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "11", - "CCCL_BUILD_INFIX": "cuda12.0-llvm11", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.0-llvm11" -} diff --git a/.devcontainer/cuda12.0-llvm12/devcontainer.json b/.devcontainer/cuda12.0-llvm12/devcontainer.json deleted file mode 100644 index b402063c837..00000000000 --- a/.devcontainer/cuda12.0-llvm12/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm12-cuda12.0", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-llvm12", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "12", - "CCCL_BUILD_INFIX": "cuda12.0-llvm12", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.0-llvm12" -} diff --git a/.devcontainer/cuda12.0-llvm13/devcontainer.json b/.devcontainer/cuda12.0-llvm13/devcontainer.json deleted file mode 100644 index 40187a60e6c..00000000000 --- a/.devcontainer/cuda12.0-llvm13/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm13-cuda12.0", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-llvm13", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "13", - "CCCL_BUILD_INFIX": "cuda12.0-llvm13", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.0-llvm13" -} diff --git a/.devcontainer/cuda12.0-llvm9/devcontainer.json b/.devcontainer/cuda12.0-llvm9/devcontainer.json deleted file mode 100644 index e72c6da2fdd..00000000000 --- a/.devcontainer/cuda12.0-llvm9/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda12.0", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.0-llvm9", - "CCCL_CUDA_VERSION": "12.0", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "9", - "CCCL_BUILD_INFIX": "cuda12.0-llvm9", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.0-llvm9" -} diff --git a/.devcontainer/cuda12.6-llvm10/devcontainer.json b/.devcontainer/cuda12.6-llvm10/devcontainer.json deleted file mode 100644 index ef06f7cf9a2..00000000000 --- a/.devcontainer/cuda12.6-llvm10/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm10-cuda12.6", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.6-llvm10", - "CCCL_CUDA_VERSION": "12.6", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "10", - "CCCL_BUILD_INFIX": "cuda12.6-llvm10", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.6-llvm10" -} diff --git a/.devcontainer/cuda12.6-llvm11/devcontainer.json b/.devcontainer/cuda12.6-llvm11/devcontainer.json deleted file mode 100644 index 38c13841ee6..00000000000 --- a/.devcontainer/cuda12.6-llvm11/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm11-cuda12.6", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.6-llvm11", - "CCCL_CUDA_VERSION": "12.6", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "11", - "CCCL_BUILD_INFIX": "cuda12.6-llvm11", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.6-llvm11" -} diff --git a/.devcontainer/cuda12.6-llvm12/devcontainer.json b/.devcontainer/cuda12.6-llvm12/devcontainer.json deleted file mode 100644 index 8898d216573..00000000000 --- a/.devcontainer/cuda12.6-llvm12/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm12-cuda12.6", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.6-llvm12", - "CCCL_CUDA_VERSION": "12.6", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "12", - "CCCL_BUILD_INFIX": "cuda12.6-llvm12", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.6-llvm12" -} diff --git a/.devcontainer/cuda12.6-llvm13/devcontainer.json b/.devcontainer/cuda12.6-llvm13/devcontainer.json deleted file mode 100644 index 8d713720c51..00000000000 --- a/.devcontainer/cuda12.6-llvm13/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm13-cuda12.6", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.6-llvm13", - "CCCL_CUDA_VERSION": "12.6", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "13", - "CCCL_BUILD_INFIX": "cuda12.6-llvm13", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.6-llvm13" -} diff --git a/.devcontainer/cuda12.6-llvm9/devcontainer.json b/.devcontainer/cuda12.6-llvm9/devcontainer.json deleted file mode 100644 index be41e2506c5..00000000000 --- a/.devcontainer/cuda12.6-llvm9/devcontainer.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "shutdownAction": "stopContainer", - "image": "rapidsai/devcontainers:25.02-cpp-llvm9-cuda12.6", - "hostRequirements": { - "gpu": "optional" - }, - "initializeCommand": [ - "/bin/bash", - "-c", - "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build;", - "if [[ -n ${WSLENV+set} ]]; then docker volume create cccl-build; else docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build fi;" - ], - "containerEnv": { - "SCCACHE_REGION": "us-east-2", - "SCCACHE_BUCKET": "rapids-sccache-devs", - "AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs", - "HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history", - "DEVCONTAINER_NAME": "cuda12.6-llvm9", - "CCCL_CUDA_VERSION": "12.6", - "CCCL_HOST_COMPILER": "llvm", - "CCCL_HOST_COMPILER_VERSION": "9", - "CCCL_BUILD_INFIX": "cuda12.6-llvm9", - "CCCL_CUDA_EXTENDED": "false" - }, - "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}", - "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},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" - ], - "customizations": { - "vscode": { - "extensions": [ - "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", - "nvidia.nsight-vscode-edition", - "ms-vscode.cmake-tools" - ], - "settings": { - "editor.defaultFormatter": "xaver.clang-format", - "editor.formatOnSave": true, - "clang-format.executable": "/usr/bin/clang-format", - "clangd.arguments": [ - "--compile-commands-dir=${workspaceFolder}" - ], - "files.eol": "\n", - "files.trimTrailingWhitespace": true - } - } - }, - "name": "cuda12.6-llvm9" -} diff --git a/ci/matrix.yaml b/ci/matrix.yaml index 66cc47dd271..881f553f65d 100644 --- a/ci/matrix.yaml +++ b/ci/matrix.yaml @@ -5,18 +5,18 @@ workflows: # # Example: # override: - # - {jobs: ['test'], project: 'thrust', std: 17, ctk: 'curr', cxx: ['gcc12', 'llvm16']} + # - {jobs: ['test'], project: 'thrust', std: 17, ctk: 'curr', cxx: ['gcc12', 'clang16']} # override: pull_request: # Old CTK/compiler - - {jobs: ['build'], std: 'minmax', ctk: '12.0', cxx: ['gcc7', 'gcc9', 'clang9', 'msvc2019']} + - {jobs: ['build'], std: 'minmax', ctk: '12.0', cxx: ['gcc7', 'gcc9', 'clang14', 'msvc2019']} # Current CTK build-only - - {jobs: ['build'], std: [11, 14], cxx: ['gcc7', 'clang9'], project: 'libcudacxx'} - - {jobs: ['build'], std: [17], cxx: ['gcc7', 'clang9']} + - {jobs: ['build'], std: [11, 14], cxx: ['gcc7', 'clang14'], project: 'libcudacxx'} + - {jobs: ['build'], std: [17], cxx: ['gcc7', 'clang14']} - {jobs: ['build'], std: 'max', cxx: ['gcc8', 'gcc9', 'gcc10', 'gcc11', 'gcc12']} - - {jobs: ['build'], std: 'max', cxx: ['clang10', 'clang11', 'clang12', 'clang13', 'clang14', 'clang15', 'clang16', 'clang17']} + - {jobs: ['build'], std: 'max', cxx: ['clang14', 'clang15', 'clang16', 'clang17']} - {jobs: ['build'], std: 'max', cxx: ['msvc2019']} - {jobs: ['build'], std: [17, 20], cxx: ['gcc', 'clang', 'msvc']} # Current CTK testing: @@ -44,7 +44,6 @@ workflows: # cudax has different CTK reqs: - {jobs: ['build'], project: 'cudax', ctk: ['12.0'], std: 20, cxx: ['msvc14.36']} - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['gcc10', 'gcc11', 'gcc12']} - - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['clang10', 'clang11', 'clang12', 'clang13']} - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['clang14', 'clang15', 'clang16', 'clang17']} - {jobs: ['build'], project: 'cudax', ctk: ['12.5'], std: [17, 20], cxx: ['nvhpc']} - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['msvc2022']} @@ -64,11 +63,11 @@ workflows: - {jobs: ['test_gpu'], project: 'thrust', cmake_options: '-DTHRUST_DISPATCH_TYPE=Force32bit'} - {jobs: ['test_gpu'], project: 'thrust', cmake_options: '-DTHRUST_DISPATCH_TYPE=Force64bit'} # Old CTK/compiler - - {jobs: ['build'], std: 'all', ctk: '12.0', cxx: ['gcc7', 'gcc8', 'gcc9', 'clang9', 'msvc2019']} + - {jobs: ['build'], std: 'all', ctk: '12.0', cxx: ['gcc7', 'gcc8', 'gcc9', 'clang14', 'msvc2019']} - {jobs: ['build'], std: 'all', ctk: '12.0', cxx: ['gcc11'], sm: '60;70;80;90'} # Current CTK build-only - {jobs: ['build'], std: 'all', cxx: ['gcc7', 'gcc8', 'gcc9', 'gcc10', 'gcc11', 'gcc12']} - - {jobs: ['build'], std: 'all', cxx: ['clang9', 'clang10', 'clang11', 'clang12', 'clang13', 'clang14', 'clang15', 'clang16', 'clang17']} + - {jobs: ['build'], std: 'all', cxx: ['clang14', 'clang15', 'clang16', 'clang17']} - {jobs: ['build'], std: 'all', cxx: ['msvc2019']} # Test current CTK - {jobs: ['test'], std: 'all', cxx: ['gcc13', 'clang18', 'msvc2022']} @@ -82,7 +81,6 @@ workflows: - {jobs: ['build'], project: 'libcudacxx', std: 'all', cudacxx: 'clang', cxx: 'clang', sm: '90a'} # cudax - {jobs: ['build'], project: 'cudax', ctk: ['12.0', 'curr'], std: 'all', cxx: ['gcc9', 'gcc10', 'gcc11']} - - {jobs: ['build'], project: 'cudax', ctk: ['12.0', 'curr'], std: 'all', cxx: ['clang9', 'clang10', 'clang11', 'clang12', 'clang13']} - {jobs: ['build'], project: 'cudax', ctk: [ 'curr'], std: 'all', cxx: ['clang14', 'clang15', 'clang16', 'clang17']} - {jobs: ['build'], project: 'cudax', ctk: [ '12.5'], std: 'all', cxx: ['nvhpc']} - {jobs: ['build'], project: 'cudax', ctk: ['12.0', ], std: 'all', cxx: ['msvc14.36']} @@ -96,11 +94,11 @@ workflows: # # These are waiting on the NVKS nodes: # - {jobs: ['test'], ctk: '11.1', gpu: 'v100', sm: 'gpu', cxx: 'gcc7', std: [11]} -# - {jobs: ['test'], ctk: '11.1', gpu: 't4', sm: 'gpu', cxx: 'clang9', std: [17]} +# - {jobs: ['test'], ctk: '11.1', gpu: 't4', sm: 'gpu', cxx: 'clang14', std: [17]} # - {jobs: ['test'], ctk: '11.8', gpu: 'rtx2080', sm: 'gpu', cxx: 'gcc11', std: [17]} # - {jobs: ['test'], ctk: 'curr', gpu: 'rtxa6000', sm: 'gpu', cxx: 'gcc7', std: [14]} # - {jobs: ['test'], ctk: 'curr', gpu: 'l4', sm: 'gpu', cxx: 'gcc13', std: 'all'} -# - {jobs: ['test'], ctk: 'curr', gpu: 'rtx4090', sm: 'gpu', cxx: 'clang9', std: [11]} +# - {jobs: ['test'], ctk: 'curr', gpu: 'rtx4090', sm: 'gpu', cxx: 'clang14', std: [11]} # # H100 runners are currently flakey, only build since those use CPU-only runners: # - {jobs: ['build'], ctk: 'curr', gpu: 'h100', sm: 'gpu', cxx: 'gcc12', std: [11, 20]} # - {jobs: ['build'], ctk: 'curr', gpu: 'h100', sm: 'gpu', cxx: 'clang18', std: [17]} @@ -157,11 +155,6 @@ host_compilers: container_tag: 'llvm' exe: 'clang++' versions: - 9: { stds: [11, 14, 17, ] } - 10: { stds: [11, 14, 17, ] } - 11: { stds: [11, 14, 17, 20] } - 12: { stds: [11, 14, 17, 20] } - 13: { stds: [11, 14, 17, 20] } 14: { stds: [11, 14, 17, 20] } 15: { stds: [11, 14, 17, 20] } 16: { stds: [11, 14, 17, 20] }