From 220831230931e83d751579d2783282020b27b271 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 1 Apr 2026 14:18:58 -0700 Subject: [PATCH 1/6] use gcc-14 and python 3.14 in pip base images --- matrix.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/matrix.yml b/matrix.yml index 6717607c..c4f6f304 100644 --- a/matrix.yml +++ b/matrix.yml @@ -15,6 +15,7 @@ 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-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" } +x-gcc-rapids: &gcc_rapids { name: "gcc", version: "14", hide: true } x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.14" } # CUDA 12.0 support stops at clang 14. @@ -35,7 +36,7 @@ x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" } x-mambaforge: &conda { name: "mambaforge", miniforge_version: "25.11.0-1" } x-python: &python { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "os-provided", installTools: false, enableShared: true, optimize: true, hide: true } -x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "3.13", installTools: false, enableShared: true, optimize: true, hide: true } +x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "3.14", installTools: false, enableShared: true, optimize: true, hide: true } x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.19.0" } x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" } @@ -191,14 +192,14 @@ include: - os: "ubuntu:24.04" images: # cuda - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_prev_max_rapids], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_prev_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } - - { features: [*python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_prev_max_rapids], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_prev_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*gcc_rapids, *python_rapids, *clang_extra_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } # mambaforge - { features: [*conda], env: { PYTHON_VERSION: "3.14" } } From 55784eb337e3d99579f175fb0193e59e82234345 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 1 Apr 2026 15:24:41 -0700 Subject: [PATCH 2/6] use Python 3.13 --- matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matrix.yml b/matrix.yml index c4f6f304..30de5c84 100644 --- a/matrix.yml +++ b/matrix.yml @@ -16,7 +16,7 @@ x-gcc-13: &gcc_13 { name: "gcc", version: "13" } x-gcc-14: &gcc_14 { name: "gcc", version: "14" } x-gcc-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" } x-gcc-rapids: &gcc_rapids { name: "gcc", version: "14", hide: true } -x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.14" } +x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.13" } # CUDA 12.0 support stops at clang 14. x-llvm-14: &llvm_14 { name: "llvm", version: "14" } @@ -36,7 +36,7 @@ x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" } x-mambaforge: &conda { name: "mambaforge", miniforge_version: "25.11.0-1" } x-python: &python { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "os-provided", installTools: false, enableShared: true, optimize: true, hide: true } -x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "3.14", installTools: false, enableShared: true, optimize: true, hide: true } +x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "3.13", installTools: false, enableShared: true, optimize: true, hide: true } x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.19.0" } x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" } From 55636330eeb63732339dc31d93fa740a529af03b Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 1 Apr 2026 15:29:30 -0700 Subject: [PATCH 3/6] use python 3.14 again --- matrix.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/matrix.yml b/matrix.yml index 30de5c84..0d7eaf76 100644 --- a/matrix.yml +++ b/matrix.yml @@ -16,7 +16,7 @@ x-gcc-13: &gcc_13 { name: "gcc", version: "13" } x-gcc-14: &gcc_14 { name: "gcc", version: "14" } x-gcc-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" } x-gcc-rapids: &gcc_rapids { name: "gcc", version: "14", hide: true } -x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.13" } +x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.14" } # CUDA 12.0 support stops at clang 14. x-llvm-14: &llvm_14 { name: "llvm", version: "14" } @@ -35,8 +35,8 @@ x-nvhpc-curr: &nvhpc_curr { name: "nvhpc", version: "26.3" } x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" } x-mambaforge: &conda { name: "mambaforge", miniforge_version: "25.11.0-1" } -x-python: &python { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "os-provided", installTools: false, enableShared: true, optimize: true, hide: true } -x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.7.1", version: "3.13", installTools: false, enableShared: true, optimize: true, hide: true } +x-python: &python { name: "ghcr.io/devcontainers/features/python:1.8.0", version: "os-provided", installTools: false, enableShared: true, optimize: true, hide: true } +x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.8.0", version: "3.14", installTools: false, enableShared: true, optimize: true, hide: true } x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.19.0" } x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" } From e26d2a416a4182ab18881125b23f84851bbd507d Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 1 Apr 2026 15:55:50 -0700 Subject: [PATCH 4/6] install clang-format-21 since clang-format-16 isn't available for ubuntu24.04 --- matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix.yml b/matrix.yml index 0d7eaf76..d96956e0 100644 --- a/matrix.yml +++ b/matrix.yml @@ -46,7 +46,7 @@ x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "dev", packages: x-clangd-dev: &clangd_dev { name: "llvm", version: "dev", packages: "clangd", hide: true } # Clang utils always available: x-clang-extra-cccl: &clang_extra_cccl { name: "llvm", version: "21", packages: "clang-format clang-tidy llvm-tools", hide: true } -x-clang-extra-rapids: &clang_extra_rapids { name: "llvm", version: "16", packages: "clang-format", hide: true } +x-clang-extra-rapids: &clang_extra_rapids { name: "llvm", version: "21", packages: "clang-format", hide: true } # Docker outside of Docker used to build python wheels: x-dood: &dood { name: "ghcr.io/devcontainers/features/docker-outside-of-docker:1", moby: false, hide: true} From 5b3fac862b5e036a4e0474b30e2ab30e2621c0f2 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 1 Apr 2026 16:02:38 -0700 Subject: [PATCH 5/6] bump to openmpi 5.0.10 to work around compile errors with gcc-14 --- matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix.yml b/matrix.yml index d96956e0..329a96dc 100644 --- a/matrix.yml +++ b/matrix.yml @@ -38,7 +38,7 @@ x-mambaforge: &conda { name: "mambaforge", miniforge_version: "25.11.0-1" } x-python: &python { name: "ghcr.io/devcontainers/features/python:1.8.0", version: "os-provided", installTools: false, enableShared: true, optimize: true, hide: true } x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.8.0", version: "3.14", installTools: false, enableShared: true, optimize: true, hide: true } x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.19.0" } -x-openmpi: &openmpi { name: "openmpi", version: "5.0.7" } +x-openmpi: &openmpi { name: "openmpi", version: "5.0.10" } x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true, doxygenVersion: "1.9.6" } x-clangd-dev-bionic: &clangd_dev_bionic { name: "llvm", version: "19", packages: "clangd", hide: true } From 789a15e969feca68705245b8dd5c4be2a94b95b9 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 1 Apr 2026 16:21:52 -0700 Subject: [PATCH 6/6] bump devcontainer base image tags --- .devcontainer/cuda12.9-pip/devcontainer.json | 2 +- .devcontainer/cuda13.0-pip/devcontainer.json | 2 +- .devcontainer/cuda13.1-pip/devcontainer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/cuda12.9-pip/devcontainer.json b/.devcontainer/cuda12.9-pip/devcontainer.json index c3d2dc01..89797b63 100644 --- a/.devcontainer/cuda12.9-pip/devcontainer.json +++ b/.devcontainer/cuda12.9-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "12.9", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:26.06-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7" + "BASE": "rapidsai/devcontainers:26.06-cpp-cuda12.9-ucx1.19.0-openmpi5.0.10" } }, "runArgs": [ diff --git a/.devcontainer/cuda13.0-pip/devcontainer.json b/.devcontainer/cuda13.0-pip/devcontainer.json index 3e8a3306..94bf3f48 100644 --- a/.devcontainer/cuda13.0-pip/devcontainer.json +++ b/.devcontainer/cuda13.0-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "13.0", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:26.06-cpp-cuda13.0-ucx1.19.0-openmpi5.0.7" + "BASE": "rapidsai/devcontainers:26.06-cpp-cuda13.0-ucx1.19.0-openmpi5.0.10" } }, "runArgs": [ diff --git a/.devcontainer/cuda13.1-pip/devcontainer.json b/.devcontainer/cuda13.1-pip/devcontainer.json index 29747776..414c9e00 100644 --- a/.devcontainer/cuda13.1-pip/devcontainer.json +++ b/.devcontainer/cuda13.1-pip/devcontainer.json @@ -5,7 +5,7 @@ "args": { "CUDA": "13.1", "PYTHON_PACKAGE_MANAGER": "pip", - "BASE": "rapidsai/devcontainers:26.06-cpp-cuda13.1-ucx1.19.0-openmpi5.0.7" + "BASE": "rapidsai/devcontainers:26.06-cpp-cuda13.1-ucx1.19.0-openmpi5.0.10" } }, "runArgs": [