Skip to content

Commit f14d0d6

Browse files
t-vit-vi
authored
Merge branch 'master' into master
2 parents cc90ac9 + 7038b8d commit f14d0d6

31 files changed

+134
-105
lines changed

‎.azure/gpu-benchmarks.yml

+1-1
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

+1-1
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

+1-1
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

+36-28
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,26 @@ subprojects:
2121
checks:
2222
- "pl-cpu (macOS-13, lightning, 3.9, 2.1, oldest)"
2323
- "pl-cpu (macOS-14, lightning, 3.10, 2.1)"
24-
- "pl-cpu (macOS-14, lightning, 3.11, 2.2)"
24+
- "pl-cpu (macOS-14, lightning, 3.11, 2.2.2)"
2525
- "pl-cpu (macOS-14, lightning, 3.11, 2.3)"
26-
- "pl-cpu (macOS-14, lightning, 3.12, 2.4)"
26+
- "pl-cpu (macOS-14, lightning, 3.12, 2.4.1)"
27+
- "pl-cpu (macOS-14, lightning, 3.12, 2.5.1)"
2728
- "pl-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
2829
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
29-
- "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
30+
- "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.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.1)"
33+
- "pl-cpu (ubuntu-22.04, lightning, 3.12, 2.5.1)"
3234
- "pl-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
3335
- "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
34-
- "pl-cpu (windows-2022, lightning, 3.11, 2.2)"
36+
- "pl-cpu (windows-2022, lightning, 3.11, 2.2.2)"
3537
- "pl-cpu (windows-2022, lightning, 3.11, 2.3)"
36-
- "pl-cpu (windows-2022, lightning, 3.12, 2.4)"
38+
- "pl-cpu (windows-2022, lightning, 3.12, 2.4.1)"
39+
- "pl-cpu (windows-2022, lightning, 3.12, 2.5.1)"
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)"
40-
- "pl-cpu (macOS-12, pytorch, 3.10, 2.1)"
43+
- "pl-cpu (macOS-13, pytorch, 3.10, 2.1)"
4144
- "pl-cpu (ubuntu-22.04, pytorch, 3.10, 2.1)"
4245
- "pl-cpu (windows-2022, pytorch, 3.10, 2.1)"
4346

@@ -141,15 +144,17 @@ subprojects:
141144
- "!*.md"
142145
- "!**/*.md"
143146
checks:
144-
- "build-cuda (3.11, 2.1, 12.1.0)"
145-
- "build-cuda (3.11, 2.2, 12.1.0)"
146-
- "build-cuda (3.11, 2.3, 12.1.0)"
147-
- "build-cuda (3.12, 2.4, 12.1.0)"
147+
- "build-cuda (3.10, 2.1.2, 12.1.0)"
148+
- "build-cuda (3.11, 2.2.2, 12.1.0)"
149+
- "build-cuda (3.11, 2.3.1, 12.1.0)"
150+
- "build-cuda (3.11, 2.4.1, 12.1.0)"
151+
- "build-cuda (3.12, 2.5.1, 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)"
152-
- "build-pl (3.12, 2.4, 12.1.0)"
156+
- "build-pl (3.11, 2.4, 12.1.0)"
157+
- "build-pl (3.12, 2.5, 12.1.0)"
153158

154159
# SECTION: lightning_fabric
155160

@@ -168,23 +173,26 @@ subprojects:
168173
checks:
169174
- "fabric-cpu (macOS-13, lightning, 3.9, 2.1, oldest)"
170175
- "fabric-cpu (macOS-14, lightning, 3.10, 2.1)"
171-
- "fabric-cpu (macOS-14, lightning, 3.11, 2.2)"
176+
- "fabric-cpu (macOS-14, lightning, 3.11, 2.2.2)"
172177
- "fabric-cpu (macOS-14, lightning, 3.11, 2.3)"
173-
- "fabric-cpu (macOS-14, lightning, 3.12, 2.4)"
178+
- "fabric-cpu (macOS-14, lightning, 3.12, 2.4.1)"
179+
- "fabric-cpu (macOS-14, lightning, 3.12, 2.5.1)"
174180
- "fabric-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
175181
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
176-
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
182+
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.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.1)"
185+
- "fabric-cpu (ubuntu-22.04, lightning, 3.12, 2.5.1)"
179186
- "fabric-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
180187
- "fabric-cpu (windows-2022, lightning, 3.10, 2.1)"
181-
- "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
188+
- "fabric-cpu (windows-2022, lightning, 3.11, 2.2.2)"
182189
- "fabric-cpu (windows-2022, lightning, 3.11, 2.3)"
183-
- "fabric-cpu (windows-2022, lightning, 3.12, 2.4)"
190+
- "fabric-cpu (windows-2022, lightning, 3.12, 2.4.1)"
191+
- "fabric-cpu (windows-2022, lightning, 3.12, 2.5.1)"
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)"
187-
- "fabric-cpu (macOS-12, fabric, 3.10, 2.1)"
195+
- "fabric-cpu (macOS-13, fabric, 3.10, 2.1)"
188196
- "fabric-cpu (ubuntu-22.04, fabric, 3.10, 2.1)"
189197
- "fabric-cpu (windows-2022, fabric, 3.10, 2.1)"
190198

