Skip to content

Commit 3585e05

Browse files
ioangatopioangatop
authored
Merge branch 'master' into ioannis@18861-CSVLogger-fails-on-remote-fs
2 parents c7127c8 + fd86ea7 commit 3585e05

File tree

182 files changed

+7004
-1407
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+7004
-1407
lines changed

‎.azure/gpu-benchmarks.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ jobs:
4646
variables:
4747
DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
4848
container:
49-
# TODO: Upgrade to Python 3.11
50-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0"
49+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
5150
options: "--gpus=all --shm-size=32g"
5251
strategy:
5352
matrix:

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,11 @@ jobs:
5656
options: "--gpus=all --shm-size=2gb -v /var/tmp:/var/tmp"
5757
strategy:
5858
matrix:
59-
# TODO: Upgrade to Python 3.11
6059
"Fabric | latest":
61-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0"
60+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
6261
PACKAGE_NAME: "fabric"
6362
"Lightning | latest":
64-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0"
63+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
6564
PACKAGE_NAME: "lightning"
6665
workspace:
6766
clean: all

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ jobs:
4848
cancelTimeoutInMinutes: "2"
4949
strategy:
5050
matrix:
51-
# TODO: Upgrade to Python 3.11
5251
"PyTorch | latest":
53-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0"
52+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
5453
PACKAGE_NAME: "pytorch"
5554
"Lightning | latest":
56-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0"
55+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
5756
PACKAGE_NAME: "lightning"
5857
pool: lit-rtx-3090
5958
variables:

‎.github/CODEOWNERS‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,36 @@
55
# the repo. Unless a later match takes precedence,
66
# @global-owner1 and @global-owner2 will be requested for
77
# review when someone opens a pull request.
8-
* @lantiga @borda @tchaton @awaelchli
8+
* @lantiga @borda @tchaton @awaelchli @justusschock
99

1010
# CI/CD and configs
11-
/.actions/ @borda @carmocca @ethanwharris @justusschock
12-
/.github/ @borda @carmocca @ethanwharris @justusschock
13-
/.azure/ @borda @carmocca @ethanwharris @justusschock
11+
/.actions/ @borda @ethanwharris @justusschock
12+
/.github/ @borda @ethanwharris @justusschock
13+
/.azure/ @borda @ethanwharris @justusschock
1414
/.azure/app-cloud-e2e.yml @awaelchli @ethanwharris @lantiga
15-
/dockers/ @borda @carmocca @ethanwharris @justusschock
16-
*.yml @borda @carmocca @ethanwharris @justusschock
15+
/dockers/ @borda @ethanwharris @justusschock
16+
*.yml @borda @ethanwharris @justusschock
1717

