Skip to content

Commit 8b4d71c

Browse files
carmoccacarmocca
authored
Update pl CPU testing matrix (#15312)
* Update pl CPU testing matrix * Remove standalone comment, could be confused * Heurisitc for PyTorch latest * partition rest * ckpgoup * These do not exist * This ALSO does not exist
1 parent feda39b commit 8b4d71c

File tree

3 files changed

+58
-71
lines changed

3 files changed

+58
-71
lines changed

‎.github/checkgroup.yml‎

Lines changed: 39 additions & 45 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)"

‎.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"}

‎.github/workflows/ci-pytorch-test-full.yml‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,27 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [ubuntu-20.04, windows-2022, macOS-11]
40-
pkg-name: ["pytorch"] # TODO: add "LAI" # "LAI" installs the monolithic package
41-
python-version: ["3.8", "3.9", "3.10"]
42-
pytorch-version: ["1.9", "1.10", "1.11", "1.12"]
43-
exclude:
44-
- {os: "windows-2022", python-version: "3.8"}
45-
- {os: "windows-2022", python-version: "3.10"}
46-
- {os: "macOS-11", python-version: "3.9"}
47-
- {pytorch-version: "1.9", python-version: "3.9"}
48-
- {pytorch-version: "1.9", python-version: "3.10"}
49-
- {pytorch-version: "1.10", python-version: "3.10"}
50-
- {pytorch-version: "1.11", python-version: "3.7"}
51-
- {pytorch-version: "1.11", python-version: "3.8"}
52-
- {pytorch-version: "1.11", python-version: "3.9"}
53-
- {pytorch-version: "1.12", python-version: "3.7"}
54-
- {pytorch-version: "1.12", python-version: "3.8"}
55-
- {pytorch-version: "1.12", python-version: "3.9"}
5639
include:
57-
# PT is set for sanity check
58-
#- {os: "macos-11", pkg-name: "LAI", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
59-
- {os: "macos-11", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
60-
#- {os: "ubuntu-20.04", pkg-name: "LAI", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
40+
# assign python and pytorch version combinations to operating systems (arbitrarily)
41+
# note: there's no distribution of Torch==1.9 for Python>=3.9 or torch==1.10 for Python>=3.10
42+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.11"}
43+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10"}
44+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.11"}
45+
- {os: "windows.2022", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.10"}
46+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.9"}
47+
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.11"}
48+
# only run PyTorch latest with Python latest
49+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.12"}
50+
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.12"}
51+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.12"}
52+
# "oldest" versions tests, only on minimum Python
53+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
6154
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
62-
#- {os: "windows-2022", pkg-name: "LAI", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
6355
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.9", requires: "oldest"}
64-
# close FUTURE
65-
#- {os: "ubuntu-20.04", pkg-name: "LAI", python-version: "3.10", pytorch-version: "1.13", release: "pre"}
66-
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13", release: "pre"}
56+
# release-candidate tests, mixed Python versions
57+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13", release: "pre"}
58+
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.13", release: "pre"}
59+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13", release: "pre"}
6760

6861
timeout-minutes: 50
6962

0 commit comments

Comments
 (0)