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

bump: Torch 2.5.0 #2790

Merged
merged 12 commits into from
Oct 21, 2024
Merged

bump: Torch 2.5.0 #2790

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
325062a
bump: Torch `2.5.0`
Borda Oct 18, 2024
167132f
push
Borda Oct 18, 2024
d65f84c
Revert "push"
Borda Oct 18, 2024
d292204
shorten
Borda Oct 18, 2024
e64a268
Apply suggestions from code review
Borda Oct 18, 2024
74538ac
others
Borda Oct 18, 2024
9645658
Merge branch 'bump/PT-2.5' of https://github.com/Lightning-AI/torchme…
Borda Oct 18, 2024
8a6ef98
py
Borda Oct 19, 2024
7440aaa
py3.11
Borda Oct 20, 2024
fc4f987
use
Borda Oct 20, 2024
43d2187
Apply suggestions from code review
Borda Oct 20, 2024
d77942c
Merge branch 'master' into bump/PT-2.5
Borda Oct 21, 2024
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
4 changes: 2 additions & 2 deletions .azure/gpu-integrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
torch-ver: "1.13"
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
docker-image: "ubuntu22.04-cuda11.8.0-py3.9-torch1.13"
torch-ver: "1.13"
"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
6 changes: 3 additions & 3 deletions .github/workflows/ci-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- "2.1.2"
- "2.2.2"
- "2.3.1"
- "2.4.0"
- "2.5.0"
Borda marked this conversation as resolved.
Show resolved Hide resolved
include:
# cover additional python and PT combinations
- { os: "ubuntu-22.04", python-version: "3.8", pytorch-version: "1.13.1" }
Expand All @@ -54,11 +54,11 @@ jobs:
- { 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.11", pytorch-version: "2.5.0" }
# some windows
- { os: "windows-2022", python-version: "3.8", 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.4.0" }
- { os: "windows-2022", python-version: "3.11", 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
23 changes: 15 additions & 8 deletions .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,16 @@ 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.9", pytorch: "1.10", cuda: "11.3.1", ubuntu: "20.04" }
- { python: "3.9", pytorch: "1.10.2", cuda: "11.3.1", ubuntu: "20.04" }
#- { python: "3.9", pytorch: "1.11", cuda: "11.8.0", ubuntu: "22.04" }
- { python: "3.9", pytorch: "1.13", cuda: "11.8.0", ubuntu: "22.04" }
- { 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.9", pytorch: "1.13.1", cuda: "11.8.0", ubuntu: "22.04" }
- { python: "3.10", pytorch: "2.2.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 @@ -85,6 +86,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 @@ -95,5 +102,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/typing.txt
View file
Open in desktop
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
Loading