Skip to content

Commit

Permalink
Update to 23.08 devcontainers and CUDA 12.2 (#270)
Browse files Browse the repository at this point in the history
* Add devcontainer_version field to matrix file.

* Update make_devcontainers script to read devcontainer_version.

* Add job to get devcontainer_version and pass to dependent jobs.

* Add and use input for devcontainer_version.

* Avoid unnecessarily using compute-matrix action.

* Use yaml alias/anchor for cuda versions.

* [skip tests] Update devcontainer version job name.

* Update to CUDA 12.2 and devcontainer 23.08.

* Update devcontainer.json image versions and update to CUDA 12.2.
  • Loading branch information
jrhemstad authored Jul 28, 2023
1 parent 844566a commit 4922cbb
Show file tree
Hide file tree
Showing 23 changed files with 132 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.1-gcc6/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc6-cuda11.1-ubuntu18.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc6-cuda11.1-ubuntu18.04",
"hostRequirements": {
"gpu": true
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.1-gcc7/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc7-cuda11.1-ubuntu18.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc7-cuda11.1-ubuntu18.04",
"hostRequirements": {
"gpu": true
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.1-gcc8/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc8-cuda11.1-ubuntu18.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc8-cuda11.1-ubuntu18.04",
"hostRequirements": {
"gpu": true
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.1-gcc9/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc9-cuda11.1-ubuntu18.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc9-cuda11.1-ubuntu18.04",
"hostRequirements": {
"gpu": true
},
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/cuda11.1-llvm9/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-llvm9-cuda11.1-ubuntu18.04",
"image": "rapidsai/devcontainers:23.08-cpp-llvm9-cuda11.1-ubuntu18.04",
"hostRequirements": {
"gpu": true
},
Expand Down
39 changes: 0 additions & 39 deletions .devcontainer/cuda12.1-llvm14/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:23.06-cpp-gcc10-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc10-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-gcc10"
"DEVCONTAINER_NAME": "cuda12.2-gcc10"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-gcc10"
"name": "cuda12.2-gcc10"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc11-cuda12.1-ubuntu22.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc11-cuda12.2-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-gcc11"
"DEVCONTAINER_NAME": "cuda12.2-gcc11"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-gcc11"
"name": "cuda12.2-gcc11"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc12-cuda12.1-ubuntu22.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc12-cuda12.2-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-gcc12"
"DEVCONTAINER_NAME": "cuda12.2-gcc12"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-gcc12"
"name": "cuda12.2-gcc12"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc8-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc7-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-gcc8"
"DEVCONTAINER_NAME": "cuda12.2-gcc7"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-gcc8"
"name": "cuda12.2-gcc7"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc9-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc8-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-gcc9"
"DEVCONTAINER_NAME": "cuda12.2-gcc8"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-gcc9"
"name": "cuda12.2-gcc8"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-gcc7-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-gcc9-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-gcc7"
"DEVCONTAINER_NAME": "cuda12.2-gcc9"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-gcc7"
"name": "cuda12.2-gcc9"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-llvm10-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-llvm10-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-llvm10"
"DEVCONTAINER_NAME": "cuda12.2-llvm10"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-llvm10"
"name": "cuda12.2-llvm10"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-llvm11-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-llvm11-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-llvm11"
"DEVCONTAINER_NAME": "cuda12.2-llvm11"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-llvm11"
"name": "cuda12.2-llvm11"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-llvm12-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-llvm12-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-llvm12"
"DEVCONTAINER_NAME": "cuda12.2-llvm12"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-llvm12"
"name": "cuda12.2-llvm12"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-llvm13-cuda12.1-ubuntu20.04",
"image": "rapidsai/devcontainers:23.08-cpp-llvm13-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-llvm13"
"DEVCONTAINER_NAME": "cuda12.2-llvm13"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-llvm13"
"name": "cuda12.2-llvm13"
}
39 changes: 39 additions & 0 deletions .devcontainer/cuda12.2-llvm14/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.08-cpp-llvm14-cuda12.2-ubuntu20.04",
"hostRequirements": {
"gpu": true
},
"initializeCommand": [
"/bin/bash",
"-c",
"mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}"
],
"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.2-llvm14"
},
"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"
],
"customizations": {
"vscode": {
"extensions": [
"llvm-vs-code-extensions.vscode-clangd"
],
"settings": {
"clangd.arguments": [
"--compile-commands-dir=${workspaceFolder}/build/latest"
]
}
}
},
"name": "cuda12.2-llvm14"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"shutdownAction": "stopContainer",
"image": "rapidsai/devcontainers:23.06-cpp-llvm15-cuda12.1-ubuntu22.04",
"image": "rapidsai/devcontainers:23.08-cpp-llvm15-cuda12.2-ubuntu22.04",
"hostRequirements": {
"gpu": true
},
Expand All @@ -14,7 +14,7 @@
"SCCACHE_BUCKET": "rapids-sccache-devs",
"VAULT_HOST": "https://vault.ops.k8s.rapids.ai",
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
"DEVCONTAINER_NAME": "cuda12.1-llvm15"
"DEVCONTAINER_NAME": "cuda12.2-llvm15"
},
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
Expand All @@ -35,5 +35,5 @@
}
}
},
"name": "cuda12.1-llvm15"
"name": "cuda12.2-llvm15"
}
Loading

0 comments on commit 4922cbb

Please sign in to comment.