Skip to content

Commit dc4191f

Browse files
BordaBorda
committed
Merge branch 'master' into ci/drop-1.9
2 parents bc4e027 + 3247054 commit dc4191f

File tree

142 files changed

+2897
-1029
lines changed

Some content is hidden

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

142 files changed

+2897
-1029
lines changed

‎.azure/app-cloud-e2e.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ jobs:
7373
name: "payload"
7474
'App: commands_and_api':
7575
name: "commands_and_api"
76-
# 'App: quick_start': # TODO: Failed during installation
77-
# name: "quick_start"
76+
'App: quick_start':
77+
name: "quick_start"
7878
timeoutInMinutes: "20"
7979
cancelTimeoutInMinutes: "2"
8080
# values: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#workspace
@@ -94,15 +94,6 @@ jobs:
9494
pip --version
9595
displayName: 'Info'
9696
97-
- task: Cache@2
98-
condition: ne(variables['name'], 'quick_start')
99-
inputs:
100-
key: 'pip | "$(name)" | requirements/app/base.txt'
101-
restoreKeys: |
102-
pip | "$(Agent.OS)"
103-
path: $(pip_cache_dir)
104-
displayName: Cache pip
105-
10697
# TODO: we are testing it as `lightning`, so add also version for `lightning_app`
10798
- bash: git restore . && python -m pip install -e . -r requirements/app/test.txt -r requirements/app/ui.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
10899
displayName: 'Install Lightning & dependencies'
@@ -112,6 +103,16 @@ jobs:
112103
python -m playwright install # --with-deps
113104
displayName: 'Install Playwright system dependencies'
114105
106+
# The magic happens here it doesn't need to install the quick start dependencies.
107+
# This test is very important to test the main user story of lightning app.
108+
# It also e2e tests running on cloud without installing dependencies.
109+
- bash: |
110+
rm -rf examples/lightning-quick-start || true
111+
git clone https://github.com/Lightning-AI/lightning-quick-start examples/lightning-quick-start
112+
condition: eq(variables['name'], 'quick_start')
113+
displayName: 'Clone Quick start Repo'
114+
115+
115116
# - bash: |
116117
# rm -rf examples/app_template_jupyterlab || true
117118
# git clone https://github.com/Lightning-AI/LAI-lightning-template-jupyterlab-App examples/app_template_jupyterlab
@@ -125,10 +126,6 @@ jobs:
125126
condition: eq(variables['name'], 'template_react_ui')
126127
displayName: 'Clone Template React UI Repo'
127128
128-
- bash: python -m lightning install app lightning/quick-start -y
129-
condition: eq(variables['name'], 'quick_start')
130-
displayName: 'Install Quick Start'
131-
132129
- bash: python -m pip install -q -r .actions/requirements.txt
133130
displayName: 'Install assistant dependencies'
134131

‎.github/CODEOWNERS

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
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-
* @williamfalcon @borda @tchaton @awaelchli @kaushikb11 @rohitgr7
8+
* @williamfalcon @borda @tchaton @awaelchli
99

1010
# CI/CD and configs
11-
/.github/ @borda @carmocca @akihironitta @otaj
12-
/.azure/ @borda @carmocca @akihironitta @otaj
13-
/dockers/ @borda @carmocca @akihironitta @otaj
14-
*.yml @borda @carmocca @akihironitta @otaj
11+
/.github/ @borda @carmocca @akihironitta
12+
/.azure/ @borda @carmocca @akihironitta
13+
/dockers/ @borda @carmocca @akihironitta
14+
*.yml @borda @carmocca @akihironitta
1515

