Cherry pick #2241 and #2242 (#2244)

* Remove torchdata dependency from package and from CI (#2241)

* Fix torchdata import error (#2242)

* Remove stuff

* stuff

* lint

---------

Co-authored-by: Nicolas Hug <[email protected]>

Author: huydhn

.circleci/unittest/linux/scripts/install.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 unset PYTORCH_VERSION
-unset TORCHDATA_VERSION
 # For unittest, nightly PyTorch is used as the following section,
 # so no need to set PYTORCH_VERSION.
 # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config.
@@ -30,10 +29,6 @@ printf "* Installing PyTorch\n"
 )
 
 
-printf "Installing torchdata nightly with portalocker\n"
-pip install "portalocker>=2.0.0"
-pip install --pre torchdata --index-url https://download.pytorch.org/whl/nightly/cpu
-
 printf "* Installing torchtext\n"
 python setup.py develop
 

.circleci/unittest/windows/scripts/install.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 unset PYTORCH_VERSION
-unset TORCHDATA_VERSION
 # For unittest, nightly PyTorch is used as the following section,
 # so no need to set PYTORCH_VERSION.
 # In fact, keeping PYTORCH_VERSION forces us to hardcode PyTorch version in config.
@@ -19,10 +18,6 @@ conda activate ./env
 printf "* Installing PyTorch\n"
 conda install -y -c "pytorch-${UPLOAD_CHANNEL}" ${CONDA_CHANNEL_FLAGS} pytorch cpuonly
 
-printf "* Installing torchdata nightly with portalocker\n"
-pip install "portalocker>=2.0.0"
-pip install --pre torchdata --index-url https://download.pytorch.org/whl/nightly/cpu
-
 printf "* Installing pywin32_postinstall script\n"
 curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py
 python pywin32_postinstall.py -install

.github/workflows/build-conda-linux.yml

@@ -29,7 +29,7 @@ jobs:
       matrix:
         include:
           - repository: pytorch/text
-            pre-script: packaging/install_torchdata.sh
+            pre-script: ""
             post-script: ""
             conda-package-directory: packaging/torchtext
             smoke-test-script: test/smoke_tests/smoke_tests.py

.github/workflows/build-conda-m1.yml

@@ -28,7 +28,7 @@ jobs:
       matrix:
         include:
           - repository: pytorch/text
-            pre-script: packaging/install_torchdata.sh
+            pre-script: ""
             post-script: ""
             conda-package-directory: packaging/torchtext
             smoke-test-script: test/smoke_tests/smoke_tests.py

.github/workflows/build-conda-windows.yml

@@ -29,7 +29,7 @@ jobs:
       matrix:
         include:
           - repository: pytorch/text
-            pre-script: packaging/install_torchdata.sh
+            pre-script: ""
             post-script: ""
             conda-package-directory: packaging/torchtext
             smoke-test-script: test/smoke_tests/smoke_tests.py

.github/workflows/build-wheels-linux.yml

@@ -34,7 +34,7 @@ jobs:
       matrix:
         include:
           - repository: pytorch/text
-            pre-script: packaging/install_torchdata.sh
+            pre-script: ""
             post-script: ""
             smoke-test-script: test/smoke_tests/smoke_tests.py
             package-name: torchtext

.github/workflows/build-wheels-m1.yml

@@ -32,7 +32,7 @@ jobs:
       matrix:
         include:
           - repository: pytorch/text
-            pre-script: packaging/install_torchdata.sh
+            pre-script: ""
             post-script: ""
             package-name: torchtext
             smoke-test-script: test/smoke_tests/smoke_tests.py

.github/workflows/build-wheels-windows.yml

@@ -33,7 +33,7 @@ jobs:
       matrix:
         include:
           - repository: pytorch/text
-            pre-script: packaging/install_torchdata.sh
+            pre-script: ""
             env-script: packaging/vc_env_helper.bat
             post-script: ""
             smoke-test-script: test/smoke_tests/smoke_tests.py

.github/workflows/codeql.yml

@@ -31,7 +31,6 @@ jobs:
       - name: Install Torch
         run: |
           python -m pip install cmake
-          python -m pip install --quiet --pre torch torchdata -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
           sudo ln -s /usr/bin/ninja /usr/bin/ninja-build
 
       - name: Build TorchText

.github/workflows/integration-test.yml

@@ -39,15 +39,13 @@ jobs:
         python -m spacy download en_core_web_sm
         printf "* Downloading SpaCy German models\n"
         python -m spacy download de_core_news_sm
-        # Install PyTorch, Torchvision, and TorchData
+        # Install PyTorch, Torchvision
         set -ex
         conda install \
           --yes \
           -c "pytorch-${CHANNEL}" \
           -c nvidia "pytorch-${CHANNEL}"::pytorch[build="*${VERSION}*"] \
           "${CUDATOOLKIT}"
-        printf "Installing torchdata nightly\n"
-        python3 -m pip install --pre torchdata --index-url https://download.pytorch.org/whl/nightly/cpu
         python3 setup.py develop
         # Install integration test dependencies
         python3 -m pip --quiet install parameterized