Skip to content

Commit 179657e

Browse files
authored
Merge branch 'master' into ENG-1454-remove-instance-types-from-the-cli
2 parents 27f9bc4 + 488c2ac commit 179657e

File tree

22 files changed

+361
-312
lines changed

22 files changed

+361
-312
lines changed

.azure/app-cloud-e2e.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ trigger:
1212
- "master"
1313
- "release/*"
1414
- "refs/tags/*"
15-
paths:
16-
include:
17-
- ".azure/app-cloud-e2e.yml"
18-
- "requirements/app/**"
19-
- "src/lightning_app/**"
20-
- "examples/app_*"
21-
- "tests/tests_app_examples/**"
22-
- ".actions/**"
15+
16+
schedules:
17+
- cron: "0 0 * * *" # At the end of every day
18+
displayName: Daily midnight testing
19+
branches:
20+
include:
21+
- "master"
2322

2423
pr:
2524
branches:

.azure/gpu-tests-lite.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@ trigger:
1212
- "master"
1313
- "release/*"
1414
- "refs/tags/*"
15-
paths:
16-
include:
17-
- ".azure/gpu-tests-lite.yml"
18-
- "requirements/lite/**"
19-
- "src/lightning_lite/**"
20-
- "tests/tests_lite/**"
21-
- "tests/tests_pytorch/run_standalone_tests.sh"
22-
- "tests/tests_lite/run_standalone_tests.sh" # a symlink to the one above
23-
- ".actions/**"
2415

2516
pr:
2617
branches:

.azure/gpu-tests-pytorch.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@ trigger:
1212
- "master"
1313
- "release/*"
1414
- "refs/tags/*"
15-
paths:
16-
include:
17-
- ".azure/gpu-tests-pytorch.yml"
18-
- "examples/run_ddp_examples.sh"
19-
- "examples/convert_from_pt_to_pl/**"
20-
- "examples/run_pl_examples.sh"
21-
- "examples/pl_basics/backbone_image_classifier.py"
22-
- "examples/pl_basics/autoencoder.py"
23-
- "examples/pl_loops/mnist_lite.py"
24-
- "examples/pl_fault_tolerant/automatic.py"
25-
- "examples/test_pl_examples.py"
26-
- "examples/pl_integrations/dali_image_classifier.py"
27-
- "requirements/pytorch/**"
28-
- "src/pytorch_lightning/**"
29-
- "tests/tests_pytorch/**"
30-
- "setup.cfg" # includes pytest config
31-
- "requirements/lite/**"
32-
- "src/lightning_lite/**"
33-
- "tests/tests_lite/**"
34-
- ".actions/**"
3515

3616
pr:
3717
branches:

.azure/hpu-tests.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ trigger:
99
- "master"
1010
- "release/*"
1111
- "refs/tags/*"
12-
paths:
13-
include:
14-
- ".azure/hpu-tests.yml"
15-
- "examples/pl_hpu/mnist_sample.py"
16-
- "requirements/pytorch/**"
17-
- "src/pytorch_lightning/**"
18-
- "tests/tests_pytorch/**"
19-
- "setup.cfg" # includes pytest config
20-
- ".actions/**"
2112

2213
pr:
2314
branches:

