Skip to content

Commit 701b50d

Browse files
alliepiperalliepiper
authored
Refactor CI matrix. (#1844)
* Remove the os-map from the matrix. We no longer need this to lookup images. * Migrate `cxx`. * Migrate devcontainer ver and all stds list. * Migrate ctk version info. * Migrate device compiler. * Refactor cxx handling to reuse string parser. * Migrate GPU tables. * Migrate project tables. * Migrate job tables. * Migrate tag tables. * Fix exclusion handling. * Update devcontainers to remove OS info. * Bump devcontainer version to access os-less images. * It's that time again. New version of gcc struggles with replace.cu. * Fix typo. * Resolve merge issue in matrix.yaml * Fix MSVC version for cudax * Remove duplicate build job from cudax matrix. * Fix bad syntax in asynchronous_operations.rst. * Update devcontainers for cudax.
1 parent 1b75250 commit 701b50d

File tree

40 files changed

+666
-639
lines changed

40 files changed

+666
-639
lines changed

‎.devcontainer/cuda11.1-gcc6/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc6-cuda11.1-ubuntu18.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc6-cuda11.1",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda11.1-gcc7/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc7-cuda11.1-ubuntu18.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc7-cuda11.1",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda11.1-gcc8/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc8-cuda11.1-ubuntu18.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc8-cuda11.1",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda11.1-gcc9/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc9-cuda11.1-ubuntu18.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc9-cuda11.1",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda11.1-llvm9/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm9-cuda11.1-ubuntu18.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm9-cuda11.1",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda11.8-gcc11/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc11-cuda11.8-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc11-cuda11.8",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-gcc10/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc10-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc10-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-gcc11/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc11-cuda12.0-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc11-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-gcc12/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc12-cuda12.0-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc12-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-gcc9/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc9-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc9-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-llvm10/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm10-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm10-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-llvm11/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm11-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm11-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-llvm12/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm12-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm12-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-llvm13/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm13-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm13-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-llvm14/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm14-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm14-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.0-llvm9/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm9-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm9-cuda12.0",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc10/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc10-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc10-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc11/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc11-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc11-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc12/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc12-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc12-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc13/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc13-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc13-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc7/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc7-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc7-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc8/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc8-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc8-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-gcc9/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc9-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc9-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm10/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm10-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm10-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm11/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm11-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm11-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm12/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm12-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm12-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm13/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm13-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm13-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm14/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm14-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm14-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm15/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm15-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm15-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm16/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm16-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm16-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm17/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm17-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm17-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-llvm18/devcontainer.json

-51
This file was deleted.

‎.devcontainer/cuda12.4-llvm9/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-llvm9-cuda12.4-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-llvm9-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/cuda12.4-oneapi2023.2.0/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-oneapi2023.2.0-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-oneapi2023.2.0-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.06-cpp-gcc13-cuda12.4-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:24.08-cpp-gcc13-cuda12.4",
44
"hostRequirements": {
55
"gpu": "optional"
66
},

‎.devcontainer/make_devcontainers.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ update_devcontainer() {
2828
local compiler_name="$5"
2929
local compiler_exe="$6"
3030
local compiler_version="$7"
31-
local os="$8"
32-
local devcontainer_version="$9"
31+
local devcontainer_version="$8"
3332

3433
local IMAGE_ROOT="rapidsai/devcontainers:${devcontainer_version}-cpp-"
35-
local image="${IMAGE_ROOT}${compiler_name}${compiler_version}-cuda${cuda_version}-${os}"
34+
local image="${IMAGE_ROOT}${compiler_name}${compiler_version}-cuda${cuda_version}"
3635

3736
jq --arg image "$image" --arg name "$name" \
3837
--arg cuda_version "$cuda_version" --arg compiler_name "$compiler_name" \
39-
--arg compiler_exe "$compiler_exe" --arg compiler_version "$compiler_version" --arg os "$os" \
38+
--arg compiler_exe "$compiler_exe" --arg compiler_version "$compiler_version" \
4039
'.image = $image | .name = $name | .containerEnv.DEVCONTAINER_NAME = $name |
4140
.containerEnv.CCCL_BUILD_INFIX = $name |
4241
.containerEnv.CCCL_CUDA_VERSION = $cuda_version | .containerEnv.CCCL_HOST_COMPILER = $compiler_name |
@@ -103,10 +102,9 @@ readonly DEFAULT_CUDA=$(echo "$NEWEST_GCC_CUDA_ENTRY" | jq -r '.cuda')
103102
readonly DEFAULT_COMPILER_NAME=$(echo "$NEWEST_GCC_CUDA_ENTRY" | jq -r '.compiler_name')
104103
readonly DEFAULT_COMPILER_EXE=$(echo "$NEWEST_GCC_CUDA_ENTRY" | jq -r '.compiler_exe')
105104
readonly DEFAULT_COMPILER_VERSION=$(echo "$NEWEST_GCC_CUDA_ENTRY" | jq -r '.compiler_version')
106-
readonly DEFAULT_OS=$(echo "$NEWEST_GCC_CUDA_ENTRY" | jq -r '.os')
107105
readonly DEFAULT_NAME=$(make_name "$DEFAULT_CUDA" "$DEFAULT_COMPILER_NAME" "$DEFAULT_COMPILER_VERSION")
108106

109-
update_devcontainer ${base_devcontainer_file} "./temp_devcontainer.json" "$DEFAULT_NAME" "$DEFAULT_CUDA" "$DEFAULT_COMPILER_NAME" "$DEFAULT_COMPILER_EXE" "$DEFAULT_COMPILER_VERSION" "$DEFAULT_OS" "$DEVCONTAINER_VERSION"
107+
update_devcontainer ${base_devcontainer_file} "./temp_devcontainer.json" "$DEFAULT_NAME" "$DEFAULT_CUDA" "$DEFAULT_COMPILER_NAME" "$DEFAULT_COMPILER_EXE" "$DEFAULT_COMPILER_VERSION" "$DEVCONTAINER_VERSION"
110108
mv "./temp_devcontainer.json" ${base_devcontainer_file}
111109

112110
# Create an array to keep track of valid subdirectory names
@@ -121,13 +119,12 @@ for combination in $combinations; do
121119
compiler_name=$(echo "$combination" | jq -r '.compiler_name')
122120
compiler_exe=$(echo "$combination" | jq -r '.compiler_exe')
123121
compiler_version=$(echo "$combination" | jq -r '.compiler_version')
124-
os=$(echo "$combination" | jq -r '.os')
125122

126123
name=$(make_name "$cuda_version" "$compiler_name" "$compiler_version")
127124
mkdir -p "$name"
128125
new_devcontainer_file="$name/devcontainer.json"
129126

130-
update_devcontainer "$base_devcontainer_file" "$new_devcontainer_file" "$name" "$cuda_version" "$compiler_name" "$compiler_exe" "$compiler_version" "$os" "$DEVCONTAINER_VERSION"
127+
update_devcontainer "$base_devcontainer_file" "$new_devcontainer_file" "$name" "$cuda_version" "$compiler_name" "$compiler_exe" "$compiler_version" "$DEVCONTAINER_VERSION"
131128
echo "Created $new_devcontainer_file"
132129

133130
# Add the subdirectory name to the valid_subdirs array

0 commit comments

Comments
 (0)