Skip to content

Commit

Permalink
Update toolkit to CTK 12.6 (#2348)
Browse files Browse the repository at this point in the history
* Update toolkit to CTK 12.6

12.6 has been released some time ago, so we should update our containers appropriately

Co-authored-by: Allison Piper <[email protected]>
  • Loading branch information
miscco and alliepiper committed Sep 9, 2024
1 parent 71b9f98 commit 371a434
Show file tree
Hide file tree
Showing 21 changed files with 268 additions and 160 deletions.
53 changes: 0 additions & 53 deletions .devcontainer/cuda12.5-gcc10/devcontainer.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc12-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc10-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc12",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc10",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "12",
"CCCL_BUILD_INFIX": "cuda12.5-gcc12"
"CCCL_HOST_COMPILER_VERSION": "10",
"CCCL_BUILD_INFIX": "cuda12.6-gcc10"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc12"
"name": "cuda12.6-gcc10"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc11-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc11",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc11",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "11",
"CCCL_BUILD_INFIX": "cuda12.5-gcc11"
"CCCL_BUILD_INFIX": "cuda12.6-gcc11"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc11"
"name": "cuda12.6-gcc11"
}
53 changes: 53 additions & 0 deletions .devcontainer/cuda12.6-gcc12/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc12-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",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.6-gcc12",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "12",
"CCCL_BUILD_INFIX": "cuda12.6-gcc12"
},
"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-gcc12"
}
53 changes: 53 additions & 0 deletions .devcontainer/cuda12.6-gcc13/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc13-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",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.6-gcc13",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "13",
"CCCL_BUILD_INFIX": "cuda12.6-gcc13"
},
"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-gcc13"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc7-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc9",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc7",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "9",
"CCCL_BUILD_INFIX": "cuda12.5-gcc9"
"CCCL_HOST_COMPILER_VERSION": "7",
"CCCL_BUILD_INFIX": "cuda12.6-gcc7"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc9"
"name": "cuda12.6-gcc7"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc8-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc8-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc8",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc8",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "8",
"CCCL_BUILD_INFIX": "cuda12.5-gcc8"
"CCCL_BUILD_INFIX": "cuda12.6-gcc8"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc8"
"name": "cuda12.6-gcc8"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-gcc7-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-gcc9-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-gcc7",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-gcc9",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "gcc",
"CCCL_HOST_COMPILER_VERSION": "7",
"CCCL_BUILD_INFIX": "cuda12.5-gcc7"
"CCCL_HOST_COMPILER_VERSION": "9",
"CCCL_BUILD_INFIX": "cuda12.6-gcc9"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-gcc7"
"name": "cuda12.6-gcc9"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-llvm12-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-llvm10-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-llvm12",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-llvm10",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "llvm",
"CCCL_HOST_COMPILER_VERSION": "12",
"CCCL_BUILD_INFIX": "cuda12.5-llvm12"
"CCCL_HOST_COMPILER_VERSION": "10",
"CCCL_BUILD_INFIX": "cuda12.6-llvm10"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-llvm12"
"name": "cuda12.6-llvm10"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:24.10-cpp-llvm13-cuda12.5",
"image": "rapidsai/devcontainers:24.10-cpp-llvm11-cuda12.6",
"hostRequirements": {
"gpu": "optional"
},
Expand All @@ -15,11 +15,11 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.5-llvm13",
"CCCL_CUDA_VERSION": "12.5",
"DEVCONTAINER_NAME": "cuda12.6-llvm11",
"CCCL_CUDA_VERSION": "12.6",
"CCCL_HOST_COMPILER": "llvm",
"CCCL_HOST_COMPILER_VERSION": "13",
"CCCL_BUILD_INFIX": "cuda12.5-llvm13"
"CCCL_HOST_COMPILER_VERSION": "11",
"CCCL_BUILD_INFIX": "cuda12.6-llvm11"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand Down Expand Up @@ -49,5 +49,5 @@
}
}
},
"name": "cuda12.5-llvm13"
"name": "cuda12.6-llvm11"
}
Loading

0 comments on commit 371a434

Please sign in to comment.