@@ -258,14 +266,14 @@ subprojects:
258266
- "install-pkg (ubuntu-22.04, lightning, 3.11)"
259267
- "install-pkg (ubuntu-22.04, notset, 3.9)"
260268
- "install-pkg (ubuntu-22.04, notset, 3.11)"
261-
- "install-pkg (macOS-12, fabric, 3.9)"
262-
- "install-pkg (macOS-12, fabric, 3.11)"
263-
- "install-pkg (macOS-12, pytorch, 3.9)"
264-
- "install-pkg (macOS-12, pytorch, 3.11)"
265-
- "install-pkg (macOS-12, lightning, 3.9)"
266-
- "install-pkg (macOS-12, lightning, 3.11)"
267-
- "install-pkg (macOS-12, notset, 3.9)"
268-
- "install-pkg (macOS-12, notset, 3.11)"
269+
- "install-pkg (macOS-13, fabric, 3.9)"
270+
- "install-pkg (macOS-13, fabric, 3.11)"
271+
- "install-pkg (macOS-13, pytorch, 3.9)"
272+
- "install-pkg (macOS-13, pytorch, 3.11)"
273+
- "install-pkg (macOS-13, lightning, 3.9)"
274+
- "install-pkg (macOS-13, lightning, 3.11)"
275+
- "install-pkg (macOS-13, notset, 3.9)"
276+
- "install-pkg (macOS-13, notset, 3.11)"
269277
- "install-pkg (windows-2022, fabric, 3.9)"
270278
- "install-pkg (windows-2022, fabric, 3.11)"
271279
- "install-pkg (windows-2022, pytorch, 3.9)"

‎.github/workflows/ci-pkg-install.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
matrix:
45-
os: ["ubuntu-22.04", "macOS-12", "windows-2022"]
45+
os: ["ubuntu-22.04", "macOS-13", "windows-2022"]
4646
pkg-name: ["fabric", "pytorch", "lightning", "notset"]
4747
python-version: ["3.9", "3.11"]
4848
steps:

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

