Skip to content

Commit 5f95a17

Browse files
authored
Remove torchdata==0.9.0 pin and torchtext as deprecated (#4849)
Signed-off-by: Anatoly Myachev <[email protected]>
1 parent 69e14ad commit 5f95a17

File tree

4 files changed

+4
-50
lines changed

4 files changed

+4
-50
lines changed

.github/workflows/e2e-reusable.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ jobs:
9090
# cmake<4.0.0 is required as a workaround for CMake Error at third_party/double-conversion/CMakeLists.txt:1 (cmake_minimum_required)
9191
pip install wheel 'cmake<4.0.0'
9292
93-
# https://github.com/pytorch/data/blob/e316c5ca1ab2a4f69dd6d48e8fc9c6f8d0c7c468/README.md?plain=1#L6-L15
94-
- name: Install pinned torchdata
95-
run: |
96-
pip install torchdata==0.9.0
97-
9893
- name: Setup PyTorch
9994
uses: ./.github/actions/setup-pytorch
10095
with:
@@ -105,7 +100,6 @@ jobs:
105100
cd pytorch
106101
echo "BENCHMARK_COMMIT_ID=$(<.github/ci_commit_pins/torchbench.txt)" | tee -a "$GITHUB_ENV"
107102
echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" | tee -a "$GITHUB_ENV"
108-
echo "TORCHTEXT_COMMIT_ID=$(<.github/ci_commit_pins/text.txt)" | tee -a "$GITHUB_ENV"
109103
echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" | tee -a "$GITHUB_ENV"
110104
echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" | tee -a "$GITHUB_ENV"
111105
echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" | tee -a "$GITHUB_ENV"
@@ -163,15 +157,6 @@ jobs:
163157
ref: ${{ env.TORCHVISION_COMMIT_ID }}
164158
extra-cache-key: ${{ env.PYTORCH_VERSION }}
165159

166-
- name: Install torchtext package
167-
if: ${{ inputs.suite == 'torchbench' }}
168-
uses: ./.github/actions/install-dependency
169-
with:
170-
package: torchtext
171-
repository: pytorch/text
172-
ref: ${{ env.TORCHTEXT_COMMIT_ID }}
173-
extra-cache-key: ${{ env.PYTORCH_VERSION }}
174-
175160
- name: Install torchaudio package
176161
if: ${{ inputs.suite == 'torchbench' }}
177162
uses: ./.github/actions/install-dependency
@@ -278,7 +263,6 @@ jobs:
278263
TRITON_REPO=$GITHUB_REPOSITORY
279264
TRITON_COMMIT_ID=$GITHUB_SHA
280265
TORCHVISION_COMMIT_ID=$TORCHVISION_COMMIT_ID
281-
TORCHTEXT_COMMIT_ID=$TORCHTEXT_COMMIT_ID
282266
TORCHAUDIO_COMMIT_ID=$TORCHAUDIO_COMMIT_ID
283267
TRANSFORMERS_VERSION=$TRANSFORMERS_VERSION
284268
TIMM_COMMIT_ID=$TIMM_COMMIT_ID

.github/workflows/e2e-windows.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,14 @@ jobs:
159159
cd /c/pytorch
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"
162-
echo "TORCHTEXT_COMMIT_ID=$(<.github/ci_commit_pins/text.txt)" | tee -a "$GITHUB_ENV"
163162
echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" | tee -a "$GITHUB_ENV"
164163
echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" | tee -a "$GITHUB_ENV"
165164
echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" | tee -a "$GITHUB_ENV"
166165
167-
- name: Install pinned torchdata
166+
- name: Install python test dependencies
168167
run: |
169168
.venv\Scripts\activate.ps1
170-
# Pinned torchdata
171-
# https://github.com/pytorch/data/blob/e316c5ca1ab2a4f69dd6d48e8fc9c6f8d0c7c468/README.md?plain=1#L6-L15
172-
pip install pyyaml pandas scipy numpy psutil pyre_extensions torchrec torchdata==0.9.0
169+
pip install pyyaml pandas scipy numpy psutil pyre_extensions torchrec
173170
174171
- name: Install transformers package
175172
if: inputs.suite == 'all' || inputs.suite == 'huggingface'
@@ -194,16 +191,6 @@ jobs:
194191
extra-cache-key: ${{ env.PYTORCH_VERSION }}
195192
workspace: /c/gh${{ github.run_id }}
196193

197-
- name: Install torchtext package
198-
if: inputs.suite == 'all' || inputs.suite == 'torchbench'
199-
uses: ./.github/actions/install-dependency
200-
with:
201-
package: torchtext
202-
repository: pytorch/text
203-
ref: ${{ env.TORCHTEXT_COMMIT_ID }}
204-
extra-cache-key: ${{ env.PYTORCH_VERSION }}
205-
workspace: /c/gh${{ github.run_id }}
206-
207194
- name: Install torchaudio package
208195
if: inputs.suite == 'all' || inputs.suite == 'torchbench'
209196
uses: ./.github/actions/install-dependency
@@ -348,7 +335,6 @@ jobs:
348335
TRITON_REPO=$GITHUB_REPOSITORY
349336
TRITON_COMMIT_ID=$GITHUB_SHA
350337
TORCHVISION_COMMIT_ID=$TORCHVISION_COMMIT_ID
351-
TORCHTEXT_COMMIT_ID=$TORCHTEXT_COMMIT_ID
352338
TORCHAUDIO_COMMIT_ID=$TORCHAUDIO_COMMIT_ID
353339
TRANSFORMERS_VERSION=$TRANSFORMERS_VERSION
354340
TIMM_COMMIT_ID=$TIMM_COMMIT_ID

.github/workflows/nightly-wheels.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,13 @@ jobs:
4949
# cmake 3.22.1 does not work with the recent torchaudio: https://github.com/intel/intel-xpu-backend-for-triton/issues/2079
5050
pip install wheel cmake
5151
52-
# https://github.com/pytorch/data/blob/e316c5ca1ab2a4f69dd6d48e8fc9c6f8d0c7c468/README.md?plain=1#L6-L15
53-
- name: Install pinned torchdata
54-
run: |
55-
pip install torchdata==0.9.0
56-
5752
- name: Setup PyTorch
5853
uses: ./.github/actions/setup-pytorch
5954

6055
- name: Identify pinned versions
6156
run: |
6257
cd pytorch
6358
echo "TORCHVISION_COMMIT_ID=$(<.github/ci_commit_pins/vision.txt)" | tee -a $GITHUB_ENV
64-
echo "TORCHTEXT_COMMIT_ID=$(<.github/ci_commit_pins/text.txt)" | tee -a $GITHUB_ENV
6559
echo "TORCHAUDIO_COMMIT_ID=$(<.github/ci_commit_pins/audio.txt)" | tee -a $GITHUB_ENV
6660
echo "TRANSFORMERS_VERSION=$(<.ci/docker/ci_commit_pins/huggingface.txt)" | tee -a $GITHUB_ENV
6761
echo "TIMM_COMMIT_ID=$(<.ci/docker/ci_commit_pins/timm.txt)" | tee -a $GITHUB_ENV
@@ -85,14 +79,6 @@ jobs:
8579
ref: ${{ env.TORCHVISION_COMMIT_ID }}
8680
extra-cache-key: ${{ env.PYTORCH_VERSION }}
8781

88-
- name: Install torchtext package
89-
uses: ./.github/actions/install-dependency
90-
with:
91-
package: torchtext
92-
repository: pytorch/text
93-
ref: ${{ env.TORCHTEXT_COMMIT_ID }}
94-
extra-cache-key: ${{ env.PYTORCH_VERSION }}
95-
9682
- name: Install torchaudio package
9783
uses: ./.github/actions/install-dependency
9884
with:
@@ -124,7 +110,6 @@ jobs:
124110
cp -L pytorch/dist/*.whl wheels/
125111
cp -L dist/*.whl wheels/
126112
cp -L torchvision*/dist/*.whl wheels/
127-
cp -L torchtext*/dist/*.whl wheels/
128113
cp -L torchaudio*/dist/*.whl wheels/
129114
cp -L timm*/dist/*.whl wheels/
130115
cp -L transformers*/dist/*.whl wheels/
@@ -148,7 +133,6 @@ jobs:
148133
TRITON_REPO=intel/intel-xpu-backend-for-triton
149134
TRITON_COMMIT_ID=$TRITON_COMMIT_ID
150135
TORCHVISION_COMMIT_ID=$TORCHVISION_COMMIT_ID
151-
TORCHTEXT_COMMIT_ID=$TORCHTEXT_COMMIT_ID
152136
TORCHAUDIO_COMMIT_ID=$TORCHAUDIO_COMMIT_ID
153137
EOF
154138

scripts/install-pytorch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fi
129129
############################################################################
130130
# Check installed torch pinned dependencies
131131

132-
PINNED_TORCH_DEPENDENCIES_REGEX="^torchtext==|^torchaudio==|^torchvision=="
132+
PINNED_TORCH_DEPENDENCIES_REGEX="^torchaudio==|^torchvision=="
133133
INSTALLED_PINNED_TORCH_DEPENDENCIES=$(pip list --format=freeze | grep -iE "$PINNED_TORCH_DEPENDENCIES_REGEX" || true)
134134

135135
if [ -n "$INSTALLED_PINNED_TORCH_DEPENDENCIES" ]; then
@@ -143,7 +143,7 @@ if [ -n "$INSTALLED_PINNED_TORCH_DEPENDENCIES" ]; then
143143
echo "**** INFO: PyTorch pinned dependencies build from source mode is not supported. ****"
144144
exit 1
145145
fi
146-
pip uninstall -y torchtext torchaudio torchvision
146+
pip uninstall -y torchaudio torchvision
147147
fi
148148

149149
############################################################################

0 commit comments

Comments
 (0)