.azure/ipu-tests.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ trigger:
77
- master
88
- release/*
99
- refs/tags/*
10-
paths:
11-
include:
12-
- ".azure/ipu-tests.yml"
13-
- "requirements/pytorch/**"
14-
- "src/pytorch_lightning/**"
15-
- "tests/tests_pytorch/**"
16-
- "setup.cfg" # includes pytest config
17-
- ".actions/**"
1810

1911
pr:
2012
branches:

.github/checkgroup.yml

Lines changed: 59 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,21 @@ subprojects:
2525
- ".actions/**"
2626
checks:
2727
# Note: updates here should be applied to the lightning_lite group
28-
- "pl-cpu (macos-11, pytorch, 3.7, 1.9, oldest)"
29-
- "pl-cpu (macos-11, pytorch, 3.7, 1.12)"
30-
- "pl-cpu (macos-11, pytorch, 3.8, 1.10)"
31-
- "pl-cpu (macos-11, pytorch, 3.9, 1.11)"
32-
- "pl-cpu (macos-11, pytorch, 3.10, 1.12)"
33-
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.9, oldest)"
34-
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.12)"
35-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.9)"
36-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10)"
37-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)"
38-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.12)"
28+
- "pl-cpu (macOS-11, pytorch, 3.9, 1.11)"
29+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.10)"
30+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.11)"
31+
- "pl-cpu (windows.2022, pytorch, 3.9, 1.10)"
32+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.9)"
33+
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.11)"
34+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
3935
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
40-
- "pl-cpu (windows-2022, pytorch, 3.7, 1.9, oldest)"
41-
- "pl-cpu (windows-2022, pytorch, 3.7, 1.12)"
42-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.10)"
43-
- "pl-cpu (windows-2022, pytorch, 3.9, 1.11)"
4436
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
37+
- "pl-cpu (macOS-11, pytorch, 3.7, 1.9, oldest)"
38+
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.9, oldest)"
39+
- "pl-cpu (windows-2022, pytorch, 3.7, 1.9, oldest)"
40+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
41+
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
42+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
4543
- "make-doctest (pytorch)"
4644
- "make-html (pytorch)"
4745
- "mypy"
@@ -58,23 +56,21 @@ subprojects:
5856
paths:
5957
- ".github/workflows/ci-pytorch-test-full.yml"
6058
checks:
61-
- "pl-cpu (macos-11, pytorch, 3.7, 1.9, oldest)"
62-
- "pl-cpu (macos-11, pytorch, 3.7, 1.12)"
63-
- "pl-cpu (macos-11, pytorch, 3.8, 1.10)"
64-
- "pl-cpu (macos-11, pytorch, 3.9, 1.11)"
65-
- "pl-cpu (macos-11, pytorch, 3.10, 1.12)"
66-
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.9, oldest)"
67-
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.12)"
68-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.9)"
69-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10)"
70-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)"
71-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.12)"
59+
- "pl-cpu (macOS-11, pytorch, 3.9, 1.11)"
60+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.10)"
61+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.11)"
62+
- "pl-cpu (windows.2022, pytorch, 3.9, 1.10)"
63+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.9)"
64+
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.11)"
65+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
7266
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
73-
- "pl-cpu (windows-2022, pytorch, 3.7, 1.9, oldest)"
74-
- "pl-cpu (windows-2022, pytorch, 3.7, 1.12)"
75-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.10)"
76-
- "pl-cpu (windows-2022, pytorch, 3.9, 1.11)"
7767
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
68+
- "pl-cpu (macOS-11, pytorch, 3.7, 1.9, oldest)"
69+
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.9, oldest)"
70+
- "pl-cpu (windows-2022, pytorch, 3.7, 1.9, oldest)"
71+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
72+
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
73+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
7874

7975
- id: "pytorch_lightning: Slow"
8076
paths:
@@ -181,23 +177,21 @@ subprojects:
181177
- "lightning-lite (GPUs)"
182178
- "mypy"
183179
# Lite also requires PL checks as it depends on Lite
184-
- "pl-cpu (macos-11, pytorch, 3.7, 1.9, oldest)"
185-
- "pl-cpu (macos-11, pytorch, 3.7, 1.12)"
186-
- "pl-cpu (macos-11, pytorch, 3.8, 1.10)"
187-
- "pl-cpu (macos-11, pytorch, 3.9, 1.11)"
188-
- "pl-cpu (macos-11, pytorch, 3.10, 1.12)"
189-
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.9, oldest)"
190-
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.12)"
191-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.9)"
192-
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10)"
193-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)"
194-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.12)"
180+
- "pl-cpu (macOS-11, pytorch, 3.9, 1.11)"
181+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.10)"
182+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.11)"
183+
- "pl-cpu (windows.2022, pytorch, 3.9, 1.10)"
184+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.9)"
185+
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.11)"
186+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
195187
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
196-
- "pl-cpu (windows-2022, pytorch, 3.7, 1.9, oldest)"
197-
- "pl-cpu (windows-2022, pytorch, 3.7, 1.12)"
198-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.10)"
199-
- "pl-cpu (windows-2022, pytorch, 3.9, 1.11)"
200188
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
189+
- "pl-cpu (macOS-11, pytorch, 3.7, 1.9, oldest)"
190+
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.9, oldest)"
191+
- "pl-cpu (windows-2022, pytorch, 3.7, 1.9, oldest)"
192+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
193+
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
194+
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
201195
- "make-doctest (pytorch)"
202196
- "make-html (pytorch)"
203197
- "pytorch-lightning (GPUs)"
@@ -302,22 +296,24 @@ subprojects:
302296
- ".actions/**"
303297
- ".github/workflows/ci-pkg-install.yml"
304298
- "setup.py"
305-
- "src/lightning/**"
306-
# all __about__, __version__, __setup__
307-
- "src/*/__*.py"
299+
- "src/**"
300+
- "requirements/**"
308301
checks:
309-
- "install-meta-pypi (macOS-11, 3.8)"
310-
- "install-meta-pypi (ubuntu-20.04, 3.8)"
311-
- "install-meta-pypi (windows-2022, 3.8)"
312-
- "install-meta-src (macOS-11, 3.8)"
313-
- "install-meta-src (macOS-11, lightning, 3.8)"
314-
- "install-meta-src (ubuntu-20.04, 3.8)"
315-
- "install-meta-src (ubuntu-20.04, lightning, 3.8)"
316-
- "install-meta-src (windows-2022, 3.8)"
317-
- "install-meta-src (windows-2022, lightning, 3.8)"
318-
- "install-standalone (macOS-11, app, 3.8)"
319-
- "install-standalone (macOS-11, pytorch, 3.8)"
320-
- "install-standalone (ubuntu-20.04, app, 3.8)"
321-
- "install-standalone (ubuntu-20.04, pytorch, 3.8)"
322-
- "install-standalone (windows-2022, app, 3.8)"
323-
- "install-standalone (windows-2022, pytorch, 3.8)"
302+
- "install-pkg (ubuntu-22.04, app, 3.7)"
303+
- "install-pkg (ubuntu-22.04, app, 3.10)"
304+
- "install-pkg (ubuntu-22.04, lite, 3.7)"
305+
- "install-pkg (ubuntu-22.04, lite, 3.10)"
306+
- "install-pkg (ubuntu-22.04, pytorch, 3.7)"
307+
- "install-pkg (ubuntu-22.04, pytorch, 3.10)"
308+
- "install-pkg (macOS-12, app, 3.7)"
309+
- "install-pkg (macOS-12, app, 3.10)"
310+
- "install-pkg (macOS-12, lite, 3.7)"
311+
- "install-pkg (macOS-12, lite, 3.10)"
312+
- "install-pkg (macOS-12, pytorch, 3.7)"
313+
- "install-pkg (macOS-12, pytorch, 3.10)"
314+
- "install-pkg (windows-2022, app, 3.7)"
315+
- "install-pkg (windows-2022, app, 3.10)"
316+
- "install-pkg (windows-2022, lite, 3.7)"
317+
- "install-pkg (windows-2022, lite, 3.10)"
318+
- "install-pkg (windows-2022, pytorch, 3.7)"
319+
- "install-pkg (windows-2022, pytorch, 3.10)"

.github/workflows/ci-app-cloud-e2e-test.yml

Lines changed: 0 additions & 139 deletions
This file was deleted.

.github/workflows/ci-lite-test-full.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
requires: ["oldest", "latest"]
4040
release: ["stable"]
4141
exclude:
42-
# There's no distribution of the oldest PyTorch 1.9 for Python 3.10.
42+
# note: there's no distribution of Torch==1.9 for Python>=3.9
4343
# TODO: Remove the exclusion when dropping PyTorch 1.9 support.
4444
- {python-version: "3.9", requires: "oldest"}
4545
- {python-version: "3.10", requires: "oldest"}

0 commit comments

Comments
 (0)