Skip to content

Commit a6572fb

Browse files
Update PyTorch pin (#4922)
2 parents 37b03ae + 895e7cf commit a6572fb

File tree

11 files changed

+138
-212
lines changed

11 files changed

+138
-212
lines changed

.github/pins/pytorch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3f1636ebef9b45e8a3cb0eb20d327ee6acb74be0
1+
54cc63b467f24242cf0d6538d3e1df39e553daf1

.github/workflows/build-test-reusable.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,21 +344,11 @@ jobs:
344344
run: |
345345
${{ env.TRITON_TEST_CMD }} --select-from-file tutorials.txt --tutorial
346346
347-
- name: Get transformers version
347+
- name: Install transformers
348348
if: matrix.suite == 'rest'
349349
run: |
350350
cd pytorch
351-
TRANSFORMERS_VERSION="$(<.ci/docker/ci_commit_pins/huggingface.txt)"
352-
echo "TRANSFORMERS_VERSION=$TRANSFORMERS_VERSION" | tee -a $GITHUB_ENV
353-
354-
- name: Install transformers
355-
if: matrix.suite == 'rest'
356-
uses: ./.github/actions/install-dependency
357-
with:
358-
package: transformers
359-
repository: huggingface/transformers
360-
ref: ${{ env.TRANSFORMERS_VERSION }}
361-
try-tag-prefix: v
351+
pip install -r .ci/docker/ci_commit_pins/huggingface-requirements.txt
362352
363353
- name: Run E2E test
364354
if: matrix.suite == 'rest'

.github/workflows/e2e-reusable.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ jobs:
101101
echo "BENCHMARK_COMMIT_ID=$(<.github/ci_commit_pins/torchbench.txt)" | tee -a "$GITHUB_ENV"
102102
echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" | tee -a "$GITHUB_ENV"
103103
echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" | tee -a "$GITHUB_ENV"
104-
echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" | tee -a "$GITHUB_ENV"
105104
echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" | tee -a "$GITHUB_ENV"
106105
107106
- name: Generate Triton cache key
@@ -140,13 +139,9 @@ jobs:
140139
141140
- name: Install transformers package
142141
if: ${{ inputs.suite == 'huggingface' }}
143-
uses: ./.github/actions/install-dependency
144-
with:
145-
package: transformers
146-
repository: huggingface/transformers
147-
ref: ${{ env.TRANSFORMERS_VERSION }}
148-
try-tag-prefix: v
149-
extra-cache-key: ${{ env.PYTORCH_VERSION }}
142+
run: |
143+
cd pytorch
144+
pip install -r .ci/docker/ci_commit_pins/huggingface-requirements.txt
150145
151146
- name: Install torchvision package
152147
if: ${{ inputs.suite == 'timm_models' || inputs.suite == 'torchbench' }}
@@ -264,7 +259,6 @@ jobs:
264259
TRITON_COMMIT_ID=$GITHUB_SHA
265260
TORCHVISION_COMMIT_ID=$TORCHVISION_COMMIT_ID
266261
TORCHAUDIO_COMMIT_ID=$TORCHAUDIO_COMMIT_ID
267-
TRANSFORMERS_VERSION=$TRANSFORMERS_VERSION
268262
TIMM_COMMIT_ID=$TIMM_COMMIT_ID
269263
LIBIGC1_VERSION=$LIBIGC1_VERSION
270264
LEVEL_ZERO_VERSION=$LEVEL_ZERO_VERSION

.github/workflows/e2e-windows.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ jobs:
160160
echo "BENCHMARK_COMMIT_ID=$(<.github/ci_commit_pins/torchbench.txt)" | tee -a "$GITHUB_ENV"
161161
echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" | tee -a "$GITHUB_ENV"
162162
echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" | tee -a "$GITHUB_ENV"
163-
echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" | tee -a "$GITHUB_ENV"
164163
echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" | tee -a "$GITHUB_ENV"
165164
166165
- name: Install python test dependencies
@@ -170,14 +169,9 @@ jobs:
170169
171170
- name: Install transformers package
172171
if: inputs.suite == 'all' || inputs.suite == 'huggingface'
173-
uses: ./.github/actions/install-dependency
174-
with:
175-
package: transformers
176-
repository: huggingface/transformers
177-
ref: ${{ env.TRANSFORMERS_VERSION }}
178-
try-tag-prefix: v
179-
extra-cache-key: ${{ env.PYTORCH_VERSION }}
180-
workspace: /c/gh${{ github.run_id }}
172+
run: |
173+
cd pytorch
174+
pip install -r .ci/docker/ci_commit_pins/huggingface-requirements.txt
181175
182176
- name: Install torchvision package
183177
if: inputs.suite == 'all' || inputs.suite == 'timm_models' || inputs.suite == 'torchbench'
@@ -336,7 +330,6 @@ jobs:
336330
TRITON_COMMIT_ID=$GITHUB_SHA
337331
TORCHVISION_COMMIT_ID=$TORCHVISION_COMMIT_ID
338332
TORCHAUDIO_COMMIT_ID=$TORCHAUDIO_COMMIT_ID
339-
TRANSFORMERS_VERSION=$TRANSFORMERS_VERSION
340333
TIMM_COMMIT_ID=$TIMM_COMMIT_ID
341334
LIBIGC1_VERSION=$LIBIGC1_VERSION
342335
LEVEL_ZERO_VERSION=$LEVEL_ZERO_VERSION

.github/workflows/nightly-wheels.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
cd pytorch
6666
echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" | tee -a $GITHUB_ENV
6767
echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" | tee -a $GITHUB_ENV
68-
echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" | tee -a $GITHUB_ENV
6968
echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" | tee -a $GITHUB_ENV
7069
7170
- name: Identify Triton commit id
@@ -104,13 +103,9 @@ jobs:
104103
extra-cache-key: ${{ env.PYTORCH_VERSION }}
105104

106105
- name: Install transformers package
107-
uses: ./.github/actions/install-dependency
108-
with:
109-
package: transformers
110-
repository: huggingface/transformers
111-
ref: ${{ env.TRANSFORMERS_VERSION }}
112-
try-tag-prefix: v
113-
extra-cache-key: ${{ env.PYTORCH_VERSION }}
106+
run: |
107+
cd pytorch
108+
pip install -r .ci/docker/ci_commit_pins/huggingface-requirements.txt
114109
115110
- name: Prepare wheels for upload
116111
run: |
@@ -120,7 +115,6 @@ jobs:
120115
cp -L torchvision*/dist/*.whl wheels/
121116
cp -L torchaudio*/dist/*.whl wheels/
122117
cp -L timm*/dist/*.whl wheels/
123-
cp -L transformers*/dist/*.whl wheels/
124118
ls -lh wheels/
125119
126120
- name: Report environment details

scripts/patch-pytorch.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@ echo "Applying PyTorch patches in $REPO_ROOT"
3838
apply_patch ./patch/flex_attn_143553.patch
3939
apply_patch ./patch/pytorch_fp64.patch
4040
apply_patch ./patch/pytorch_global_scratch.patch
41-
apply_patch ./patch/test_compile_subprocess.patch
4241
apply_patch ./patch/flex_decoding.patch

0 commit comments

Comments
 (0)