Skip to content

Commit 57ac548

Browse files
Bordaakihironittacarmoccaawaelchli
authored
Upgrade CI to PyTorch 1.13 (#15403)
Co-authored-by: Jirka Borovec <[email protected]> Co-authored-by: Akihiro Nitta <[email protected]> Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Adrian Wälchli <[email protected]>
1 parent f9d906c commit 57ac548

File tree

11 files changed

+82
-82
lines changed

11 files changed

+82
-82
lines changed

‎.github/checkgroup.yml‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
custom_service_name: "Lightning CI required checker"
2-
# For security reasons, configuration is only loaded from the repository's default branch,
3-
# changes made in pull requests from different branches or forks are ignored. This means that changes to this file
4-
# will only be used after they are merged.
52
subprojects:
63

74
# SECTION: pytorch_lightning
@@ -18,26 +15,25 @@ subprojects:
1815
- "setup.cfg" # includes pytest config
1916
- ".actions/**"
2017
checks:
21-
# Note: updates here should be applied to the lightning_lite group
22-
- "pl-cpu (macOS-11, pytorch, 3.8, 1.10)"
23-
- "pl-cpu (macOS-11, pytorch, 3.9, 1.11)"
24-
- "pl-cpu (macOS-11, pytorch, 3.10, 1.12)"
25-
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13, pre)"
18+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.11)"
19+
- "pl-cpu (macOS-11, pytorch, 3.9, 1.12)"
20+
- "pl-cpu (macOS-11, pytorch, 3.10, 1.13)"
21+
- "pl-cpu (macOS-11, pytorch, 3.8, 1.10, oldest)"
2622
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.10)"
2723
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.11)"
28-
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.11)"
2924
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.12)"
30-
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 1.13, pre)"
25+
- "pl-cpu (ubuntu-20.04, pytorch, 3.10, 1.13)"
26+
- "pl-cpu (ubuntu-20.04, pytorch, 3.7, 1.10, oldest)"
3127
- "pl-cpu (windows-2022, pytorch, 3.9, 1.11)"
32-
- "pl-cpu (windows-2022, pytorch, 3.10, 1.11)"
3328
- "pl-cpu (windows-2022, pytorch, 3.10, 1.12)"
34-
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13, pre)"
35-
- "pl-cpu (macOS-11, lightning, 3.10, 1.12)"
36-
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.12)"
37-
- "pl-cpu (windows-2022, lightning, 3.10, 1.12)"
29+
- "pl-cpu (windows-2022, pytorch, 3.10, 1.13)"
30+
- "pl-cpu (windows-2022, pytorch, 3.7, 1.10, oldest)"
3831
- "pl-cpu (slow, macOS-11, pytorch, 3.7, 1.11)"
3932
- "pl-cpu (slow, ubuntu-20.04, pytorch, 3.7, 1.11)"
4033
- "pl-cpu (slow, windows-2022, pytorch, 3.7, 1.11)"
34+
- "pl-cpu (macOS-11, lightning, 3.8, 1.13)"
35+
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13)"
36+
- "pl-cpu (windows-2022, lightning, 3.8, 1.13)"
4137

4238
- id: "pytorch_lightning: Azure GPU"
4339
paths:
@@ -145,7 +141,7 @@ subprojects:
145141
- "build-pl (3.9, 1.10, 11.3.1)"
146142
- "build-pl (3.9, 1.11, 11.3.1)"
147143
- "build-pl (3.9, 1.12, 11.6.1)"
148-
# TODO: add 1.13
144+
- "build-pl (3.9, 1.13, 11.6.1)"
149145
- "build-xla (3.7, 1.12)"
150146

