From b76dce422ce3b17bf4b4ec5b1d599f518148af0d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 7 Apr 2026 08:56:13 -0500 Subject: [PATCH 1/2] Pin to Python 3.13 --- matrix.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/matrix.yml b/matrix.yml index 1f3eaeb6..069eda4f 100644 --- a/matrix.yml +++ b/matrix.yml @@ -16,7 +16,8 @@ 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" } +# Pinned to Python 3.13 until 3.14 is unblocked: cuml needs https://github.com/conda-forge/onnxruntime-feedstock/pull/163 +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" } @@ -37,7 +38,8 @@ 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.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 } +# Pinned to Python 3.13 until 3.14 is unblocked: cuml needs https://github.com/conda-forge/onnxruntime-feedstock/pull/163 +x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.8.0", 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.10" } From e9809b51e270fc38cfec830c44874469d1e189d6 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 7 Apr 2026 11:20:51 -0500 Subject: [PATCH 2/2] Pin Python 3.13 via containerEnv in conda devcontainers --- .devcontainer/cuda12.9-conda/devcontainer.json | 1 + .devcontainer/cuda13.0-conda/devcontainer.json | 1 + .devcontainer/cuda13.1-conda/devcontainer.json | 1 + matrix.yml | 6 ++---- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.devcontainer/cuda12.9-conda/devcontainer.json b/.devcontainer/cuda12.9-conda/devcontainer.json index 1dbfc769..d4f51422 100644 --- a/.devcontainer/cuda12.9-conda/devcontainer.json +++ b/.devcontainer/cuda12.9-conda/devcontainer.json @@ -15,6 +15,7 @@ "--ulimit", "nofile=500000" ], + "containerEnv": {"PYTHON_VERSION": "3.13"}, "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { diff --git a/.devcontainer/cuda13.0-conda/devcontainer.json b/.devcontainer/cuda13.0-conda/devcontainer.json index e3723b08..5d585146 100644 --- a/.devcontainer/cuda13.0-conda/devcontainer.json +++ b/.devcontainer/cuda13.0-conda/devcontainer.json @@ -15,6 +15,7 @@ "--ulimit", "nofile=500000" ], + "containerEnv": {"PYTHON_VERSION": "3.13"}, "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { diff --git a/.devcontainer/cuda13.1-conda/devcontainer.json b/.devcontainer/cuda13.1-conda/devcontainer.json index 4bccee23..9852ff2a 100644 --- a/.devcontainer/cuda13.1-conda/devcontainer.json +++ b/.devcontainer/cuda13.1-conda/devcontainer.json @@ -15,6 +15,7 @@ "--ulimit", "nofile=500000" ], + "containerEnv": {"PYTHON_VERSION": "3.13"}, "hostRequirements": {"gpu": "optional"}, "features": { "./features/src/cuda": { diff --git a/matrix.yml b/matrix.yml index 069eda4f..1f3eaeb6 100644 --- a/matrix.yml +++ b/matrix.yml @@ -16,8 +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 } -# Pinned to Python 3.13 until 3.14 is unblocked: cuml needs https://github.com/conda-forge/onnxruntime-feedstock/pull/163 -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" } @@ -38,8 +37,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.8.0", version: "os-provided", installTools: false, enableShared: true, optimize: true, hide: true } -# Pinned to Python 3.13 until 3.14 is unblocked: cuml needs https://github.com/conda-forge/onnxruntime-feedstock/pull/163 -x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.8.0", version: "3.13", 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.10" }