Skip to content

Commit 251ff5b

Browse files
atalmanatalman
committed
[DO NOT MERGE] Force this PR's CI to actually exercise Python 3.15
Two separate reasons the PR run was still validating 3.10 and testing none of the changes in this PR: 1. PR runs set LIMIT_PR_BUILDS, which trims the matrix to the OLDEST python (3.10). Force 3.15 where the channel has it; release (no 3.15) and windows-arm64 (own pinned list) keep the previous behaviour. 2. None of the validate-*-binaries.yml workflows pass test-infra-ref, so generate_binary_build_matrix.yml defaults to 'main' and the *_job.yml templates default to '' (= default branch). Both the matrix generator and validate_binaries.sh were therefore taken from main, not from this PR. Point test-infra-repository/test-infra-ref at the PR branch (10 call sites across the four validate workflows). Revert this commit before merging.
1 parent 74c0c77 commit 251ff5b

5 files changed

Lines changed: 50 additions & 1 deletion

File tree

‎.github/workflows/validate-aarch64-linux-binaries.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ jobs:
9595
with:
9696
package-type: wheel
9797
os: linux-aarch64
98+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
99+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
100+
test-infra-repository: atalman/test-infra
101+
test-infra-ref: atalman/fix-py315-validation
98102
channel: ${{ inputs.channel }}
99103
with-cuda: enable
100104
with-cpu: enable
@@ -110,6 +114,10 @@ jobs:
110114
with:
111115
runner: ${{ matrix.validation_runner }}
112116
repository: "pytorch/pytorch"
117+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
118+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
119+
test-infra-repository: atalman/test-infra
120+
test-infra-ref: atalman/fix-py315-validation
113121
ref: main
114122
job-name: ${{ matrix.build_name }}
115123
docker-image: ${{ matrix.container_image }}

‎.github/workflows/validate-linux-binaries.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ jobs:
105105
with:
106106
package-type: wheel,libtorch
107107
os: linux
108+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
109+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
110+
test-infra-repository: atalman/test-infra
111+
test-infra-ref: atalman/fix-py315-validation
108112
channel: ${{ inputs.channel }}
109113
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
110114
with-xpu: enable
@@ -119,6 +123,10 @@ jobs:
119123
with:
120124
runner: ${{ matrix.validation_runner }}
121125
repository: "pytorch/pytorch"
126+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
127+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
128+
test-infra-repository: atalman/test-infra
129+
test-infra-ref: atalman/fix-py315-validation
122130
ref: main
123131
job-name: ${{ matrix.build_name }}
124132
# ROCm validates on the regular almalinux image (like CUDA) to confirm
@@ -156,6 +164,10 @@ jobs:
156164
with:
157165
runner: "linux.g5.4xlarge.nvidia.gpu"
158166
repository: "pytorch/pytorch"
167+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
168+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
169+
test-infra-repository: atalman/test-infra
170+
test-infra-ref: atalman/fix-py315-validation
159171
ref: main
160172
job-name: "poetry-test"
161173
docker-image: 'pytorch/almalinux-builder:cpu-main'
@@ -185,6 +197,10 @@ jobs:
185197
with:
186198
runner: "linux.g5.4xlarge.nvidia.gpu"
187199
repository: "pytorch/pytorch"
200+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
201+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
202+
test-infra-repository: atalman/test-infra
203+
test-infra-ref: atalman/fix-py315-validation
188204
ref: main
189205
job-name: "amazon-linux-2023-test"
190206
docker-image: 'almalinux/9-base'

‎.github/workflows/validate-macos-arm64-binaries.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ jobs:
9595
with:
9696
package-type: wheel,libtorch # We stopped producing conda nightlies
9797
os: macos-arm64
98+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
99+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
100+
test-infra-repository: atalman/test-infra
101+
test-infra-ref: atalman/fix-py315-validation
98102
channel: ${{ inputs.channel }}
99103
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
100104

@@ -108,6 +112,10 @@ jobs:
108112
with:
109113
runner: ${{ matrix.validation_runner }}
110114
repository: "pytorch/pytorch"
115+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
116+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
117+
test-infra-repository: atalman/test-infra
118+
test-infra-ref: atalman/fix-py315-validation
111119
ref: main
112120
job-name: ${{ matrix.build_name }}
113121
binary-matrix: ${{ toJSON(matrix) }}

‎.github/workflows/validate-windows-binaries.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ jobs:
9595
with:
9696
package-type: wheel,libtorch # We stopped producing conda nightlies
9797
os: windows
98+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
99+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
100+
test-infra-repository: atalman/test-infra
101+
test-infra-ref: atalman/fix-py315-validation
98102
channel: ${{ inputs.channel }}
99103
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
100104
with-xpu: enable
@@ -109,6 +113,10 @@ jobs:
109113
with:
110114
runner: ${{ matrix.package_type == 'libtorch' && 'windows.4xlarge' || matrix.validation_runner }}
111115
repository: "pytorch/pytorch"
116+
# [DO NOT MERGE] point checkouts at the PR branch so this PR's own
117+
# CI exercises the 3.15 changes; remove with the rest of the temp commit.
118+
test-infra-repository: atalman/test-infra
119+
test-infra-ref: atalman/fix-py315-validation
112120
ref: main
113121
job-name: ${{ matrix.build_name }}
114122
binary-matrix: ${{ toJSON(matrix) }}

‎tools/scripts/generate_binary_build_matrix.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,16 @@ def generate_wheels_matrix(
474474
arches += [XPU]
475475

476476
if limit_pr_builds:
477-
python_versions = [python_versions[0]]
477+
# ---------------------------------------------------------------
478+
# [DO NOT MERGE] Temporary: PR builds normally validate only the
479+
# OLDEST python (3.10), which would not exercise the 3.15 changes
480+
# in this PR at all. Force 3.15 so CI actually covers them.
481+
# Revert this hunk to `python_versions = [python_versions[0]]`
482+
# before merging.
483+
# ---------------------------------------------------------------
484+
python_versions = (
485+
["3.15"] if "3.15" in python_versions else [python_versions[0]]
486+
)
478487

479488
global WHEEL_CONTAINER_IMAGES
480489

0 commit comments

Comments
 (0)