151147
# SECTION: lightning_lite
@@ -159,20 +155,22 @@ subprojects:
159155
- ".github/workflows/ci-lite-tests.yml"
160156
- ".actions/**"
161157
checks:
162-
- "lite-cpu (macOS-11, lite, 3.9, 1.11)"
163-
- "lite-cpu (macOS-11, lite, 3.8, 1.10)"
164-
- "lite-cpu (macOS-11, lite, 3.10, 1.12)"
165-
- "lite-cpu (macOS-11, lite, 3.10, 1.13, pre)"
166-
- "lite-cpu (ubuntu-20.04, lite, 3.8, 1.11)"
158+
- "lite-cpu (macOS-11, lite, 3.8, 1.11)"
159+
- "lite-cpu (macOS-11, lite, 3.9, 1.12)"
160+
- "lite-cpu (macOS-11, lite, 3.10, 1.13)"
161+
- "lite-cpu (macOS-11, lite, 3.7, 1.10, oldest)"
162+
- "lite-cpu (ubuntu-20.04, lite, 3.8, 1.10)"
163+
- "lite-cpu (ubuntu-20.04, lite, 3.9, 1.11)"
167164
- "lite-cpu (ubuntu-20.04, lite, 3.10, 1.12)"
168-
- "lite-cpu (ubuntu-20.04, lite, 3.9, 1.13, pre)"
169-
- "lite-cpu (windows-2022, lite, 3.9, 1.10)"
170-
- "lite-cpu (windows-2022, lite, 3.10, 1.11)"
165+
- "lite-cpu (ubuntu-20.04, lite, 3.10, 1.13)"
166+
- "lite-cpu (ubuntu-20.04, lite, 3.7, 1.10, oldest)"
167+
- "lite-cpu (windows-2022, lite, 3.9, 1.11)"
171168
- "lite-cpu (windows-2022, lite, 3.10, 1.12)"
172-
- "lite-cpu (windows-2022, lite, 3.8, 1.13, pre)"
173-
- "lite-cpu (macOS-11, lightning, 3.8, 1.12)"
174-
- "lite-cpu (ubuntu-20.04, lightning, 3.8, 1.12)"
175-
- "lite-cpu (windows-2022, lightning, 3.8, 1.12)"
169+
- "lite-cpu (windows-2022, lite, 3.10, 1.13)"
170+
- "lite-cpu (windows-2022, lite, 3.7, 1.10, oldest)"
171+
- "lite-cpu (macOS-11, lightning, 3.8, 1.13)"
172+
- "lite-cpu (ubuntu-20.04, lightning, 3.8, 1.13)"
173+
- "lite-cpu (windows-2022, lightning, 3.8, 1.13)"
176174

