Skip to content
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

Jump to bottom

replace local adjustment script with external #1758

Merged
merged 8 commits into from
May 9, 2023
Merged

replace local adjustment script with external #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c1e219e
drop local
Borda May 5, 2023
5c9c650
curl
Borda May 5, 2023
d09fceb
-o
Borda May 5, 2023
4b0fec3
azure
Borda May 5, 2023
4456d3f
wget
Borda May 5, 2023
71c35a9
wget
Borda May 5, 2023
e8b53ee
.
Borda May 5, 2023
412e8e1
numpy
Borda May 5, 2023
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
7 changes: 4 additions & 3 deletions .azure/gpu-integrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,10 @@ jobs:

- bash: |
set -e
pip install -q packaging fire requests
python ./requirements/adjust-versions.py requirements.txt $(torch-ver)
python ./requirements/adjust-versions.py requirements/integrate.txt $(torch-ver)
pip install -q packaging fire requests wget
python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
python adjust-torch-versions.py requirements.txt $(torch-ver)
python adjust-torch-versions.py requirements/integrate.txt $(torch-ver)
python .github/assistant.py set-oldest-versions --req_files='["requirements/integrate.txt"]'
cat requirements/integrate.txt
displayName: 'Adjust versions'
Expand Down
7 changes: 4 additions & 3 deletions .azure/gpu-unittests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,11 @@ jobs:
displayName: 'Image info & NVIDIA'

- bash: |
pip install -q packaging
python ./requirements/adjust-versions.py requirements.txt $(torch-ver)
pip install -q packaging wget
python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
python adjust-torch-versions.py requirements.txt $(torch-ver)
for fpath in `ls requirements/*.txt`; do
python ./requirements/adjust-versions.py $fpath $(torch-ver)
python adjust-torch-versions.py $fpath $(torch-ver)
done
displayName: 'Adjust versions'

Expand Down
4 changes: 3 additions & 1 deletion .github/actions/pull-caches/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ runs:

- name: Set PyTorch version
if: inputs.pytorch-version != ''
run: python ./requirements/adjust-versions.py requirements.txt ${{ inputs.pytorch-version }}
run: |
curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py
python adjust-torch-versions.py requirements.txt ${{ inputs.pytorch-version }}
shell: bash

- name: Set min. dependencies
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ci-integrate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ jobs:
- name: Install all dependencies
run: |
set -e
curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py
pip install -r requirements/test.txt -r requirements/integrate.txt \
--find-links $PYTORCH_URL -f $PYPI_CACHE --upgrade-strategy eager
python ./requirements/adjust-versions.py requirements.txt
python ./requirements/adjust-versions.py requirements/image.txt
python adjust-torch-versions.py requirements.txt
python adjust-torch-versions.py requirements/image.txt
cat requirements.txt
pip install -e . --find-links $PYTORCH_URL -f $PYPI_CACHE
pip list
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ci-tests-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,11 @@ jobs:

- name: Install all dependencies
run: |
curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py
pip install -q cython # needed for installing `pycocotools` in latest config
python ./requirements/adjust-versions.py requirements.txt
python adjust-torch-versions.py requirements.txt
for fpath in `ls requirements/*.txt`; do
python ./requirements/adjust-versions.py $fpath
python adjust-torch-versions.py $fpath
done
pip install --requirement requirements/devel.txt -U \
--find-links $PYTORCH_URL -f $PYPI_CACHE
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ docs: clean
env:
export FREEZE_REQUIREMENTS=1
pip install -e . -U
python ./requirements/adjust-versions.py requirements/image.txt
pip install -r requirements/devel.txt

data:
Expand Down
92 changes: 0 additions & 92 deletions requirements/adjust-versions.py
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions requirements/classification_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@

pandas >=1.4.0, <=2.0.1
netcal >1.0.0, <=1.3.5 # calibration_error
numpy <1.24.0 # because of netcal compatibility with `np.float`
fairlearn # group_fairness