Skip to content

Commit e40224f

Browse files
BordaBorda
committed
bump: Torch 2.5.0 
1 parent 8ad3e29 commit e40224f

File tree

13 files changed

+44
-22
lines changed

13 files changed

+44
-22
lines changed

‎.azure/gpu-benchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
variables:
4747
DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
4848
container:
49-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.4-cuda12.1.0"
49+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
5050
options: "--gpus=all --shm-size=32g"
5151
strategy:
5252
matrix:

‎.azure/gpu-tests-fabric.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
6161
PACKAGE_NAME: "fabric"
6262
"Lightning | latest":
63-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.4-cuda12.1.0"
63+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
6464
PACKAGE_NAME: "lightning"
6565
workspace:
6666
clean: all

‎.azure/gpu-tests-pytorch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
5454
PACKAGE_NAME: "pytorch"
5555
"Lightning | latest":
56-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.4-cuda12.1.0"
56+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
5757
PACKAGE_NAME: "lightning"
5858
pool: lit-rtx-3090
5959
variables:

‎.github/checkgroup.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,19 @@ subprojects:
2424
- "pl-cpu (macOS-14, lightning, 3.11, 2.2)"
2525
- "pl-cpu (macOS-14, lightning, 3.11, 2.3)"
2626
- "pl-cpu (macOS-14, lightning, 3.12, 2.4)"
27+
- "pl-cpu (macOS-14, lightning, 3.12, 2.5)"
2728
- "pl-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
2829
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
2930
- "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
3031
- "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
31-
- "pl-cpu (ubuntu-20.04, lightning, 3.12, 2.4)"
32+
- "pl-cpu (ubuntu-22.04, lightning, 3.12, 2.4)"
33+
- "pl-cpu (ubuntu-22.04, lightning, 3.12, 2.5)"
3234
- "pl-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
3335
- "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
3436
- "pl-cpu (windows-2022, lightning, 3.11, 2.2)"
3537
- "pl-cpu (windows-2022, lightning, 3.11, 2.3)"
3638
- "pl-cpu (windows-2022, lightning, 3.12, 2.4)"
39+
- "pl-cpu (windows-2022, lightning, 3.12, 2.5)"
3740
- "pl-cpu (macOS-14, pytorch, 3.9, 2.1)"
3841
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 2.1)"
3942
- "pl-cpu (windows-2022, pytorch, 3.9, 2.1)"
@@ -141,15 +144,17 @@ subprojects:
141144
- "!*.md"
142145
- "!**/*.md"
143146
checks:
144-
- "build-cuda (3.11, 2.1, 12.1.0)"
147+
- "build-cuda (3.10, 2.1, 12.1.0)"
145148
- "build-cuda (3.11, 2.2, 12.1.0)"
146149
- "build-cuda (3.11, 2.3, 12.1.0)"
147150
- "build-cuda (3.12, 2.4, 12.1.0)"
151+
- "build-cuda (3.12, 2.5, 12.1.0)"
148152
#- "build-NGC"
149-
- "build-pl (3.11, 2.1, 12.1.0)"
153+
- "build-pl (3.10, 2.1, 12.1.0)"
150154
- "build-pl (3.11, 2.2, 12.1.0)"
151155
- "build-pl (3.11, 2.3, 12.1.0)"
152156
- "build-pl (3.12, 2.4, 12.1.0)"
157+
- "build-pl (3.12, 2.5, 12.1.0)"
153158

154159
# SECTION: lightning_fabric
155160

@@ -171,16 +176,19 @@ subprojects:
171176
- "fabric-cpu (macOS-14, lightning, 3.11, 2.2)"
172177
- "fabric-cpu (macOS-14, lightning, 3.11, 2.3)"
173178
- "fabric-cpu (macOS-14, lightning, 3.12, 2.4)"
179+
- "fabric-cpu (macOS-14, lightning, 3.12, 2.5)"
174180
- "fabric-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
175181
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
176182
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
177183
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
178-
- "fabric-cpu (ubuntu-20.04, lightning, 3.12, 2.4)"
184+
- "fabric-cpu (ubuntu-22.04, lightning, 3.12, 2.4)"
185+
- "fabric-cpu (ubuntu-22.04, lightning, 3.12, 2.5)"
179186
- "fabric-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
180187
- "fabric-cpu (windows-2022, lightning, 3.10, 2.1)"
181188
- "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
182189
- "fabric-cpu (windows-2022, lightning, 3.11, 2.3)"
183190
- "fabric-cpu (windows-2022, lightning, 3.12, 2.4)"
191+
- "fabric-cpu (windows-2022, lightning, 3.12, 2.5)"
184192
- "fabric-cpu (macOS-14, fabric, 3.9, 2.1)"
185193
- "fabric-cpu (ubuntu-20.04, fabric, 3.9, 2.1)"
186194
- "fabric-cpu (windows-2022, fabric, 3.9, 2.1)"

