replace local adjustment script with external (#1758)

Lightning-AI · May 9, 2023 · 0bf4dc0 · 0bf4dc0
1 parent 37c75d3
commit 0bf4dc0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 104 deletions.
diff --git a/.azure/gpu-integrations.yml b/.azure/gpu-integrations.yml
@@ -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'

diff --git a/.azure/gpu-unittests.yml b/.azure/gpu-unittests.yml
@@ -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'
 

diff --git a/.github/actions/pull-caches/action.yml b/.github/actions/pull-caches/action.yml
@@ -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

diff --git a/.github/workflows/ci-integrate.yml b/.github/workflows/ci-integrate.yml
@@ -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

diff --git a/.github/workflows/ci-tests-full.yml b/.github/workflows/ci-tests-full.yml
@@ -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

diff --git a/Makefile b/Makefile
@@ -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:

diff --git a/requirements/adjust-versions.py b/requirements/adjust-versions.py
diff --git a/requirements/classification_test.txt b/requirements/classification_test.txt
@@ -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