+10-7
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,20 @@ jobs:
4343
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
4444
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
4545
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
46-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
47-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
48-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
46+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
47+
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
48+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
4949
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
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" }
52-
- { 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" }
54-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
52+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
53+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
54+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
55+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
56+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
57+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
5558
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
56-
- { os: "macOS-12", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
59+
- { os: "macOS-13", 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" }
5861
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
5962
# "oldest" versions tests, only on minimum Python

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

+10-7
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,20 @@ jobs:
4747
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
4848
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
4949
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
50-
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
51-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
52-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
50+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
51+
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
52+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
5353
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
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" }
56-
- { 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" }
58-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4" }
56+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
57+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
58+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.4.1" }
59+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
60+
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
61+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5.1" }
5962
# only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
60-
- { os: "macOS-12", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
63+
- { os: "macOS-13", 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" }
6265
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
6366
# "oldest" versions tests, only on minimum Python

‎.github/workflows/docker-build.yml

+15-7
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.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
108-
- { 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" }
107+
- { python_version: "3.10", pytorch_version: "2.1.2", cuda_version: "12.1.0" }
108+
- { python_version: "3.11", pytorch_version: "2.2.2", cuda_version: "12.1.0" }
109+
- { python_version: "3.11", pytorch_version: "2.3.1", cuda_version: "12.1.0" }
110+
- { python_version: "3.11", pytorch_version: "2.4.1", cuda_version: "12.1.0" }
111+
- { python_version: "3.12", pytorch_version: "2.5.1", 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_version }} | cut -d. -f1,2)
125+
echo "PT_VERSION=$pt_version" >> $GITHUB_ENV
118126
- uses: docker/build-push-action@v6
119127
with:
120128
build-args: |
@@ -123,7 +131,7 @@ jobs:
123131
CUDA_VERSION=${{ matrix.cuda_version }}
124132
file: dockers/base-cuda/Dockerfile
125133
push: ${{ env.PUSH_NIGHTLY }}
126-
tags: "pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}-cuda${{ matrix.cuda_version }}"
134+
tags: "pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ env.PT_VERSION }}-cuda${{ matrix.cuda_version }}"
127135
timeout-minutes: 95
128136
- uses: ravsamhq/notify-slack-action@v2
129137
if: failure() && env.PUSH_NIGHTLY == 'true'

‎_notebooks

‎docs/source-pytorch/levels/expert.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Customize and extend Lightning for things like custom hardware or distributed st
4141
:header: Level 24: Add a new accelerator or Strategy
4242
:description: Integrate a new accelerator or distributed strategy.
4343
:col_css: col-md-6
44-
:button_link: expert_level_27.html
44+
:button_link: expert_level_24.html
4545
:height: 150
4646
:tag: expert
4747

‎docs/source-pytorch/levels/expert_level_25.rst ‎docs/source-pytorch/levels/expert_level_24.rst

File renamed without changes.

‎requirements/fabric/base.txt

+1-1
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

+2-2
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

+1-1
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

‎requirements/pytorch/base.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
tqdm >=4.57.0, <4.67.0
66
PyYAML >=5.4, <6.1.0
77
fsspec[http] >=2022.5.0, <2024.4.0
8-
torchmetrics >=0.7.0, <1.3.0 # needed for using fixed compare_version
8+
torchmetrics >=0.7.0, <1.5.0 # needed for using fixed compare_version
99
packaging >=20.0, <=23.1
1010
typing-extensions >=4.4.0, <4.10.0
1111
lightning-utilities >=0.10.0, <0.12.0

‎requirements/pytorch/examples.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

44
requests <2.32.0
5-
torchvision >=0.16.0, <0.20.0
5+
torchvision >=0.16.0, <0.21.0
66
ipython[all] <8.15.0
7-
torchmetrics >=0.10.0, <1.3.0
7+
torchmetrics >=0.10.0, <1.5.0
88
lightning-utilities >=0.8.0, <0.12.0

‎requirements/typing.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mypy==1.11.0
2-
torch==2.4.1
2+
torch==2.5.1
33

44
types-Markdown
55
types-PyYAML

‎src/lightning/fabric/__init__.py

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import logging
44
import os
5+
import sys
56

67
from lightning_utilities.core.imports import package_available
78

@@ -26,6 +27,10 @@
2627
# https://github.com/pytorch/pytorch/issues/83973
2728
os.environ["PYTORCH_NVML_BASED_CUDA_CHECK"] = "1"
2829

30+
# see https://github.com/pytorch/pytorch/issues/139990
31+
if sys.platform == "win32":
32+
os.environ["USE_LIBUV"] = "0"
33+
2934

3035
from lightning.fabric.fabric import Fabric # noqa: E402
3136
from lightning.fabric.utilities.seed import seed_everything # noqa: E402

‎src/lightning/pytorch/core/module.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ def log(
531531
logger=logger,
532532
on_step=on_step,
533533
on_epoch=on_epoch,
534-
reduce_fx=reduce_fx, # type: ignore[arg-type]
534+
reduce_fx=reduce_fx,
535535
enable_graph=enable_graph,
536536
add_dataloader_idx=add_dataloader_idx,
537537
batch_size=batch_size,
@@ -1405,7 +1405,9 @@ def forward(self, x):
14051405
input_sample = self._apply_batch_transfer_handler(input_sample)
14061406

14071407
file_path = str(file_path) if isinstance(file_path, Path) else file_path
1408-
torch.onnx.export(self, input_sample, file_path, **kwargs)
1408+
# PyTorch (2.5) declares file_path to be str | PathLike[Any] | None, but
1409+
# BytesIO does work, too.
1410+
torch.onnx.export(self, input_sample, file_path, **kwargs) # type: ignore
14091411
self.train(mode)
14101412

14111413
@torch.no_grad()

0 commit comments

Comments
 (0)