Skip to content

Commit b4644f2

Browse files
Copilotleofangpre-commit-ci[bot]
authored
CI: Consolidate test matrix configurations into ci/test-matrix.json with hard-coded values, optimized checkout, and prepared Windows self-hosted runner migration (#889)
* Initial plan * Consolidate test matrices from workflows into ci/test-matrix.json Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * Hard-code all GPU and ARCH values in test-matrix.json with 6 fields per entry Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * Update Windows test matrix with a100 GPU and latest-1 driver, configure self-hosted runners Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * fix * Revert eed0b71 and change Windows DRIVER from latest-1 to latest Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * Add proxy cache setup to Windows workflow for self-hosted runners Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * Remove Git for Windows and gh CLI installation steps, add T4 GPU support to Windows matrix Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * Set fetch-depth: 1 for checkout steps and favor L4/T4 over A100 GPUs for Windows testing Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * Revert Windows workflow to GitHub-hosted runners with TODO comments for future self-hosted migration Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> * [pre-commit.ci] auto code formatting * Revert Win runner name change for now --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: leofang <5534781+leofang@users.noreply.github.com> Co-authored-by: Leo Fang <leof@nvidia.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent b9427f1 commit b4644f2

3 files changed

Lines changed: 142 additions & 86 deletions

File tree

‎.github/workflows/test-wheel-linux.yml‎

Lines changed: 21 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -34,86 +34,43 @@ jobs:
3434
outputs:
3535
MATRIX: ${{ steps.compute-matrix.outputs.MATRIX }}
3636
steps:
37+
- name: Checkout ${{ github.event.repository.name }}
38+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39+
with:
40+
fetch-depth: 1
41+
3742
- name: Validate Test Type
3843
run: |
3944
if [[ "$BUILD_TYPE" != "pull-request" ]] && [[ "$BUILD_TYPE" != "nightly" ]] && [[ "$BUILD_TYPE" != "branch" ]]; then
4045
echo "Invalid build type! Must be one of 'nightly', 'pull-request', or 'branch'."
4146
exit 1
4247
fi
48+
4349
- name: Compute Python Test Matrix
4450
id: compute-matrix
4551
run: |
46-
# Set a default GPU based upon architecture.
47-
gpu="l4"
48-
if [[ "${ARCH}" == "arm64" ]]; then
49-
gpu="a100"
50-
fi
51-
# Add a special entry for the H100 runner on amd64.
52-
special_runner=""
53-
if [[ "${ARCH}" == "amd64" ]]; then
54-
special_runner="- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: 'H100', DRIVER: 'latest' }"
55-
fi
56-
57-
# Please keep the matrices sorted in ascending order by the following:
58-
#
59-
# [PY_VER, CUDA_VER, LOCAL_CTK, GPU, DRIVER]
60-
#
61-
# Note that DRIVER: `earliest` does not work with CUDA 12.9.0 and LOCAL_CTK: 0 does not work with CUDA 12.0.1.
62-
#
63-
export MATRICES="
64-
pull-request:
65-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
66-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
67-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
68-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '13.0.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
69-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
70-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
71-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
72-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '13.0.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
73-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
74-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
75-
${special_runner}
76-
nightly:
77-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
78-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
79-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
80-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
81-
- { ARCH: ${ARCH}, PY_VER: '3.9', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
82-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
83-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
84-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
85-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
86-
- { ARCH: ${ARCH}, PY_VER: '3.10', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
87-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
88-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
89-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
90-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
91-
- { ARCH: ${ARCH}, PY_VER: '3.11', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
92-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
93-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
94-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
95-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
96-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
97-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '11.8.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'earliest' }
98-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '11.8.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
99-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.0.1', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
100-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.9.0', LOCAL_CTK: '0', GPU: ${gpu}, DRIVER: 'latest' }
101-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '12.9.0', LOCAL_CTK: '1', GPU: ${gpu}, DRIVER: 'latest' }
102-
${special_runner}
103-
"
104-
10552
# Use the nightly matrix for branch tests
10653
MATRIX_TYPE="${BUILD_TYPE}"
10754
if [[ "${MATRIX_TYPE}" == "branch" ]]; then
10855
MATRIX_TYPE="nightly"
10956
fi
110-
export MATRIX_TYPE
111-
TEST_MATRIX=$(yq -n 'env(MATRICES) | .[strenv(MATRIX_TYPE)]')
112-
export TEST_MATRIX
57+
58+
# Read base matrix from JSON file for the specific architecture
59+
TEST_MATRIX=$(jq --arg arch "$ARCH" --arg matrix_type "$MATRIX_TYPE" '
60+
.linux[$matrix_type] |
61+
map(select(.ARCH == $arch))
62+
' ci/test-matrix.json)
63+
64+
# Add special runner for amd64 if applicable
65+
if [[ "${ARCH}" == "amd64" ]]; then
66+
SPECIAL_RUNNERS=$(jq '
67+
.linux.special_runners.amd64
68+
' ci/test-matrix.json)
69+
TEST_MATRIX=$(jq --argjson special "$SPECIAL_RUNNERS" '. + $special' <<< "$TEST_MATRIX")
70+
fi
11371
11472
MATRIX="$(
115-
yq -n -o json 'env(TEST_MATRIX)' | \
116-
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end'
73+
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end' <<< "$TEST_MATRIX"
11774
)"
11875
11976
echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}"

‎.github/workflows/test-wheel-windows.yml‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ jobs:
3232
outputs:
3333
MATRIX: ${{ steps.compute-matrix.outputs.MATRIX }}
3434
steps:
35+
- name: Checkout ${{ github.event.repository.name }}
36+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
37+
with:
38+
fetch-depth: 1
39+
3540
- name: Validate Test Type
3641
run: |
3742
if [[ "$BUILD_TYPE" != "pull-request" ]] && [[ "$BUILD_TYPE" != "nightly" ]] && [[ "$BUILD_TYPE" != "branch" ]]; then
@@ -41,47 +46,36 @@ jobs:
4146
- name: Compute Python Test Matrix
4247
id: compute-matrix
4348
run: |
44-
# Please keep the matrices sorted in ascending order by the following:
45-
#
46-
# [PY_VER, CUDA_VER, LOCAL_CTK]
47-
#
48-
export MATRICES="
49-
pull-request:
50-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '0' }
51-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1' }
52-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '0' }
53-
- { ARCH: ${ARCH}, PY_VER: '3.13', CUDA_VER: '13.0.0', LOCAL_CTK: '1' }
54-
nightly:
55-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '0' }
56-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '11.8.0', LOCAL_CTK: '1' }
57-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '0' }
58-
- { ARCH: ${ARCH}, PY_VER: '3.12', CUDA_VER: '12.9.0', LOCAL_CTK: '1' }
59-
"
60-
6149
# Use the nightly matrix for branch tests
6250
MATRIX_TYPE="${BUILD_TYPE}"
6351
if [[ "${MATRIX_TYPE}" == "branch" ]]; then
6452
MATRIX_TYPE="nightly"
6553
fi
66-
export MATRIX_TYPE
67-
TEST_MATRIX=$(yq -n 'env(MATRICES) | .[strenv(MATRIX_TYPE)]')
68-
export TEST_MATRIX
54+
55+
# Read base matrix from JSON file for the specific architecture
56+
TEST_MATRIX=$(jq --arg arch "$ARCH" --arg matrix_type "$MATRIX_TYPE" '
57+
.windows[$matrix_type] |
58+
map(select(.ARCH == $arch))
59+
' ci/test-matrix.json)
6960
7061
MATRIX="$(
71-
yq -n -o json 'env(TEST_MATRIX)' | \
72-
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end'
62+
jq -c '${{ inputs.matrix_filter }} | if (. | length) > 0 then {include: .} else "Error: Empty matrix\n" | halt_error(1) end' <<< "$TEST_MATRIX"
7363
)"
7464
7565
echo "MATRIX=${MATRIX}" | tee --append "${GITHUB_OUTPUT}"
7666
7767
test:
68+
# TODO: switch to this once the self-hosted runners are ready
69+
# name: py${{ matrix.PY_VER }}, ${{ matrix.CUDA_VER }}, ${{ (matrix.LOCAL_CTK == '1' && 'local') || 'wheels' }}, GPU ${{ matrix.GPU }}
7870
name: py${{ matrix.PY_VER }}, ${{ matrix.CUDA_VER }}, ${{ (matrix.LOCAL_CTK == '1' && 'local') || 'wheels' }}
7971
# The build stage could fail but we want the CI to keep moving.
8072
needs: compute-matrix
8173
strategy:
8274
fail-fast: false
8375
matrix: ${{ fromJSON(needs.compute-matrix.outputs.MATRIX) }}
8476
if: ${{ github.repository_owner == 'nvidia' && !cancelled() }}
77+
# TODO: switch to self-hosted runners once they are ready
78+
# runs-on: "windows-${{ matrix.ARCH }}-gpu-${{ matrix.GPU }}-${{ matrix.DRIVER }}-1"
8579
runs-on: 'cuda-python-windows-gpu-github'
8680
steps:
8781
- name: Checkout ${{ github.event.repository.name }}
@@ -90,6 +84,9 @@ jobs:
9084
fetch-depth: 0
9185

9286
# TODO: use setup-proxy-cache once we have self-hosted Windows runners
87+
# - name: Setup proxy cache
88+
# uses: nv-gha-runners/setup-proxy-cache@main
89+
# continue-on-error: true
9390

9491
- name: Update driver
9592
run: |
@@ -98,6 +95,7 @@ jobs:
9895
- name: Ensure GPU is working
9996
run: nvidia-smi
10097

98+
# TODO: remove this block once self-hosted runners are ready
10199
- name: Install Git for Windows
102100
# the GPU runner image does not have Git Bash pre-installed...
103101
env:
@@ -143,6 +141,7 @@ jobs:
143141
name: ${{ env.CUDA_BINDINGS_ARTIFACT_NAME }}
144142
path: ${{ env.CUDA_BINDINGS_ARTIFACTS_DIR }}
145143

144+
# TODO: remove this block once self-hosted runners are ready
146145
- name: Install gh cli
147146
# the GPU runner image does not have gh pre-installed...
148147
env:

0 commit comments

Comments
 (0)