Skip to content

Commit a99e78c

Browse files
authored
Ensure pip base images use python 3.12 (#492)
1 parent 6c5a878 commit a99e78c

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

matrix.yml

+12-10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ x-gcc-12: &gcc_12 { name: "gcc", version: "12" }
1414
x-gcc-13: &gcc_13 { name: "gcc", version: "13" }
1515
x-gcc-14: &gcc_14 { name: "gcc", version: "14" }
1616
x-gcc-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" }
17+
x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.12" }
1718

1819
x-llvm-14: &llvm_14 { name: "llvm", version: "14" }
1920
x-llvm-15: &llvm_15 { name: "llvm", version: "15" }
@@ -30,6 +31,7 @@ x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" }
3031

3132
x-mambaforge: &conda { name: "mambaforge" }
3233
x-python: &python { name: "ghcr.io/devcontainers/features/python:1.6.2", version: "os-provided", installTools: "false", hide: true }
34+
x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.6.2", version: "3.12", installTools: "false", hide: true }
3335
x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.18.0" }
3436
x-openmpi: &openmpi { name: "openmpi" }
3537

@@ -140,17 +142,17 @@ include:
140142
- os: "ubuntu:22.04"
141143
images:
142144
# cuda
143-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env }
144-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env }
145-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env }
146-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env }
147-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env }
148-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env }
149-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env }
150-
- { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env }
145+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env_rapids }
146+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env_rapids }
147+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env_rapids }
148+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env_rapids }
149+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids }
150+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env_rapids }
151+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids }
152+
- { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids }
151153

152154
# mambaforge
153-
- { features: [*conda], env: { "PYTHON_VERSION": "3.12" } }
155+
- { features: [*conda], env: { PYTHON_VERSION: "3.12" } }
154156

155157
###
156158
# Legacy CUDA 11.x + mambaforge image. Needed so the cudatoolkit 11.x
@@ -159,4 +161,4 @@ include:
159161
###
160162

161163
# cuda-mambaforge
162-
- { features: [*cuda_prev_max_rapids, *conda], env: { "PYTHON_VERSION": "3.12" } }
164+
- { features: [*cuda_prev_max_rapids, *conda], env: { PYTHON_VERSION: "3.12" } }

0 commit comments

Comments
 (0)