Skip to content

Commit

Permalink
Upgrade torch to 1.12 (deepset-ai#2741)
Browse files Browse the repository at this point in the history
* Upgrade torch to 1.12

* upgrade torch-scatter

* add explicit torch-scatter installation

* set torch dependency to range >1.9,<1.13
  • Loading branch information
julian-risch authored and andrch-FS committed Jul 26, 2022
1 parent 9fe8e11 commit ea38942
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/python_cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ runs:
pip install .[all]
pip install rest_api/
pip install ui/
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.11.0+cpu.html
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cpu.html
2 changes: 1 addition & 1 deletion .github/workflows/autoformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
pip install .[all]
pip install rest_api/
pip install ui/
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.11.0+cpu.html
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cpu.html
- name: Install sndfile
run: sudo apt update && sudo apt-get install libsndfile1 ffmpeg
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ jobs:

- name: Setup Python
uses: ./.github/actions/python_cache/

- name: Install torch-scatter
run: pip install torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cpu.html

# TODO Let's try to remove this one from the unit tests
- name: Install pdftotext
Expand Down Expand Up @@ -700,4 +703,4 @@ jobs:
echo "Please enable GitHub Action on your fork to pass this check!"
echo "See https://github.com/deepset-ai/haystack/blob/master/CONTRIBUTING.md#forks for instructions"
exit 1
fi
fi
2 changes: 1 addition & 1 deletion .github/workflows/tutorials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: |
pip install --upgrade pip
pip install .[all]
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.11.0+cpu.html
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cpu.html
pip install pygraphviz
pip install ipython nbformat
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tutorials_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: |
pip install --upgrade pip
pip install .[all]
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.11.0+cpu.html
pip install torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cpu.html
pip install pygraphviz
pip install ipython nbformat
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ setup_requires =
wheel
install_requires =
importlib-metadata; python_version < '3.8'
torch>1.9,<1.12
torch>1.9,<1.13
requests
pydantic
transformers==4.20.1
Expand Down

0 comments on commit ea38942

Please sign in to comment.