Update matrix with cuda-ext configurations.

CCCL needs a couple of images with additional CTK libraries installed. This adds images with cuBLAS, cuTensor, and cuSOLVER installed.
rapidsai · Oct 29, 2024 · f764553 · f764553
1 parent f3bec28
commit f764553
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.github/actions/devcontainer-json/action.sh b/.github/actions/devcontainer-json/action.sh
@@ -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
 )")";

diff --git a/matrix.yml b/matrix.yml
@@ -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
 
@@ -103,6 +115,8 @@ include:
   - { features: [*python, *gcc_12, { <<: *cuda_curr_max, <<: *cccl_cuda_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_min, <<: *cccl_cuda_ext_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 }
@@ -113,6 +127,8 @@ include:
   - { features: [*python, *llvm_18, { <<: *cuda_curr_max, <<: *cccl_cuda_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_min, <<: *cccl_cuda_ext_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"