Skip to content

Commit 32d8c56

Browse files
cpcloudcpcloud
committed
ci: ensure that python version in ci matches matrix
1 parent 69394c7 commit 32d8c56

File tree

8 files changed

+5315
-1114
lines changed

8 files changed

+5315
-1114
lines changed

‎.github/workflows/conda-python-tests.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
env:
8484
RAPIDS_ARTIFACTS_DIR: ${{ github.workspace }}/artifacts
8585
RAPIDS_COVERAGE_DIR: ${{ github.workspace }}/coverage-results
86-
RAPIDS_DEPENDENCIES: ${{ matrix.DEPENDENCIES }}
86+
NUMBA_VERSION: ${{ matrix.NUMBA_VERSION }}
8787
RAPIDS_TESTS_DIR: ${{ github.workspace }}/test-results
8888
container:
8989
image: rapidsai/ci-conda:cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}
@@ -116,7 +116,9 @@ jobs:
116116
- name: Compute pixi environment name
117117
run: |
118118
set -euo pipefail
119-
PIXI_ENV="cu-$(cut -d. -f1-2 <<< "${{ matrix.CUDA_VER }}" | tr . -)"
119+
CUDA_VER_PART="$(cut -d. -f1-2 <<< "${{ matrix.CUDA_VER }}" | tr . -)"
120+
PY_VER_PART="py$(tr -d . <<< "${{ matrix.PY_VER }}")"
121+
PIXI_ENV="cu-${CUDA_VER_PART}-${PY_VER_PART}"
120122
echo "PIXI_ENV=${PIXI_ENV}" >> "${GITHUB_ENV}"
121123
- name: Setup pixi
122124
uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293

‎.github/workflows/simulator-test.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ jobs:
104104
- name: Compute pixi environment name
105105
run: |
106106
set -euo pipefail
107-
PIXI_ENV="cu-$(cut -d. -f1-2 <<< "${{ matrix.CUDA_VER }}" | tr . -)"
107+
CUDA_VER_PART="$(cut -d. -f1-2 <<< "${{ matrix.CUDA_VER }}" | tr . -)"
108+
PY_VER_PART="py$(tr -d . <<< "${{ matrix.PY_VER }}")"
109+
PIXI_ENV="cu-${CUDA_VER_PART}-${PY_VER_PART}"
108110
echo "PIXI_ENV=${PIXI_ENV}" >> "${GITHUB_ENV}"
109111
- name: Setup pixi
110112
uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293

‎.github/workflows/wheels-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
needs: compute-matrix
9494
env:
9595
RAPIDS_ARTIFACTS_DIR: ${{ github.workspace }}/artifacts
96-
RAPIDS_DEPENDENCIES: ${{ matrix.DEPENDENCIES }}
96+
NUMBA_VERSION: ${{ matrix.NUMBA_VERSION }}
9797
RAPIDS_TESTS_DIR: ${{ github.workspace }}/test-results
9898
strategy:
9999
fail-fast: false

‎ci/matrix.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: BSD-2-Clause
33
# Please keep the matrices sorted in ascending order by the following:
44
#
5-
# [ARCH, PY_VER, CUDA_VER, LINUX_VER, GPU, DRIVER, DEPENDENCIES]
5+
# [ARCH, PY_VER, CUDA_VER, LINUX_VER, GPU, DRIVER, NUMBA_VERSION]
66
#
77
build-matrix:
88
- { ARCH: 'amd64', PY_VER: '3.10', CUDA_VER: '12.8.0', LINUX_VER: 'rockylinux8' }
@@ -18,17 +18,17 @@ simulator-matrix:
1818
# We test "oldest" dependencies with the oldest supported Python version and
1919
# the second-newest Python version.
2020
test-matrix:
21-
- { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', DEPENDENCIES: 'oldest' }
22-
- { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', DEPENDENCIES: 'latest' }
23-
- { CUDA_VER: '12.2.2', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', DEPENDENCIES: 'latest' }
24-
- { CUDA_VER: '12.9.1', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', DEPENDENCIES: 'latest' }
25-
- { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', DEPENDENCIES: 'oldest' }
26-
- { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', DEPENDENCIES: 'latest' }
27-
- { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', DEPENDENCIES: 'latest' }
28-
- { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', DEPENDENCIES: 'oldest' }
29-
- { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', DEPENDENCIES: 'latest' }
30-
- { CUDA_VER: '12.2.2', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', DEPENDENCIES: 'latest' }
31-
- { CUDA_VER: '12.9.1', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', DEPENDENCIES: 'latest' }
32-
- { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', DEPENDENCIES: 'oldest' }
33-
- { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', DEPENDENCIES: 'latest' }
34-
- { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', DEPENDENCIES: 'latest' }
21+
- { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', NUMBA_VERSION: '0.60' }
22+
- { CUDA_VER: '12.0.1', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'l4', DRIVER: 'earliest', NUMBA_VERSION: '*' }
23+
- { CUDA_VER: '12.2.2', ARCH: 'amd64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' }
24+
- { CUDA_VER: '12.9.1', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' }
25+
- { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '0.60' }
26+
- { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' }
27+
- { CUDA_VER: '13.0.0', ARCH: 'amd64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'l4', DRIVER: 'latest', NUMBA_VERSION: '*' }
28+
- { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.10', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', NUMBA_VERSION: '0.60' }
29+
- { CUDA_VER: '12.0.1', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'rockylinux8', GPU: 'a100', DRIVER: 'earliest', NUMBA_VERSION: '*' }
30+
- { CUDA_VER: '12.2.2', ARCH: 'arm64', PY_VER: '3.11', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' }
31+
- { CUDA_VER: '12.9.1', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' }
32+
- { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.12', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '0.60' }
33+
- { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu22.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' }
34+
- { CUDA_VER: '13.0.0', ARCH: 'arm64', PY_VER: '3.13', LINUX_VER: 'ubuntu24.04', GPU: 'a100', DRIVER: 'latest', NUMBA_VERSION: '*' }

‎ci/test_conda.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ if [ "$DISTRO" = "ubuntu" ]; then
1313
fi
1414

1515
# Constrain oldest supported dependencies for testing
16-
if [ "${RAPIDS_DEPENDENCIES:-}" = "oldest" ]; then
16+
if [ "${NUMBA_VERSION:-*}" != "*" ]; then
1717
# add to the default environment's dependencies
18-
pixi add "numba=0.60.0"
18+
pixi add "numba=${NUMBA_VERSION}"
1919
fi
2020

2121
rapids-logger "Check GPU usage"

‎ci/test_wheel.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ DEPENDENCIES=(
1919
)
2020

2121
# Constrain oldest supported dependencies for testing
22-
if [ "${RAPIDS_DEPENDENCIES:-}" = "oldest" ]; then
23-
DEPENDENCIES+=("numba==0.60.0")
22+
if [ "${NUMBA_VERSION:-*}" != "*" ]; then
23+
DEPENDENCIES+=("numba==${NUMBA_VERSION}")
2424
fi
2525

2626
python -m pip install "${DEPENDENCIES[@]}"

0 commit comments

Comments
 (0)