1818
# Docs
19-
/docs/ @edenlightning @lantiga @borda @awaelchli
20-
/docs/*/conf.py @borda @awaelchli @carmocca
21-
/.github/*.md @edenlightning @williamfalcon @lantiga @borda
22-
/.github/ISSUE_TEMPLATE/ @edenlightning @borda @tchaton @awaelchli
23-
/docs/source-fabric/conf.py @borda @awaelchli @carmocca
24-
/docs/source-fabric/index.rst @awaelchli @lantiga @carmocca
25-
/docs/source-pytorch/conf.py @borda @awaelchli @carmocca
19+
/docs/ @lantiga @borda @awaelchli
20+
/docs/*/conf.py @borda @awaelchli
21+
/.github/*.md @williamfalcon @lantiga @borda
22+
/.github/ISSUE_TEMPLATE/ @borda @tchaton @awaelchli
23+
/docs/source-fabric/conf.py @borda @awaelchli
24+
/docs/source-fabric/index.rst @awaelchli @lantiga
25+
/docs/source-pytorch/conf.py @borda @awaelchli
2626
/docs/source-pytorch/index.rst @williamfalcon @lantiga
2727
/docs/source-pytorch/levels @williamfalcon @lantiga
28-
/docs/source-app/ @williamfalcon @lantiga @tchaton @awaelchli
29-
/docs/source-app/index.rst @williamfalcon @lantiga
30-
/docs/source-app/expertise_levels @williamfalcon @lantiga
28+
/docs/source-app/ @williamfalcon @lantiga @tchaton
3129

3230
# PyTorch Lightning
33-
/src/lightning/pytorch @williamfalcon @awaelchli @carmocca @justusschock
34-
/src/pytorch_lightning @williamfalcon @awaelchli @carmocca @justusschock
35-
/tests/tests_pytorch @awaelchli @carmocca @justusschock @borda
36-
37-
# Core APIs
38-
/src/lightning/pytorch/callbacks/callback.py @williamfalcon @awaelchli @carmocca
39-
/src/lightning/pytorch/core/datamodule.py @williamFalcon @awaelchli @carmocca
40-
/src/lightning/pytorch/trainer/trainer.py @williamfalcon @tchaton @awaelchli @carmocca
41-
/src/lightning/pytorch/core/hooks.py @williamfalcon @tchaton @awaelchli @carmocca
42-
/src/lightning/pytorch/core/module.py @williamfalcon @tchaton @awaelchli @carmocca
31+
/src/lightning/pytorch @lantiga @borda @tchaton @awaelchli @justusschock
4332

4433
# Lightning Data
45-
/src/lightning/data/ @tchaton
34+
/src/lightning/data/ @tchaton @lantiga
4635

4736
# Lightning Fabric
48-
/src/lightning/fabric @awaelchli @carmocca @justusschock
49-
/src/lightning_fabric @awaelchli @carmocca @justusschock
50-
/tests/tests_fabric @awaelchli @carmocca @justusschock
37+
/src/lightning/fabric @lantiga @borda @tchaton @awaelchli @justusschock
5138

5239
# Lightning App
5340
/src/lightning/app @tchaton @lantiga @awaelchli @ethanwharris
@@ -59,8 +46,8 @@
5946
/.github/CODEOWNERS @williamfalcon
6047
/SECURITY.md @williamfalcon @lantiga
6148
/README.md @williamfalcon @lantiga
62-
/setup.py @williamfalcon @borda @carmocca
63-
/src/pytorch_lightning/__about__.py @williamfalcon @borda @carmocca
49+
/setup.py @williamfalcon @borda
50+
/src/pytorch_lightning/__about__.py @williamfalcon @borda
6451
/src/lightning_app/__about__.py @williamfalcon @lantiga @borda
6552
/src/lightning_fabric/__about__.py @williamfalcon @borda @awaelchli
66-
/src/*/__setup__.py @borda @carmocca @justusschock
53+
/src/*/__setup__.py @borda @justusschock

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ To build the documentation locally, simply execute the following commands from p
121121

122122
All added or edited code shall be the own original work of the particular contributor.
123123
If you use some third-party implementation, all such blocks/functions/modules shall be properly referred and if possible also agreed by code's author. For example - `This code is inspired from http://...`.
124-
In case you adding new dependencies, make sure that they are compatible with the actual PyTorch Lightning license (ie. dependencies should be _at least_ as permissive as the PyTorch Lightning license).
124+
In case you are adding new dependencies, make sure that they are compatible with the actual PyTorch Lightning license (i.e. dependencies should be _at least_ as permissive as the PyTorch Lightning license).
125125

126126
### Coding Style
127127

128-
1. Use f-strings for output formation (except logging when we stay with lazy `logging.info("Hello %s!", name)`.
128+
1. Use f-strings for output formation (except logging when we stay with lazy `logging.info("Hello %s!", name)`).
129129
1. You can use [pre-commit](https://pre-commit.com/) to make sure your code style is correct.
130130

131131
### Documentation
@@ -234,9 +234,9 @@ Here are tutorials:
234234

235235
Here is the process to create a new test
236236

237-
- 0. Optional: Follow tutorials !
238-
- 1. Find a file in tests/ which match what you want to test. If none, create one.
239-
- 2. Use this template to get started !
237+
- 0. Optional: Follow tutorials!
238+
- 1. Find a file in tests/ which matches what you want to test. If none, create one.
239+
- 2. Use this template to get started!
240240
- 3. Use **BoringModel and derivates to test out your code**.
241241

242242
```python

‎.github/checkgroup.yml‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,24 @@ subprojects:
1919
- "!*.md"
2020
- "!**/*.md"
2121
checks:
22-
- "pl-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
23-
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
22+
- "pl-cpu (macOS-11, lightning, 3.8, 2.0, oldest)"
23+
- "pl-cpu (macOS-11, lightning, 3.10, 2.0)"
2424
- "pl-cpu (macOS-11, lightning, 3.10, 2.1)"
2525
- "pl-cpu (macOS-11, lightning, 3.10, 2.2)"
26-
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
27-
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
26+
- "pl-cpu (macOS-14, lightning, 3.10, 2.3)"
27+
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)"
28+
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
2829
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
2930
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.2)"
30-
- "pl-cpu (windows-2022, lightning, 3.8, 1.13, oldest)"
31-
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
31+
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.3)"
32+
- "pl-cpu (windows-2022, lightning, 3.8, 2.0, oldest)"
33+
- "pl-cpu (windows-2022, lightning, 3.10, 2.0)"
3234
- "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
3335
- "pl-cpu (windows-2022, lightning, 3.10, 2.2)"
34-
- "pl-cpu (macOS-11, pytorch, 3.8, 1.13)"
35-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13)"
36-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13)"
36+
- "pl-cpu (windows-2022, lightning, 3.10, 2.3)"
37+
- "pl-cpu (macOS-11, pytorch, 3.8, 2.0)"
38+
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 2.0)"
39+
- "pl-cpu (windows-2022, pytorch, 3.8, 2.0)"
3740
- "pl-cpu (macOS-12, pytorch, 3.11, 2.0)"
3841
- "pl-cpu (macOS-12, pytorch, 3.11, 2.1)"
3942
- "pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0)"
@@ -140,15 +143,17 @@ subprojects:
140143
- "!*.md"
141144
- "!**/*.md"
142145
checks:
143-
- "build-cuda (3.9, 1.13, 11.8.0)"
144-
- "build-cuda (3.9, 1.13, 12.0.1)"
145146
- "build-cuda (3.10, 2.0, 11.8.0)"
146147
- "build-cuda (3.10, 2.1, 12.1.0)"
148+
- "build-cuda (3.10, 2.2, 12.1.0)"
149+
- "build-cuda (3.11, 2.1, 12.1.0)"
150+
- "build-cuda (3.11, 2.2, 12.1.0)"
147151
#- "build-NGC"
148-
- "build-pl (3.9, 1.13, 11.8.0)"
149-
- "build-pl (3.9, 1.13, 12.0.1)"
150152
- "build-pl (3.10, 2.0, 11.8.0)"
151153
- "build-pl (3.10, 2.1, 12.1.0)"
154+
- "build-pl (3.10, 2.2, 12.1.0)"
155+
- "build-pl (3.11, 2.1, 12.1.0)"
156+
- "build-pl (3.11, 2.2, 12.1.0)"
152157

