Skip to content

Commit 8f359cb

Browse files
committed
[release/2.14] Pin validation to release/2.14 and bump CURRENT_CANDIDATE_VERSION
Release-only follow-up to the 2.14 branch cut (79a17ec), porting the equivalents of #8171 / #8172 / #8216 from release/2.13. ## 1. `CURRENT_CANDIDATE_VERSION` -> 2.14.0 The branch cut moved `CURRENT_NIGHTLY_VERSION` to 2.14.0 but left `CURRENT_CANDIDATE_VERSION` at 2.13.0. For the test channel `initialize_globals()` sets `CURRENT_VERSION = CURRENT_CANDIDATE_VERSION`, which the generated matrix surfaces as `stable_version` and `smoke_test.py` then enforces. Since the test channel now serves the 2.14.0 release candidate, validation fails with: ``` RuntimeError: Torch version mismatch, expected 2.13.0 for channel test ``` Verified with `generate_binary_build_matrix.py --channel test`: `stable_version` goes 2.13.0 -> 2.14.0. `CURRENT_STABLE_VERSION` stays at 2.13.0 (the current GA release); it moves separately when 2.14 goes live. ## 2. `pytorch/pytorch` checkouts -> `ref: release/2.14` The validation jobs check out `repository: "pytorch/pytorch"` with `ref: main`, so release validation ran against main's `.ci` / `test/smoke_test` sources instead of the release branch. Pinned in all seven call sites across `validate-{linux,windows,macos-arm64,aarch64-linux}-binaries.yml` and `validate-docker-images.yml`, matching release/2.13's state. ## 3. Explicit `test-infra-ref: release/2.14` in matrix generation Belt-and-braces: the branch cut already rewrote the `test-infra-ref` default in `generate_binary_build_matrix.yml` to `release/2.14`, so this is not a live bug on 2.14 (it was on 2.13, where the default stayed `main`). Passing it explicitly keeps the matrix pinned to the release branch even if that default is ever re-synced from main. ## 4. Revert a branch-cut sed artifact The cut rewrote a comment referring to the *Poetry* project's own branch, `poetry@main` -> `poetry@release/2.14`, which is meaningless. Restored. Authored with the assistance of Claude Code.
1 parent 79a17ec commit 8f359cb

6 files changed

Lines changed: 13 additions & 9 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ jobs:
9696
package-type: wheel
9797
os: linux-aarch64
9898
channel: ${{ inputs.channel }}
99+
test-infra-ref: release/2.14
99100
with-cuda: enable
100101
with-cpu: enable
101102
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
@@ -110,7 +111,7 @@ jobs:
110111
with:
111112
runner: ${{ matrix.validation_runner }}
112113
repository: "pytorch/pytorch"
113-
ref: main
114+
ref: release/2.14
114115
job-name: ${{ matrix.build_name }}
115116
docker-image: ${{ matrix.container_image }}
116117
binary-matrix: ${{ toJSON(matrix) }}

.github/workflows/validate-docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
runner: ${{ matrix.validation_runner }}
6161
repository: "pytorch/pytorch"
62-
ref: main
62+
ref: release/2.14
6363
job-name: cuda${{ matrix.cuda }}-cudnn${{ matrix.cudnn_version }}-${{ matrix.image_type }}
6464
binary-matrix: ${{ toJSON(matrix) }}
6565
docker-image: ${{matrix.docker}}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
package-type: wheel,libtorch
107107
os: linux
108108
channel: ${{ inputs.channel }}
109+
test-infra-ref: release/2.14
109110
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
110111
with-xpu: enable
111112

@@ -119,7 +120,7 @@ jobs:
119120
with:
120121
runner: ${{ matrix.validation_runner }}
121122
repository: "pytorch/pytorch"
122-
ref: main
123+
ref: release/2.14
123124
job-name: ${{ matrix.build_name }}
124125
# ROCm validates on the regular almalinux image (like CUDA) to confirm
125126
# the wheels are self-contained. Only XPU still needs its own container.
@@ -145,7 +146,7 @@ jobs:
145146
146147
# Validate binaries. Poetry-based validation now lives in the
147148
# standalone linux-poetry job below so Poetry's own ecosystem
148-
# churn (it was previously installed from poetry@release/2.14) cannot
149+
# churn (it was previously installed from poetry@main) cannot
149150
# flake the binary matrix.
150151
source ../../test-infra/.github/scripts/validate_binaries.sh
151152
@@ -156,7 +157,7 @@ jobs:
156157
with:
157158
runner: "linux.g5.4xlarge.nvidia.gpu"
158159
repository: "pytorch/pytorch"
159-
ref: main
160+
ref: release/2.14
160161
job-name: "poetry-test"
161162
docker-image: 'pytorch/almalinux-builder:cpu-main'
162163
docker-build-dir: "skip-docker-build"
@@ -185,7 +186,7 @@ jobs:
185186
with:
186187
runner: "linux.g5.4xlarge.nvidia.gpu"
187188
repository: "pytorch/pytorch"
188-
ref: main
189+
ref: release/2.14
189190
job-name: "amazon-linux-2023-test"
190191
docker-image: 'almalinux/9-base'
191192
docker-build-dir: "skip-docker-build"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ jobs:
9696
package-type: wheel,libtorch # We stopped producing conda nightlies
9797
os: macos-arm64
9898
channel: ${{ inputs.channel }}
99+
test-infra-ref: release/2.14
99100
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
100101

101102
macos-arm64:
@@ -108,7 +109,7 @@ jobs:
108109
with:
109110
runner: ${{ matrix.validation_runner }}
110111
repository: "pytorch/pytorch"
111-
ref: main
112+
ref: release/2.14
112113
job-name: ${{ matrix.build_name }}
113114
binary-matrix: ${{ toJSON(matrix) }}
114115
script: |

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ jobs:
9696
package-type: wheel,libtorch # We stopped producing conda nightlies
9797
os: windows
9898
channel: ${{ inputs.channel }}
99+
test-infra-ref: release/2.14
99100
use-only-dl-pytorch-org: ${{ inputs.use-only-dl-pytorch-org }}
100101
with-xpu: enable
101102

@@ -109,7 +110,7 @@ jobs:
109110
with:
110111
runner: ${{ matrix.package_type == 'libtorch' && 'windows.4xlarge' || matrix.validation_runner }}
111112
repository: "pytorch/pytorch"
112-
ref: main
113+
ref: release/2.14
113114
job-name: ${{ matrix.build_name }}
114115
binary-matrix: ${{ toJSON(matrix) }}
115116
timeout: 60

tools/scripts/generate_binary_build_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100

101101
CURRENT_NIGHTLY_VERSION = "2.14.0"
102-
CURRENT_CANDIDATE_VERSION = "2.13.0"
102+
CURRENT_CANDIDATE_VERSION = "2.14.0"
103103
CURRENT_STABLE_VERSION = "2.13.0"
104104
CURRENT_VERSION = CURRENT_STABLE_VERSION
105105

0 commit comments

Comments
 (0)