Skip to content

Commit

Permalink
Update matrix with cuda-ext configurations. (#411)
Browse files Browse the repository at this point in the history
CCCL needs a couple of images with additional CTK libraries installed.
This adds images with cuBLAS, cuTensor, and cuSOLVER installed.
  • Loading branch information
alliepiper authored Oct 29, 2024
1 parent f3bec28 commit 7eb273a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/actions/devcontainer-json/action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ container_env="${3:-"null"}";

VERSION="$(git describe --abbrev=0 --tags | sed 's/[a-zA-Z]//g' | cut -d '.' -f -2)";
tag="$(node -p "$(cat <<EOF
['cpp', ...${features}.filter((x) => !x.hide).map(({ name = '', version = '' }) => {
['cpp', ...${features}.filter((x) => !x.hide).map(({ name = '', version = '', suffix = '' }) => {
if (name.includes(':')) {
name = name.split('/').pop().split(':')[0];
}
return name + (version || '');
return name + (version || '') + (suffix || '');
})].join('-')
EOF
)")";
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/image-matrix/action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ linux_images="$(\
name: (.
| map(.
| select(.hide != true)
| (.name | split("/")[-1] | split(":")[0]) + (.version // "" | tostring))
| (.name | split("/")[-1] | split(":")[0]) + (.version // "" | tostring) + (.suffix // "" | tostring))
)
| (. + [$os])
| join("-"),
Expand Down Expand Up @@ -99,7 +99,7 @@ if `# Include all images if full_matrix is true` \
name: (.
| map(.
| select(.hide != true)
| (.name | split("/")[-1] | split(":")[0]) + (.version // "" | tostring))
| (.name | split("/")[-1] | split(":")[0]) + (.version // "" | tostring) + (.suffix // "" | tostring))
)
| (. + [$os])
| join("-"),
Expand Down
18 changes: 18 additions & 0 deletions matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@ x-cccl-cuda-opts: &cccl_cuda_opts {
installNVRTC: true,
}

x-cccl-cuda-ext-opts: &cccl_cuda_ext_opts {
suffix: "ext",
installCTKLibraries: false,
installCUDARuntime: true,
installcuRAND: true,
installcuTensor: true,
installcuBLAS: true,
installcuSOLVER: true,
installNCCL: false,
installNVRTC: true,
}

include:
# CCCL devcontainers

Expand Down Expand Up @@ -88,6 +100,7 @@ include:
- { features: [*python, *llvm_12, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_13, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_13, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_14, { <<: *cuda_curr_min, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_14, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_14, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *oneapi_2022, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *onapi_env }
Expand All @@ -101,8 +114,11 @@ include:
- { features: [*python, *gcc_11, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_12, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_12, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_12, { <<: *cuda_curr_min, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_12, { <<: *cuda_curr_max, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_13, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_13, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *gcc_13, { <<: *cuda_curr_max, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
- { features: [*python, *llvm_15, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_16, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
Expand All @@ -111,8 +127,10 @@ include:
- { features: [*python, *llvm_17, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_18, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_18, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_18, { <<: *cuda_curr_max, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_19, { <<: *cuda_curr_min, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_19, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *llvm_19, { <<: *cuda_curr_max, <<: *cccl_cuda_ext_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *llvm_env }
- { features: [*python, *oneapi_2022, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *onapi_env }

- os: "ubuntu:24.04"
Expand Down

0 comments on commit 7eb273a

Please sign in to comment.