153158
# SECTION: lightning_fabric
154159

@@ -165,21 +170,24 @@ subprojects:
165170
- "!*.md"
166171
- "!**/*.md"
167172
checks:
168-
- "fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
169-
- "fabric-cpu (macOS-11, lightning, 3.10, 1.13)"
173+
- "fabric-cpu (macOS-11, lightning, 3.8, 2.0, oldest)"
174+
- "fabric-cpu (macOS-11, lightning, 3.10, 2.0)"
170175
- "fabric-cpu (macOS-11, lightning, 3.11, 2.1)"
171176
- "fabric-cpu (macOS-11, lightning, 3.11, 2.2)"
172-
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
173-
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
177+
- "fabric-cpu (macOS-14, lightning, 3.10, 2.3)"
178+
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)"
179+
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
174180
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)"
175181
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
176-
- "fabric-cpu (windows-2022, lightning, 3.8, 1.13, oldest)"
177-
- "fabric-cpu (windows-2022, lightning, 3.10, 1.13)"
182+
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
183+
- "fabric-cpu (windows-2022, lightning, 3.8, 2.0, oldest)"
184+
- "fabric-cpu (windows-2022, lightning, 3.10, 2.0)"
178185
- "fabric-cpu (windows-2022, lightning, 3.11, 2.1)"
179186
- "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
180-
- "fabric-cpu (macOS-11, fabric, 3.8, 1.13)"
181-
- "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13)"
182-
- "fabric-cpu (windows-2022, fabric, 3.8, 1.13)"
187+
- "fabric-cpu (windows-2022, lightning, 3.11, 2.3)"
188+
- "fabric-cpu (macOS-11, fabric, 3.8, 2.0)"
189+
- "fabric-cpu (ubuntu-20.04, fabric, 3.8, 2.0)"
190+
- "fabric-cpu (windows-2022, fabric, 3.8, 2.0)"
183191
- "fabric-cpu (macOS-12, fabric, 3.11, 2.0)"
184192
- "fabric-cpu (macOS-12, fabric, 3.11, 2.1)"
185193
- "fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0)"

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,19 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
include:
42-
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
43-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
44-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
42+
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
43+
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
44+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
4545
# only run PyTorch latest
4646
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" }
4747
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" }
4848
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" }
4949
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
5050
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
5151
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" }
52+
- { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.3" }
53+
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
54+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
5255
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
5356
- { os: "macOS-12", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0" }
5457
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0" }
@@ -57,38 +60,34 @@ jobs:
5760
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
5861
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
5962
# "oldest" versions tests, only on minimum Python
60-
- {
61-
os: "macOS-11",
62-
pkg-name: "lightning",
63-
python-version: "3.8",
64-
pytorch-version: "1.13",
65-
requires: "oldest",
66-
}
63+
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
6764
- {
6865
os: "ubuntu-20.04",
6966
pkg-name: "lightning",
7067
python-version: "3.8",
71-
pytorch-version: "1.13",
68+
pytorch-version: "2.0",
7269
requires: "oldest",
7370
}
7471
- {
7572
os: "windows-2022",
7673
pkg-name: "lightning",
7774
python-version: "3.8",
78-
pytorch-version: "1.13",
75+
pytorch-version: "2.0",
7976
requires: "oldest",
8077
}
8178
# "fabric" installs the standalone package
82-
- { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
83-
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
84-
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
79+
- { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
80+
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
81+
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
8582
timeout-minutes: 25 # because of building grpcio on Mac
8683
env:
8784
PACKAGE_NAME: ${{ matrix.pkg-name }}
8885
FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
8986
PYPI_CACHE_DIR: "_pip-wheels"
9087
TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
9188
TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch_test.html"
89+
# TODO: Remove this - Enable running MPS tests on this platform
90+
DISABLE_MPS: ${{ matrix.os == 'macOS-14' && '1' || '0' }}
9291
steps:
9392
- uses: actions/checkout@v4
9493

@@ -125,7 +124,7 @@ jobs:
125124
- name: Env. variables
126125
run: |
127126
# Switch PyTorch URL
128-
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.2' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
127+
python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.3' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
129128
# Switch coverage scope
130129
python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'lightning_fabric'))" >> $GITHUB_ENV
131130
# if you install mono-package set dependency only for this subpackage

0 commit comments

Comments
 (0)