1616
# Docs
17-
/docs/ @edenlightning @tchaton @borda @awaelchli @RobertLaurella @rohitgr7
17+
/docs/ @edenlightning @tchaton @borda @awaelchli @RobertLaurella
1818
/.github/*.md @edenlightning @williamfalcon @borda
1919
/.github/ISSUE_TEMPLATE/ @edenlightning @borda @tchaton @awaelchli
2020
/docs/source-pytorch/conf.py @borda @awaelchli @carmocca
@@ -27,26 +27,8 @@
2727
/docs/source-app/expertise_levels @williamfalcon @RobertLaurella
2828

2929
# PyTorch Lightning
30-
/src/pytorch_lightning @awaelchli @carmocca @rohitgr7 @otaj @justusschock
31-
/src/pytorch_lightning/accelerators @awaelchli @carmocca @justusschock @kaushikb11
32-
/src/pytorch_lightning/callbacks @borda @awaelchli @carmocca @justusschock
33-
/src/pytorch_lightning/core @borda @carmocca @justusschock
34-
/src/pytorch_lightning/distributed @awaelchli @carmocca @justusschock
35-
/src/pytorch_lightning/lite @awaelchli @carmocca @justusschock # remove in 1.10
36-
/src/pytorch_lightning/loggers @borda @awaelchli @carmocca
37-
/src/pytorch_lightning/loggers/wandb.py @borisdayma @awaelchli @otaj @rohitgr7
38-
/src/pytorch_lightning/loggers/neptune.py @shnela @HubertJaworski @pkasprzyk @pitercl @Raalsky @aniezurawski @kamil-kaczmarek
39-
/src/pytorch_lightning/loops @awaelchli @justusschock @carmocca
40-
/src/pytorch_lightning/plugins @awaelchli @carmocca @justusschock
41-
/src/pytorch_lightning/profilers @tchaton @borda @carmocca
42-
/src/pytorch_lightning/profilers/pytorch.py @nbcsm @guotuofeng @carmocca
43-
/src/pytorch_lightning/strategies @awaelchli @carmocca @justusschock @kaushikb11
44-
/src/pytorch_lightning/trainer @williamfalcon @borda @tchaton @awaelchli @carmocca @justusschock
45-
/src/pytorch_lightning/trainer/connectors @awaelchli @carmocca @justusschock @otaj
46-
/src/pytorch_lightning/trainer/conectors/logger_connector @awaelchli @carmocca @rohitgr7
47-
/src/pytorch_lightning/tuner @SkafteNicki @borda @awaelchli @rohitgr7
48-
/src/pytorch_lightning/utilities @borda @awaelchli @carmocca
49-
/tests/tests_pytorch @awaelchli @carmocca @rohitgr7 @otaj @justusschock
30+
/src/pytorch_lightning @williamfalcon @awaelchli @carmocca @justusschock
31+
/tests/tests_pytorch @awaelchli @carmocca @justusschock
5032

5133
# Core APIs
5234
/src/pytorch_lightning/callbacks/callback.py @williamfalcon @awaelchli @carmocca
@@ -60,22 +42,16 @@
6042
/tests/tests_lite @awaelchli @carmocca @justusschock
6143

6244
# Lightning App
63-
/src/lightning_app @tchaton @manskx @lantiga
64-
/src/lightning_app/cli/pl-app-template @tchaton @awaelchli @lantiga
65-
/src/lightning_app/core @tchaton @awaelchli @manskx
66-
/src/lightning_app/core/queues.py @tchaton @hhsecond @manskx
67-
/src/lightning_app/runners/cloud.py @tchaton @hhsecond @lantiga
68-
/src/lightning_app/testing @tchaton @manskx @lantiga
69-
/src/lightning_app/__about__.py @nohalon @edenlightning @lantiga
70-
/tests/tests_app @tchaton @awaelchli @manskx @hhsecond
71-
/tests/tests_app_examples @tchaton @awaelchli @manskx @hhsecond
72-
/examples/app_* @tchaton @awaelchli @manskx @hhsecond
45+
/src/lightning_app @tchaton @lantiga @awaelchli @hhsecond
46+
/tests/tests_app @tchaton @awaelchli @hhsecond
47+
/tests/tests_app_examples @tchaton @awaelchli @hhsecond
48+
/examples/app_* @tchaton @awaelchli @hhsecond
7349

7450
/.github/CODEOWNERS @williamfalcon
7551
/SECURITY.md @williamfalcon
7652
/README.md @williamfalcon @edenlightning @borda
7753
/setup.py @williamfalcon @borda @carmocca
7854
/src/pytorch_lightning/__about__.py @williamfalcon @borda @carmocca
79-
/src/lightning_app/__about__.py @williamfalcon @borda @manskx
55+
/src/lightning_app/__about__.py @williamfalcon @borda
8056
/src/lightning_lite/__about__.py @williamfalcon @borda @awaelchli
81-
/src/*/__setup__.py @borda @manskx
57+
/src/*/__setup__.py @borda @carmocca

‎.github/checkgroup.yml

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -26,69 +26,71 @@ subprojects:
2626
- ".actions/**"
2727
checks:
2828
# Note: updates here should be applied to the lightning_lite group
29-
- "pl-cpu (macOS-11, pytorch, 3.8, 1.11)"
29+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.9)"
3030
- "pl-cpu (macOS-11, pytorch, 3.9, 1.12)"
31-
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13)"
31+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
3232
- "pl-cpu (macOS-11, pytorch, 3.7, 1.10, oldest)"
33+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
3334
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.11)"
3435
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.12)"
3536
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
36-
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)"
37+
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
3738
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)"
38-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.11)"
39+
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
3940
- "pl-cpu (windows-2022, pytorch, 3.9, 1.12)"
4041
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
41-
- "pl-cpu (windows-2022, pytorch, 3.10, 1.13)"
42+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
4243
- "pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)"
43-
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
44-
- "pl-cpu (macOS-11, lightning, 3.7, 1.10, oldest)"
45-
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
46-
- "pl-cpu (ubuntu-20.04, lightning, 3.7, 1.10, oldest)"
47-
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
48-
- "pl-cpu (windows-2022, lightning, 3.7, 1.10, oldest)"
49-
- "make-doctest (pytorch)"
50-
- "make-html (pytorch)"
44+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
45+
- "pl-cpu (macOS-11, lightning, 3.10, 1.12)"
46+
#- "pl-cpu (macOS-11, lightning, 3.7, 1.9, oldest)"
47+
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12)"
48+
#- "pl-cpu (ubuntu-20.04, lightning, 3.7, 1.9, oldest)"
49+
- "pl-cpu (windows-2022, lightning, 3.10, 1.12)"
50+
#- "pl-cpu (windows-2022, lightning, 3.7, 1.9, oldest)"
5151
- "pytorch-lightning (GPUs)"
5252
- "pytorch-lightning (HPUs)"
5353
- "pytorch-lightning (IPUs)"
54-
- "pl-slow (macOS-11, 3.7, 1.11)"
55-
- "pl-slow (ubuntu-20.04, 3.7, 1.11)"
56-
- "pl-slow (windows-2022, 3.7, 1.11)"
54+
- "pl-cpu (slow, macOS-11, pytorch, 3.7, 1.12)"
55+
- "pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.12)"
56+
- "pl-cpu (slow, windows-2022, pytorch, 3.7, 1.12)"
5757
# TODO: since this job has intermittent availability, it cannot be required or it will block all PL PRs from forks
5858
#- "test-on-tpus"
5959

6060
- id: "pytorch_lightning: CPU workflow"
6161
paths:
6262
- ".github/workflows/ci-pytorch-tests.yml"
6363
checks:
64-
- "pl-cpu (macOS-11, pytorch, 3.8, 1.11)"
64+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.9)"
6565
- "pl-cpu (macOS-11, pytorch, 3.9, 1.12)"
66-
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13)"
66+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
6767
- "pl-cpu (macOS-11, pytorch, 3.7, 1.10, oldest)"
68+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
6869
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.11)"
6970
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.12)"
7071
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
71-
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)"
72+
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
7273
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)"
73-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.11)"
74+
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
7475
- "pl-cpu (windows-2022, pytorch, 3.9, 1.12)"
7576
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
76-
- "pl-cpu (windows-2022, pytorch, 3.10, 1.13)"
77+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
7778
- "pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)"
78-
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
79-
- "pl-cpu (macOS-11, lightning, 3.7, 1.10, oldest)"
80-
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
81-
- "pl-cpu (ubuntu-20.04, lightning, 3.7, 1.10, oldest)"
82-
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
83-
- "pl-cpu (windows-2022, lightning, 3.7, 1.10, oldest)"
79+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
80+
- "pl-cpu (macOS-11, lightning, 3.10, 1.12)"
81+
#- "pl-cpu (macOS-11, lightning, 3.7, 1.9, oldest)"
82+
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12)"
83+
#- "pl-cpu (ubuntu-20.04, lightning, 3.7, 1.9, oldest)"
84+
- "pl-cpu (windows-2022, lightning, 3.10, 1.12)"
85+
#- "pl-cpu (windows-2022, lightning, 3.7, 1.9, oldest)"
8486

8587
- id: "pytorch_lightning: Slow workflow"
8688
paths:
8789
- ".github/workflows/ci-pytorch-tests-slow.yml"
8890
checks:
89-
- "pl-slow (macOS-11, 3.7, 1.11)"
90-
- "pl-slow (ubuntu-20.04, 3.7, 1.11)"
91-
- "pl-slow (windows-2022, 3.7, 1.11)"
91+
- "pl-cpu (slow, macOS-11, pytorch, 3.7, 1.12)"
92+
- "pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.12)"
93+
- "pl-cpu (slow, windows-2022, pytorch, 3.7, 1.12)"
9294

9395
- id: "pytorch_lightning: Azure GPU"
9496
paths:
@@ -117,6 +119,7 @@ subprojects:
117119

118120
- id: "pytorch_lightning: Docs"
119121
paths:
122+
- "src/pytorch_lightning/**"
120123
- "docs/source-pytorch/**"
121124
- ".github/workflows/docs-*.yml"
122125
- "requirements/docs.txt"
@@ -176,34 +179,34 @@ subprojects:
176179
- "lite-cpu (windows-2022, lightning, 3.8, 1.12)"
177180
- "lightning-lite (GPUs)"
178181
# Lite also requires PL checks as it depends on Lite
179-
- "pl-cpu (macOS-11, pytorch, 3.8, 1.11)"
182+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.9)"
180183
- "pl-cpu (macOS-11, pytorch, 3.9, 1.12)"
181-
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13)"
184+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
182185
- "pl-cpu (macOS-11, pytorch, 3.7, 1.10, oldest)"
186+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
183187
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.11)"
184188
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.12)"
185189
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
186-
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)"
190+
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
187191
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)"
188-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.11)"
192+
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
189193
- "pl-cpu (windows-2022, pytorch, 3.9, 1.12)"
190194
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
191-
- "pl-cpu (windows-2022, pytorch, 3.10, 1.13)"
195+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
192196
- "pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)"
193-
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
194-
- "pl-cpu (macOS-11, lightning, 3.7, 1.10, oldest)"
195-
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
196-
- "pl-cpu (ubuntu-20.04, lightning, 3.7, 1.10, oldest)"
197-
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
198-
- "pl-cpu (windows-2022, lightning, 3.7, 1.10, oldest)"
199-
- "make-doctest (pytorch)"
200-
- "make-html (pytorch)"
197+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
198+
- "pl-cpu (macOS-11, lightning, 3.10, 1.12)"
199+
#- "pl-cpu (macOS-11, lightning, 3.7, 1.9, oldest)"
200+
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12)"
201+
#- "pl-cpu (ubuntu-20.04, lightning, 3.7, 1.9, oldest)"
202+
- "pl-cpu (windows-2022, lightning, 3.10, 1.12)"
203+
#- "pl-cpu (windows-2022, lightning, 3.7, 1.9, oldest)"
201204
- "pytorch-lightning (GPUs)"
202205
- "pytorch-lightning (HPUs)"
203206
- "pytorch-lightning (IPUs)"
204-
- "pl-slow (macOS-11, 3.7, 1.11)"
205-
- "pl-slow (ubuntu-20.04, 3.7, 1.11)"
206-
- "pl-slow (windows-2022, 3.7, 1.11)"
207+
- "pl-cpu (slow, macOS-11, pytorch, 3.7, 1.12)"
208+
- "pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.12)"
209+
- "pl-cpu (slow, windows-2022, pytorch, 3.7, 1.12)"
207210
#- "test-on-tpus"
208211

209212
- id: "lightning_lite: Tests"
@@ -247,8 +250,6 @@ subprojects:
247250
- ".actions/**"
248251
checks:
249252
- "App.cloud-e2e"
250-
- "make-doctest (app)"
251-
- "make-html (app)"
252253
- "app-pytest (macOS-11, app, 3.8, latest)"
253254
- "app-pytest (macOS-11, app, 3.8, oldest)"
254255
- "app-pytest (macOS-11, lightning, 3.9, latest)"
@@ -314,6 +315,7 @@ subprojects:
314315

315316
- id: "lightning_app: Docs"
316317
paths:
318+
- "src/lightning_app/**"
317319
- "docs/source-app/**"
318320
- ".github/workflows/docs-*.yml"
319321
- "requirements/docs.txt"

0 commit comments

Comments
 (0)