From 40737d67da4ed4989a74a07480041ee16279aef1 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 6 Feb 2025 00:34:02 -0800 Subject: [PATCH] Fix devcontainers' `initializeCommand` (#3533) * `initializeCommand` should not pass two arguments to `bash -c` * use seaube.clangformat instead of xaver.clang-format because the former works with CUDA * bump MSVC versions * update cuda12.8-llvm18 devcontainer * update cuda12.8-llvm18 devcontainer --- .devcontainer/cuda12.0-gcc10/devcontainer.json | 7 +++---- .devcontainer/cuda12.0-gcc11/devcontainer.json | 7 +++---- .devcontainer/cuda12.0-gcc12/devcontainer.json | 7 +++---- .devcontainer/cuda12.0-gcc7/devcontainer.json | 7 +++---- .devcontainer/cuda12.0-gcc8/devcontainer.json | 7 +++---- .devcontainer/cuda12.0-gcc9/devcontainer.json | 7 +++---- .devcontainer/cuda12.0-llvm14/devcontainer.json | 7 +++---- .devcontainer/cuda12.5-nvhpc24.7/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc10/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc11/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc12/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc13/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc7/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc8/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-gcc9/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-llvm14/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-llvm15/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-llvm16/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-llvm17/devcontainer.json | 7 +++---- .devcontainer/cuda12.8-llvm18/devcontainer.json | 7 +++---- .devcontainer/cuda12.8ext-gcc13/devcontainer.json | 7 +++---- .devcontainer/devcontainer.json | 7 +++---- ci/matrix.yaml | 10 +++++----- 23 files changed, 71 insertions(+), 93 deletions(-) diff --git a/.devcontainer/cuda12.0-gcc10/devcontainer.json b/.devcontainer/cuda12.0-gcc10/devcontainer.json index 1ba0bac44ff..558a4bec185 100644 --- a/.devcontainer/cuda12.0-gcc10/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc10/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.0-gcc11/devcontainer.json b/.devcontainer/cuda12.0-gcc11/devcontainer.json index 095edda6a33..936b8e439fc 100644 --- a/.devcontainer/cuda12.0-gcc11/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc11/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.0-gcc12/devcontainer.json b/.devcontainer/cuda12.0-gcc12/devcontainer.json index 09ab81125e8..1c11e396e8d 100644 --- a/.devcontainer/cuda12.0-gcc12/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc12/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.0-gcc7/devcontainer.json b/.devcontainer/cuda12.0-gcc7/devcontainer.json index 96a32136eb1..c06f667e067 100644 --- a/.devcontainer/cuda12.0-gcc7/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc7/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.0-gcc8/devcontainer.json b/.devcontainer/cuda12.0-gcc8/devcontainer.json index 9cfe4709e07..ac1e50749be 100644 --- a/.devcontainer/cuda12.0-gcc8/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc8/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.0-gcc9/devcontainer.json b/.devcontainer/cuda12.0-gcc9/devcontainer.json index 05246a1e3c2..36a667f4010 100644 --- a/.devcontainer/cuda12.0-gcc9/devcontainer.json +++ b/.devcontainer/cuda12.0-gcc9/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.0-llvm14/devcontainer.json b/.devcontainer/cuda12.0-llvm14/devcontainer.json index 7bf7a98c461..de05a7ad6af 100644 --- a/.devcontainer/cuda12.0-llvm14/devcontainer.json +++ b/.devcontainer/cuda12.0-llvm14/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.5-nvhpc24.7/devcontainer.json b/.devcontainer/cuda12.5-nvhpc24.7/devcontainer.json index c55a685d5e6..fab5609bff8 100644 --- a/.devcontainer/cuda12.5-nvhpc24.7/devcontainer.json +++ b/.devcontainer/cuda12.5-nvhpc24.7/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc10/devcontainer.json b/.devcontainer/cuda12.8-gcc10/devcontainer.json index 5fa59ac052f..f1e39c53dee 100644 --- a/.devcontainer/cuda12.8-gcc10/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc10/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc11/devcontainer.json b/.devcontainer/cuda12.8-gcc11/devcontainer.json index e6408c727e9..02d14ccc947 100644 --- a/.devcontainer/cuda12.8-gcc11/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc11/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc12/devcontainer.json b/.devcontainer/cuda12.8-gcc12/devcontainer.json index 1538817d17b..cd8c1163bb7 100644 --- a/.devcontainer/cuda12.8-gcc12/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc12/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc13/devcontainer.json b/.devcontainer/cuda12.8-gcc13/devcontainer.json index 0cf38c8b80b..8206ff99c92 100644 --- a/.devcontainer/cuda12.8-gcc13/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc13/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc7/devcontainer.json b/.devcontainer/cuda12.8-gcc7/devcontainer.json index 5ca28834c3b..6b0efb32828 100644 --- a/.devcontainer/cuda12.8-gcc7/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc7/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc8/devcontainer.json b/.devcontainer/cuda12.8-gcc8/devcontainer.json index eefd8226a3e..a5cba5db133 100644 --- a/.devcontainer/cuda12.8-gcc8/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc8/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-gcc9/devcontainer.json b/.devcontainer/cuda12.8-gcc9/devcontainer.json index abad6fcb3b5..9420e99ff4c 100644 --- a/.devcontainer/cuda12.8-gcc9/devcontainer.json +++ b/.devcontainer/cuda12.8-gcc9/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-llvm14/devcontainer.json b/.devcontainer/cuda12.8-llvm14/devcontainer.json index 98e36c7f538..70d72648c5d 100644 --- a/.devcontainer/cuda12.8-llvm14/devcontainer.json +++ b/.devcontainer/cuda12.8-llvm14/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-llvm15/devcontainer.json b/.devcontainer/cuda12.8-llvm15/devcontainer.json index cee653c0c00..38507089008 100644 --- a/.devcontainer/cuda12.8-llvm15/devcontainer.json +++ b/.devcontainer/cuda12.8-llvm15/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-llvm16/devcontainer.json b/.devcontainer/cuda12.8-llvm16/devcontainer.json index d7f0dce7566..0b351548b63 100644 --- a/.devcontainer/cuda12.8-llvm16/devcontainer.json +++ b/.devcontainer/cuda12.8-llvm16/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-llvm17/devcontainer.json b/.devcontainer/cuda12.8-llvm17/devcontainer.json index d4d3851dd85..142a646475d 100644 --- a/.devcontainer/cuda12.8-llvm17/devcontainer.json +++ b/.devcontainer/cuda12.8-llvm17/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8-llvm18/devcontainer.json b/.devcontainer/cuda12.8-llvm18/devcontainer.json index e2e27cbc08c..70619215b46 100644 --- a/.devcontainer/cuda12.8-llvm18/devcontainer.json +++ b/.devcontainer/cuda12.8-llvm18/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/cuda12.8ext-gcc13/devcontainer.json b/.devcontainer/cuda12.8ext-gcc13/devcontainer.json index fe118768428..8e0a42f5af1 100644 --- a/.devcontainer/cuda12.8ext-gcc13/devcontainer.json +++ b/.devcontainer/cuda12.8ext-gcc13/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0cf38c8b80b..8206ff99c92 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,8 +7,7 @@ "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;" + "mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}; mkdir -m 0755 -p ${localWorkspaceFolder}/build; if test -z ${localEnv:WSLENV}; then docker volume create --driver local --opt type=none --opt device=${localWorkspaceFolder}/build --opt o=bind cccl-build; else docker volume create cccl-build; fi;" ], "containerEnv": { "SCCACHE_REGION": "us-east-2", @@ -34,12 +33,12 @@ "vscode": { "extensions": [ "llvm-vs-code-extensions.vscode-clangd", - "xaver.clang-format", + "seaube.clangformat", "nvidia.nsight-vscode-edition", "ms-vscode.cmake-tools" ], "settings": { - "editor.defaultFormatter": "xaver.clang-format", + "editor.defaultFormatter": "seaube.clangformat", "editor.formatOnSave": true, "clang-format.executable": "/usr/bin/clang-format", "clangd.arguments": [ diff --git a/ci/matrix.yaml b/ci/matrix.yaml index dff3b75df8e..d611132959f 100644 --- a/ci/matrix.yaml +++ b/ci/matrix.yaml @@ -42,7 +42,7 @@ workflows: # verify-codegen: - {jobs: ['verify_codegen'], project: 'libcudacxx'} # cudax has different CTK reqs: - - {jobs: ['build'], project: 'cudax', ctk: ['12.0'], std: 20, cxx: ['msvc14.36']} + - {jobs: ['build'], project: 'cudax', ctk: ['12.0'], std: 20, cxx: ['msvc14.39']} - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['gcc10', 'gcc11', 'gcc12']} - {jobs: ['build'], project: 'cudax', ctk: ['curr'], std: 20, cxx: ['clang14', 'clang15', 'clang16', 'clang17']} - {jobs: ['build'], project: 'cudax', ctk: ['12.5'], std: 'all', cxx: ['nvhpc']} @@ -87,7 +87,7 @@ workflows: - {jobs: ['build'], project: 'cudax', ctk: ['12.0', 'curr'], std: 'all', cxx: ['gcc9', 'gcc10', 'gcc11']} - {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']} + - {jobs: ['build'], project: 'cudax', ctk: ['12.0', ], std: 'all', cxx: ['msvc14.39']} - {jobs: ['build'], project: 'cudax', ctk: [ 'curr'], std: 'all', cxx: ['msvc2022']} - {jobs: ['build'], project: 'cudax', ctk: ['12.0' ], std: 'all', cxx: ['gcc12'], sm: "90"} - {jobs: ['build'], project: 'cudax', ctk: [ 'curr'], std: 'all', cxx: ['gcc13'], sm: "90a"} @@ -99,7 +99,7 @@ workflows: # Any generated jobs that match the entries in `exclude` will be removed from the final matrix for all workflows. exclude: # GPU runners are not available on Windows. - - {jobs: ['test', 'test_gpu', 'test_nolid', 'test_lid0', 'test_lid1', 'test_lid2'], cxx: ['msvc2019', 'msvc14.36', 'msvc2022']} + - {jobs: ['test', 'test_gpu', 'test_nolid', 'test_lid0', 'test_lid1', 'test_lid2'], cxx: ['msvc2019', 'msvc14.39', 'msvc2022']} ############################################################################################# @@ -153,8 +153,8 @@ host_compilers: exe: cl versions: 14.29: { stds: [ 17, ], aka: '2019' } - 14.36: { stds: [ 17, 20] } - 14.39: { stds: [ 17, 20], aka: '2022' } + 14.39: { stds: [ 17, 20] } + 14.42: { stds: [ 17, 20], aka: '2022' } nvhpc: name: 'NVHPC' container_tag: 'nvhpc'