Skip to content

Remove torchdata dependency from package and from CI #2241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 22, 2024
Merged

Remove torchdata dependency from package and from CI #2241

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9784bc9
Update smoke_tests
NicolasHug Mar 22, 2024
864ac61
Update setup.py
NicolasHug Mar 22, 2024
fa18124
Update _download_hooks
NicolasHug Mar 22, 2024
43ce25b
udpate requirements.txt
NicolasHug Mar 22, 2024
6b6def6
Ignore all dataset tests
NicolasHug Mar 22, 2024
f2a63df
Update packaging/*
NicolasHug Mar 22, 2024
3bc86ce
Update .circleci/*
NicolasHug Mar 22, 2024
72bfe35
Update build workflows
NicolasHug Mar 22, 2024
6b4a32b
Update rest of workflows
NicolasHug Mar 22, 2024
c848f7a
Remove install_torchdata.sh
NicolasHug Mar 22, 2024
9e13774
linter
NicolasHug Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update rest of workflows
  • Loading branch information
@NicolasHug
NicolasHug committed Mar 22, 2024
commit 6b4a32babd2ef6429fc4c063ea8751fe7942416c
1 change: 0 additions & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test-linux-cpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,13 @@ jobs:
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 "portalocker>=2.0.0"
python3 -m pip install --pre torchdata --index-url https://download.pytorch.org/whl/nightly/cpu
python3 setup.py develop
python3 -m pip install parameterized

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test-linux-gpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,14 @@ jobs:
printf "* Downloading SpaCy German models\n"
python -m spacy download de_core_news_sm

# Install PyTorch and TorchData
# Install PyTorch
set -ex
conda install \
--yes \
--quiet \
-c "pytorch-${CHANNEL}" \
-c nvidia "pytorch-${CHANNEL}"::pytorch[build="*${VERSION}*"] \
"${CUDATOOLKIT}"
printf "Installing torchdata nightly\n"
python3 -m pip install "portalocker>=2.0.0"
python3 -m pip install --pre torchdata --index-url https://download.pytorch.org/whl/nightly/cpu --quiet
python3 setup.py develop
python3 -m pip install parameterized --quiet

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test-macos-cpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
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 \
Expand All @@ -64,9 +64,6 @@ jobs:
"${MKL_CONSTRAINT}" \
pytorch \
"${CUDATOOLKIT}"
printf "Installing torchdata nightly\n"
python3 -m pip install "portalocker>=2.0.0"
python3 -m pip install --pre torchdata --index-url https://download.pytorch.org/whl/nightly/cpu
python3 setup.py develop
python3 -m pip install parameterized

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/test-windows-cpu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,12 @@ jobs:
printf "* Downloading SpaCy German models\n"
python -m spacy download de_core_news_sm

# Install PyTorch, Torchvision, and TorchData
# Install PyTorch, Torchvision
conda install \
--yes \
-c "pytorch-${CHANNEL}" \
pytorch \
cpuonly
printf "Installing torchdata nightly\n"
python -m pip install "portalocker>=2.0.0"
python -m 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
Expand Down