From 23ebf3eb441dc1bb985ea851b19a46ed9cda677c Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 31 Jul 2025 08:48:26 -0400 Subject: [PATCH 1/2] Remove redundant images. --- matrix.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/matrix.yml b/matrix.yml index 4f8690ad0..c29bc3a11 100644 --- a/matrix.yml +++ b/matrix.yml @@ -2,7 +2,6 @@ x-cuda-prev-min: &cuda_prev_min { name: "cuda", version: "12.0" } x-cuda-prev-max: &cuda_prev_max { name: "cuda", version: "12.9" } x-cuda-curr-min: &cuda_curr_min { name: "cuda", version: "12.0" } x-cuda-curr-max: &cuda_curr_max { name: "cuda", version: "12.9" } -x-cuda-cccl-python: &cuda_cccl_python { name: "cuda", version: "12.9" } # Commented as RAPIDS only supports one major version (CUDA 12) right now #x-cuda-prev-max-rapids: &cuda_prev_max_rapids { name: "cuda", version: "12.9" } x-cuda-curr-max-rapids: &cuda_curr_max_rapids { name: "cuda", version: "12.9" } @@ -115,7 +114,6 @@ include: - os: "ubuntu:24.04" images: - - { features: [*python, *dood, *gcc_13, { <<: *cuda_cccl_python, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *dood, *gcc_13, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *dood, *gcc_14, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } @@ -123,7 +121,6 @@ include: # FIXME 12.3, 12.4, 12.7 don't seem to have apt packages avaiable in the repos. Investigate if we end up really needing those. - { features: [*python, *dood, *gcc_13, { name: "cuda", version: "12.5", <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *dood, *gcc_13, { name: "cuda", version: "12.6", <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - - { features: [*python, *dood, *gcc_13, { name: "cuda", version: "12.9", <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - os: "windows" images: From b274137ee818e4309af301028a113280f8755c66 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Thu, 31 Jul 2025 08:51:04 -0400 Subject: [PATCH 2/2] Add gcc15 to CCCL. --- matrix.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/matrix.yml b/matrix.yml index c29bc3a11..30e663086 100644 --- a/matrix.yml +++ b/matrix.yml @@ -14,6 +14,7 @@ x-gcc-11: &gcc_11 { name: "gcc", version: "11" } x-gcc-12: &gcc_12 { name: "gcc", version: "12" } x-gcc-13: &gcc_13 { name: "gcc", version: "13" } x-gcc-14: &gcc_14 { name: "gcc", version: "14" } +x-gcc-14: &gcc_15 { name: "gcc", version: "15" } x-gcc-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" } x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.13" } @@ -116,6 +117,7 @@ include: images: - { features: [*python, *dood, *gcc_13, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } - { features: [*python, *dood, *gcc_14, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } + - { features: [*python, *dood, *gcc_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env } # CTK versions < cuda_curr_max used for python wheel testing. # FIXME 12.3, 12.4, 12.7 don't seem to have apt packages avaiable in the repos. Investigate if we end up really needing those.