From 5ce550c960f2de3aa0321d91a391eb938adb3042 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Wed, 16 Apr 2025 15:34:06 -0700 Subject: [PATCH 1/2] ensure pip base images use python 3.12 --- matrix.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/matrix.yml b/matrix.yml index edda9b8b4..b512bcf83 100644 --- a/matrix.yml +++ b/matrix.yml @@ -14,6 +14,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-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.12" } x-llvm-14: &llvm_14 { name: "llvm", version: "14" } x-llvm-15: &llvm_15 { name: "llvm", version: "15" } @@ -140,17 +141,17 @@ include: - os: "ubuntu:22.04" images: # cuda - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } # mambaforge - - { features: [*conda], env: { "PYTHON_VERSION": "3.12" } } + - { features: [*conda], env: { PYTHON_VERSION: "3.12" } } ### # Legacy CUDA 11.x + mambaforge image. Needed so the cudatoolkit 11.x @@ -159,4 +160,4 @@ include: ### # cuda-mambaforge - - { features: [*cuda_prev_max_rapids, *conda], env: { "PYTHON_VERSION": "3.12" } } + - { features: [*cuda_prev_max_rapids, *conda], env: { PYTHON_VERSION: "3.12" } } From 99291ee551aeb0ed1a1ab1014c3425b24c36a541 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Thu, 17 Apr 2025 08:06:07 -0700 Subject: [PATCH 2/2] install python 3.12 during build too --- matrix.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/matrix.yml b/matrix.yml index b512bcf83..909ed0dce 100644 --- a/matrix.yml +++ b/matrix.yml @@ -31,6 +31,7 @@ x-nvhpc-env: &nvhpc_env { CC: "nvc", CXX: "nvc++", CUDAHOSTCXX: "nvc++" } x-mambaforge: &conda { name: "mambaforge" } x-python: &python { name: "ghcr.io/devcontainers/features/python:1.6.2", version: "os-provided", installTools: "false", hide: true } +x-python-rapids: &python_rapids { name: "ghcr.io/devcontainers/features/python:1.6.2", version: "3.12", installTools: "false", hide: true } x-ucx-rapids: &ucx_rapids { name: "ucx", version: "1.18.0" } x-openmpi: &openmpi { name: "openmpi" } @@ -141,14 +142,14 @@ include: - os: "ubuntu:22.04" images: # cuda - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } - - { features: [*python, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_prev_max], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_min], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_prev_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_min, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max, *ucx_rapids, *openmpi], env: *gcc_env_rapids } + - { features: [*python_rapids, *clang_format_rapids, *clangd_dev, *cuda_curr_max_rapids, *ucx_rapids, *openmpi], env: *gcc_env_rapids } # mambaforge - { features: [*conda], env: { PYTHON_VERSION: "3.12" } }