Skip to content

Commit

Permalink
bump: Torch 2.5.0 (#2790)
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda authored Oct 21, 2024
1 parent 346bcdc commit 0e090b4
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .azure/gpu-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
torch-ver: "2.0"
requires: "oldest"
"torch | 2.x":
docker-image: "pytorch/pytorch:2.4.0-cuda12.1-cudnn9-runtime"
torch-ver: "2.4"
docker-image: "pytorch/pytorch:2.5.0-cuda12.1-cudnn9-runtime"
torch-ver: "2.5"
# 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
Expand Down
4 changes: 2 additions & 2 deletions .azure/gpu-unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
docker-image: "ubuntu22.04-cuda11.8.0-py3.10-torch2.0"
torch-ver: "2.0"
"PyTorch | 2.X stable":
docker-image: "ubuntu22.04-cuda12.1.1-py3.11-torch2.4"
torch-ver: "2.4"
docker-image: "ubuntu22.04-cuda12.1.1-py3.11-torch2.5"
torch-ver: "2.5"
# how long to run the job before automatically cancelling
timeoutInMinutes: "180"
# how much time to give 'run always even if cancelled tasks' before stopping them
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,22 @@ jobs:
- "2.1.2"
- "2.2.2"
- "2.3.1"
- "2.4.0"
- "2.4.1"
- "2.5.0"
include:
# cover additional python and PT combinations
- { os: "ubuntu-22.04", python-version: "3.10", pytorch-version: "2.0.1" }
- { os: "ubuntu-22.04", python-version: "3.10", pytorch-version: "2.2.2" }
- { os: "ubuntu-22.04", python-version: "3.11", pytorch-version: "2.3.1" }
- { os: "ubuntu-22.04", python-version: "3.12", pytorch-version: "2.5.0" }
# standard mac machine, not the M1
- { os: "macOS-13", python-version: "3.10", pytorch-version: "2.0.1" }
# using the ARM based M1 machine
- { os: "macOS-14", python-version: "3.10", pytorch-version: "2.0.1" }
- { os: "macOS-14", python-version: "3.11", pytorch-version: "2.4.0" }
- { os: "macOS-14", python-version: "3.12", pytorch-version: "2.5.0" }
# some windows
- { os: "windows-2022", python-version: "3.10", pytorch-version: "2.0.1" }
- { os: "windows-2022", python-version: "3.11", pytorch-version: "2.4.0" }
- { os: "windows-2022", python-version: "3.12", pytorch-version: "2.5.0" }
# Future released version
#- { os: "ubuntu-22.04", python-version: "3.11", pytorch-version: "2.5.0" }
#- { os: "macOS-14", python-version: "3.11", pytorch-version: "2.5.0" }
Expand Down
20 changes: 14 additions & 6 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ jobs:
include:
# These are the base images for PL release docker images,
# so include at least all the combinations in release-dockers.yml.
- { python: "3.10", pytorch: "2.2", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.2", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.3", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.4", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.10", pytorch: "2.0.1", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.1.2", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.2.2", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.3.1", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.4.1", cuda: "12.1.1", ubuntu: "22.04" }
- { python: "3.11", pytorch: "2.5.0", cuda: "12.1.1", ubuntu: "22.04" }
# the future version - test or RC version
#- { python: "3.11", pytorch: "2.5", cuda: "12.1.1", ubuntu: "22.04" }
#- { python: "3.11", pytorch: "2.6", cuda: "12.1.1", ubuntu: "22.04" }
steps:
- uses: actions/checkout@v4

Expand All @@ -82,6 +84,12 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: shorten Torch version
run: |
# convert 1.10.2 to 1.10
pt_version=$(echo ${{ matrix.pytorch }} | cut -d. -f1,2)
echo "PT_VERSION=$pt_version" >> $GITHUB_ENV
- name: Build (and Push) runner
uses: docker/build-push-action@v6
with:
Expand All @@ -92,5 +100,5 @@ jobs:
CUDA_VERSION=${{ matrix.cuda }}
file: dockers/ubuntu-cuda/Dockerfile
push: ${{ env.PUSH_DOCKERHUB }}
tags: "pytorchlightning/torchmetrics:ubuntu${{ matrix.ubuntu }}-cuda${{ matrix.cuda }}-py${{ matrix.python }}-torch${{ matrix.pytorch }}"
tags: "pytorchlightning/torchmetrics:ubuntu${{ matrix.ubuntu }}-cuda${{ matrix.cuda }}-py${{ matrix.python }}-torch${{ env.PT_VERSION }}"
timeout-minutes: 55
2 changes: 1 addition & 1 deletion requirements/_integrate.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# contentiously validated integration with these expected ranges

# ToDo: investigate and add validation with 2.0+ on GPU
pytorch-lightning >=1.9.0, <2.5.0
pytorch-lightning >=1.9.0, <2.6.0
2 changes: 1 addition & 1 deletion requirements/audio.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# this need to be the same as used inside speechmetrics
pesq >=0.0.4, <0.0.5
pystoi >=0.4.0, <0.5.0
torchaudio >=2.0.1, <2.5.0
torchaudio >=2.0.1, <2.6.0
gammatone >=1.0.0, <1.1.0
librosa >=0.10.0, <0.11.0
onnxruntime >=1.12.0, <1.20 # installing onnxruntime_gpu-gpu failed on macos
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

numpy >1.20.0, <2.0 # strict, for compatibility reasons
packaging >17.1
torch >=2.0.0, <2.5.0
torch >=2.0.0, <2.6.0
typing-extensions; python_version < '3.9'
lightning-utilities >=0.8.0, <0.12.0
2 changes: 1 addition & 1 deletion requirements/detection.txt
Original file line number Diff line number Diff line change
@@ -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.15.1, <0.20.0
torchvision >=0.15.1, <0.21.0
pycocotools >2.0.0, <2.1.0
2 changes: 1 addition & 1 deletion requirements/image.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.15.0
torchvision >=0.15.1, <0.20.0
torchvision >=0.15.1, <0.21.0
torch-fidelity <=0.4.0 # bumping to allow install version from master, now used in testing
2 changes: 1 addition & 1 deletion requirements/typing.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mypy ==1.11.2
torch ==2.4.1
torch ==2.5.0

types-PyYAML
types-emoji
Expand Down

0 comments on commit 0e090b4

Please sign in to comment.