177175
- id: "lightning_lite: Azure GPU"
178176
paths:

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,25 @@ jobs:
3636
include:
3737
# assign python and pytorch version combinations to operating systems (arbitrarily)
3838
# note: there's no distribution of torch==1.10 for Python>=3.10
39-
- {os: "macOS-11", pkg-name: "lite", python-version: "3.9", pytorch-version: "1.11"}
40-
- {os: "macOS-11", pkg-name: "lite", python-version: "3.8", pytorch-version: "1.10"}
41-
- {os: "windows-2022", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.11"}
42-
- {os: "windows-2022", pkg-name: "lite", python-version: "3.9", pytorch-version: "1.10"}
43-
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.8", pytorch-version: "1.11"}
44-
# only run PyTorch latest with Python latest
45-
- {os: "macOS-11", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.12"}
39+
- {os: "macOS-11", pkg-name: "lite", python-version: "3.8", pytorch-version: "1.11"}
40+
- {os: "macOS-11", pkg-name: "lite", python-version: "3.9", pytorch-version: "1.12"}
41+
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.8", pytorch-version: "1.10"}
42+
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.9", pytorch-version: "1.11"}
4643
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.12"}
44+
- {os: "windows-2022", pkg-name: "lite", python-version: "3.9", pytorch-version: "1.11"}
4745
- {os: "windows-2022", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.12"}
46+
# only run PyTorch latest with Python latest
47+
- {os: "macOS-11", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.13"}
48+
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.13"}
49+
- {os: "windows-2022", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.13"}
4850
# "oldest" versions tests, only on minimum Python
49-
# TODO: add back with 1.13
50-
# release-candidate tests, mixed Python versions
51-
- {os: "macOS-11", pkg-name: "lite", python-version: "3.10", pytorch-version: "1.13", release: "pre"}
52-
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.9", pytorch-version: "1.13", release: "pre"}
53-
- {os: "windows-2022", pkg-name: "lite", python-version: "3.8", pytorch-version: "1.13", release: "pre"}
51+
- {os: "macOS-11", pkg-name: "lite", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
52+
- {os: "ubuntu-20.04", pkg-name: "lite", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
53+
- {os: "windows-2022", pkg-name: "lite", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
5454
# "lightning" installs the monolithic package
55-
- {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.12"}
56-
- {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.12"}
57-
- {os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.12"}
55+
- {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
56+
- {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
57+
- {os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
5858

5959
timeout-minutes: 15
6060

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

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,31 @@ jobs:
4040
include:
4141
# assign python and pytorch version combinations to operating systems (arbitrarily)
4242
# note: there's no distribution of torch==1.10 for Python>=3.10
43-
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.11"}
44-
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10"}
43+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.11"}
44+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.12"}
4545
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10"}
4646
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.11"}
47-
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.11"}
48-
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10"}
49-
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.11"}
50-
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.11"}
51-
# only run PyTorch latest with Python latest
52-
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.12"}
53-
- {os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.12"}
5447
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.12"}
55-
- {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.12"}
48+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.11"}
5649
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.12"}
57-
- {os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.12"}
50+
# only run PyTorch latest with Python latest
51+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13"}
52+
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13"}
53+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13"}
5854
# "oldest" versions tests, only on minimum Python
59-
# TODO: add back with 1.13
60-
# release-candidate tests, mixed Python versions
61-
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "1.13", release: "pre"}
62-
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "1.13", release: "pre"}
63-
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13", release: "pre"}
55+
- {os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.10", requires: "oldest"} # 3.7 hangs
56+
- {os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
57+
- {os: "windows-2022", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.10", requires: "oldest"}
6458
# run test under SLOW label
6559
- {type: "slow", os: "macOS-11", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.11"}
6660
- {type: "slow", os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.11"}
6761
- {type: "slow", os: "windows-2022", pkg-name: "pytorch", python-version: "3.7", pytorch-version: "1.11"}
62+
# "lightning" installs the monolithic package
63+
- {os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
64+
- {os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
65+
- {os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.13"}
6866

69-
timeout-minutes: 60
67+
timeout-minutes: 70 # tests with macOS-11, py3.7 oldest takes much longer then expected
7068

7169
steps:
7270
- uses: actions/checkout@v3

‎requirements/lite/base.txt‎

Lines changed: 1 addition & 1 deletion
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
numpy>=1.17.2, <1.23.1
5-
torch>=1.10.*, <1.13.0
5+
torch>=1.10.*, <=1.13.0
66
fsspec[http]>2021.06.0, <2022.6.0
77
packaging>=17.0, <=21.3
88
typing-extensions>=4.0.0, <=4.4.0

‎requirements/pytorch/adjust-versions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
# IMPORTANT: this list needs to be sorted in reverse
77
VERSIONS = [
8-
dict(torch="1.13.0", torchvision="0.14.0"), # RC
9-
dict(torch="1.12.1", torchvision="0.13.1"), # stable
8+
dict(torch="1.13.0", torchvision="0.14.0"), # stable
9+
dict(torch="1.12.1", torchvision="0.13.1"),
1010
dict(torch="1.12.0", torchvision="0.13.0"),
1111
dict(torch="1.11.0", torchvision="0.12.0"),
1212
dict(torch="1.10.2", torchvision="0.11.3"),

‎requirements/pytorch/base.txt‎

Lines changed: 1 addition & 1 deletion
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
numpy>=1.17.2, <1.23.1
5-
torch>=1.10.*, <1.13.0
5+
torch>=1.10.*, <=1.13.0
66
tqdm>=4.57.0, <4.65.0
77
PyYAML>=5.4, <=6.0
88
fsspec[http]>2021.06.0, <2022.8.0

‎requirements/pytorch/check-avail-extras.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import hydra # noqa: F401
2-
import jsonargparse # noqa: F401
3-
import matplotlib # noqa: F401
4-
import omegaconf # noqa: F401
5-
import rich # noqa: F401
1+
if __name__ == "__main__":
2+
import hydra # noqa: F401
3+
import jsonargparse # noqa: F401
4+
import matplotlib # noqa: F401
5+
import omegaconf # noqa: F401
6+
import rich # noqa: F401

‎requirements/pytorch/check-avail-strategies.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import bagua # noqa: F401
2-
import deepspeed # noqa: F401
3-
import fairscale # noqa: F401
4-
import horovod.torch
1+
if __name__ == "__main__":
2+
import bagua # noqa: F401
3+
import deepspeed # noqa: F401
4+
import fairscale # noqa: F401
5+
import horovod.torch
56

6-
# returns an error code
7-
assert horovod.torch.nccl_built()
7+
# returns an error code
8+
assert horovod.torch.nccl_built()

‎src/lightning_app/cli/app-template/tests/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
coverage
22
codecov>=2.1
3-
pytest>=3.0.5
3+
pytest>=5.0.0
44
pytest-cov
55
pytest-flake8
66
flake8
77
check-manifest
8-
twine==1.13.0
8+
twine==4.0.1

‎src/lightning_app/cli/component-template/tests/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
coverage
22
codecov>=2.1
3-
pytest>=3.0.5
3+
pytest>=5.0.0
44
pytest-cov
55
pytest-flake8
66
flake8
77
check-manifest
8-
twine==1.13.0
8+
twine==4.0.1

0 commit comments

Comments
 (0)