Merge branch 'master' into bugfix/fs_cache

Lightning-AI · Feb 6, 2024 · 183a038 · 183a038
2 parents a9338c1 + 84a6d3f
commit 183a038
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/.azure/gpu-integrations.yml b/.azure/gpu-integrations.yml
@@ -22,8 +22,8 @@ jobs:
           torch-ver: "1.13.1"
           requires: "oldest"
         "torch | 2.x":
-          docker-image: "pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime"
-          torch-ver: "2.1.2"
+          docker-image: "pytorch/pytorch:2.2.0-cuda12.1-cudnn8-runtime"
+          torch-ver: "2.2.0"
     # how long to run the job before automatically cancelling
     timeoutInMinutes: "40"
     # how much time to give 'run always even if cancelled tasks' before stopping them

diff --git a/.azure/gpu-unittests.yml b/.azure/gpu-unittests.yml
@@ -25,9 +25,6 @@ jobs:
           docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda11.8.0-py3.9-torch1.13"
           torch-ver: "1.13.1"
         "PyTorch | 2.X":
-          docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda12.1.1-py3.10-torch2.1"
-          torch-ver: "2.1.2"
-        "PyTorch | RC":
           docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda12.1.1-py3.11-torch2.2"
           torch-ver: "2.2.0"
     # how long to run the job before automatically cancelling
@@ -114,7 +111,8 @@ jobs:
 
       - bash: |
           python -m pytest torchmetrics -s --cov=torchmetrics \
-            --timeout=240 --durations=50
+            --timeout=240 --durations=50 \
+            --reruns 2 --reruns-delay 1
           #  --numprocesses=5 --dist=loadfile
         env:
           DOCTEST_DOWNLOAD_TIMEOUT: "180"

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -33,23 +33,25 @@ jobs:
       matrix:
         os: ["ubuntu-20.04"]
         python-version: ["3.9"]
-        pytorch-version: ["1.10.2", "1.11.0", "1.12.1", "1.13.1", "2.0.1", "2.1.2"]
+        pytorch-version:
+          - "1.10.2"
+          - "1.11.0"
+          - "1.12.1"
+          - "1.13.1"
+          - "2.0.1"
+          - "2.1.2"
+          - "2.2.0"
         include:
           - { os: "ubuntu-22.04", python-version: "3.8", pytorch-version: "1.13.1" }
-          - { os: "ubuntu-22.04", python-version: "3.10", pytorch-version: "1.13.1" }
           - { os: "ubuntu-22.04", python-version: "3.10", pytorch-version: "2.0.1" }
-          - { os: "ubuntu-22.04", python-version: "3.10", pytorch-version: "2.1.2" }
-          - { os: "ubuntu-22.04", python-version: "3.11", pytorch-version: "2.1.2" }
           - { os: "ubuntu-22.04", python-version: "3.10", pytorch-version: "2.2.0" }
           - { os: "ubuntu-22.04", python-version: "3.11", pytorch-version: "2.2.0" }
           - { os: "macOS-12", python-version: "3.8", pytorch-version: "1.13.1" }
-          - { os: "macOS-12", python-version: "3.9", pytorch-version: "1.13.1" }
           - { os: "macOS-12", python-version: "3.10", pytorch-version: "2.0.1" }
-          - { os: "macOS-12", python-version: "3.11", pytorch-version: "2.1.2" }
+          - { os: "macOS-12", python-version: "3.11", pytorch-version: "2.2.0" }
           - { os: "windows-2022", python-version: "3.8", pytorch-version: "1.13.1" }
-          - { os: "windows-2022", python-version: "3.9", pytorch-version: "1.13.1" }
           - { os: "windows-2022", python-version: "3.10", pytorch-version: "2.0.1" }
-          # - { os: "windows-2022", python-version: "3.11", pytorch-version: "2.1.2" }  # TODO
+          - { os: "windows-2022", python-version: "3.11", pytorch-version: "2.2.0" }
     env:
       PYTORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
@@ -91,9 +93,9 @@ jobs:
           pytorch-version: ${{ matrix.pytorch-version }}
           pypi-dir: ${{ env.PYPI_CACHE }}
 
-      - name: Switch to PT test URL
-        if: ${{ matrix.pytorch-version == '2.2.0' }}
-        run: echo 'PYTORCH_URL=https://download.pytorch.org/whl/test/cpu/torch_test.html' >> $GITHUB_ENV
+      #- name: Switch to PT test URL
+      #  if: ${{ matrix.pytorch-version == '2.3.0' }}
+      #  run: echo 'PYTORCH_URL=https://download.pytorch.org/whl/test/cpu/torch_test.html' >> $GITHUB_ENV
       - name: Install pkg
         timeout-minutes: 25
         run: |

diff --git a/requirements/audio.txt b/requirements/audio.txt
@@ -4,5 +4,5 @@
 # this need to be the same as used inside speechmetrics
 pesq @ git+https://github.com/ludlows/python-pesq
 pystoi >=0.3.0, <0.5.0
-torchaudio >=0.10.0
+torchaudio >=0.10.0, <=2.2.0
 gammatone @ https://github.com/detly/gammatone/archive/master.zip#egg=Gammatone
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,6 +4,6 @@
 numpy >1.20.0
 packaging >17.1
 torch >=1.10.0, <=2.0.1
-torch >=1.10.0, <=2.1.2
+torch >=1.10.0, <=2.2.0
 typing-extensions; python_version < '3.9'
 lightning-utilities >=0.8.0, <0.11.0
diff --git a/requirements/detection.txt b/requirements/detection.txt
@@ -1,5 +1,5 @@
 # NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
-torchvision >=0.8, <0.17.0
+torchvision >=0.8, <0.18.0
 pycocotools >2.0.0, <=2.0.7
diff --git a/requirements/image.txt b/requirements/image.txt
@@ -2,5 +2,5 @@
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
 scipy >1.0.0, <1.11.0
-torchvision >=0.8, <0.17.0
+torchvision >=0.8, <0.18.0
 torch-fidelity <=0.4.0  # bumping to allow install version from master, now used in testing
diff --git a/requirements/typing.txt b/requirements/typing.txt
@@ -1,5 +1,5 @@
 mypy ==1.8.0
-torch ==2.1.2
+torch ==2.2.0
 
 types-PyYAML
 types-emoji