‎.github/workflows/ci-tests-fabric.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,11 @@ jobs:
5050
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5151
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5252
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
53-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
53+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
5454
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
55+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
56+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
57+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
5558
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
5659
- { os: "macOS-12", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
5760
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }

‎.github/workflows/ci-tests-pytorch.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ jobs:
5454
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5555
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5656
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
57-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
57+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
5858
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
59+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
60+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
61+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
5962
# only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
6063
- { os: "macOS-12", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
6164
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }

‎.github/workflows/docker-build.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ jobs:
4343
include:
4444
# We only release one docker image per PyTorch version.
4545
# Make sure the matrix here matches the one below.
46-
- { python_version: "3.11", pytorch_version: "2.1", cuda_version: "12.1.0" }
46+
- { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
4747
- { python_version: "3.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
4848
- { python_version: "3.11", pytorch_version: "2.3", cuda_version: "12.1.0" }
49-
- { python_version: "3.12", pytorch_version: "2.4", cuda_version: "12.1.0" }
49+
- { python_version: "3.11", pytorch_version: "2.4", cuda_version: "12.1.0" }
50+
- { python_version: "3.12", pytorch_version: "2.5", cuda_version: "12.1.0" }
5051
steps:
5152
- uses: actions/checkout@v4
5253
with:
@@ -103,10 +104,11 @@ jobs:
103104
include:
104105
# These are the base images for PL release docker images.
105106
# Make sure the matrix here matches the one above.
106-
- { python_version: "3.11", pytorch_version: "2.1", cuda_version: "12.1.0" }
107+
- { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
107108
- { python_version: "3.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
108109
- { python_version: "3.11", pytorch_version: "2.3", cuda_version: "12.1.0" }
109-
- { python_version: "3.12", pytorch_version: "2.4", cuda_version: "12.1.0" }
110+
- { python_version: "3.11", pytorch_version: "2.4", cuda_version: "12.1.0" }
111+
- { python_version: "3.12", pytorch_version: "2.5", cuda_version: "12.1.0" }
110112
steps:
111113
- uses: actions/checkout@v4
112114
- uses: docker/setup-buildx-action@v3
@@ -115,6 +117,12 @@ jobs:
115117
with:
116118
username: ${{ secrets.DOCKER_USERNAME }}
117119
password: ${{ secrets.DOCKER_PASSWORD }}
120+
121+
- name: shorten Torch version
122+
run: |
123+
# convert 1.10.2 to 1.10
124+
pt_version=$(echo ${{ matrix.pytorch }} | cut -d. -f1,2)
125+
echo "PT_VERSION=$pt_version" >> $GITHUB_ENV
118126
- uses: docker/build-push-action@v6
119127
with:
120128
build-args: |

‎requirements/fabric/base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

4-
torch >=2.1.0, <2.5.0
4+
torch >=2.1.0, <2.6.0
55
fsspec[http] >=2022.5.0, <2024.4.0
66
packaging >=20.0, <=23.1
77
typing-extensions >=4.4.0, <4.10.0

‎requirements/fabric/examples.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

4-
torchvision >=0.16.0, <0.20.0
5-
torchmetrics >=0.10.0, <1.3.0
4+
torchvision >=0.16.0, <0.21.0
5+
torchmetrics >=0.10.0, <1.5.0
66
lightning-utilities >=0.8.0, <0.12.0

‎requirements/fabric/test.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ pytest-rerunfailures ==12.0
77
pytest-random-order ==1.1.0
88
click ==8.1.7
99
tensorboardX >=2.2, <2.7.0 # min version is set by torch.onnx missing attribute
10-
torchmetrics >=0.7.0, <1.3.0 # needed for using fixed compare_version
10+
torchmetrics >=0.7.0, <1.5.0 # needed for using fixed compare_version

0 commit comments

Comments
 (0)