Skip to content

Commit 5e0e02b

Browse files
awaelchliawaelchli
authored
Remove support for PyTorch 1.13 (#19706)
1 parent b9680a3 commit 5e0e02b

Some content is hidden

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

66 files changed

+221
-871
lines changed

‎.github/checkgroup.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ 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 (ubuntu-20.04, lightning, 3.8, 2.0, oldest)"
27+
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
2828
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
2929
- "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)"
30+
- "pl-cpu (windows-2022, lightning, 3.8, 2.0, oldest)"
31+
- "pl-cpu (windows-2022, lightning, 3.10, 2.0)"
3232
- "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
3333
- "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)"
34+
- "pl-cpu (macOS-11, pytorch, 3.8, 2.0)"
35+
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 2.0)"
36+
- "pl-cpu (windows-2022, pytorch, 3.8, 2.0)"
3737
- "pl-cpu (macOS-12, pytorch, 3.11, 2.0)"
3838
- "pl-cpu (macOS-12, pytorch, 3.11, 2.1)"
3939
- "pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0)"
@@ -140,15 +140,17 @@ subprojects:
140140
- "!*.md"
141141
- "!**/*.md"
142142
checks:
143-
- "build-cuda (3.9, 1.13, 11.8.0)"
144-
- "build-cuda (3.9, 1.13, 12.0.1)"
145143
- "build-cuda (3.10, 2.0, 11.8.0)"
146144
- "build-cuda (3.10, 2.1, 12.1.0)"
145+
- "build-cuda (3.10, 2.2, 12.1.0)"
146+
- "build-cuda (3.11, 2.1, 12.1.0)"
147+
- "build-cuda (3.11, 2.2, 12.1.0)"
147148
#- "build-NGC"
148-
- "build-pl (3.9, 1.13, 11.8.0)"
149-
- "build-pl (3.9, 1.13, 12.0.1)"
150149
- "build-pl (3.10, 2.0, 11.8.0)"
151150
- "build-pl (3.10, 2.1, 12.1.0)"
151+
- "build-pl (3.10, 2.2, 12.1.0)"
152+
- "build-pl (3.11, 2.1, 12.1.0)"
153+
- "build-pl (3.11, 2.2, 12.1.0)"
152154

153155
# SECTION: lightning_fabric
154156

@@ -165,21 +167,21 @@ subprojects:
165167
- "!*.md"
166168
- "!**/*.md"
167169
checks:
168-
- "fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
169-
- "fabric-cpu (macOS-11, lightning, 3.10, 1.13)"
170+
- "fabric-cpu (macOS-11, lightning, 3.8, 2.0, oldest)"
171+
- "fabric-cpu (macOS-11, lightning, 3.10, 2.0)"
170172
- "fabric-cpu (macOS-11, lightning, 3.11, 2.1)"
171173
- "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)"
174+
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)"
175+
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
174176
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)"
175177
- "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)"
178+
- "fabric-cpu (windows-2022, lightning, 3.8, 2.0, oldest)"
179+
- "fabric-cpu (windows-2022, lightning, 3.10, 2.0)"
178180
- "fabric-cpu (windows-2022, lightning, 3.11, 2.1)"
179181
- "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)"
182+
- "fabric-cpu (macOS-11, fabric, 3.8, 2.0)"
183+
- "fabric-cpu (ubuntu-20.04, fabric, 3.8, 2.0)"
184+
- "fabric-cpu (windows-2022, fabric, 3.8, 2.0)"
183185
- "fabric-cpu (macOS-12, fabric, 3.11, 2.0)"
184186
- "fabric-cpu (macOS-12, fabric, 3.11, 2.1)"
185187
- "fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0)"

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ 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" }
@@ -57,31 +57,25 @@ jobs:
5757
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
5858
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
5959
# "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-
}
60+
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
6761
- {
6862
os: "ubuntu-20.04",
6963
pkg-name: "lightning",
7064
python-version: "3.8",
71-
pytorch-version: "1.13",
65+
pytorch-version: "2.0",
7266
requires: "oldest",
7367
}
7468
- {
7569
os: "windows-2022",
7670
pkg-name: "lightning",
7771
python-version: "3.8",
78-
pytorch-version: "1.13",
72+
pytorch-version: "2.0",
7973
requires: "oldest",
8074
}
8175
# "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" }
76+
- { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
77+
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
78+
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
8579
timeout-minutes: 25 # because of building grpcio on Mac
8680
env:
8781
PACKAGE_NAME: ${{ matrix.pkg-name }}

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
include:
46-
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
47-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
48-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
46+
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
47+
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
48+
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
4949
# only run PyTorch latest
5050
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
5151
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
@@ -61,31 +61,25 @@ jobs:
6161
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" }
6262
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" }
6363
# "oldest" versions tests, only on minimum Python
64-
- {
65-
os: "macOS-11",
66-
pkg-name: "lightning",
67-
python-version: "3.8",
68-
pytorch-version: "1.13",
69-
requires: "oldest",
70-
}
64+
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
7165
- {
7266
os: "ubuntu-20.04",
7367
pkg-name: "lightning",
7468
python-version: "3.8",
75-
pytorch-version: "1.13",
69+
pytorch-version: "2.0",
7670
requires: "oldest",
7771
}
7872
- {
7973
os: "windows-2022",
8074
pkg-name: "lightning",
8175
python-version: "3.8",
82-
pytorch-version: "1.13",
76+
pytorch-version: "2.0",
8377
requires: "oldest",
8478
}
8579
# "pytorch" installs the standalone package
86-
- { os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
87-
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
88-
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
80+
- { os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" }
81+
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" }
82+
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" }
8983
timeout-minutes: 50
9084
env:
9185
PACKAGE_NAME: ${{ matrix.pkg-name }}

‎.github/workflows/docker-build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,11 @@ jobs:
4343
include:
4444
# We only release one docker image per PyTorch version.
4545
# Make sure the matrix here matches the one below.
46-
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
47-
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
4846
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
4947
- { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
48+
- { python_version: "3.10", pytorch_version: "2.2", cuda_version: "12.1.0" }
49+
- { python_version: "3.11", pytorch_version: "2.1", cuda_version: "12.1.0" }
50+
- { python_version: "3.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
5051
steps:
5152
- uses: actions/checkout@v4
5253
with:
@@ -103,8 +104,6 @@ jobs:
103104
include:
104105
# These are the base images for PL release docker images.
105106
# Make sure the matrix here matches the one above.
106-
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
107-
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
108107
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
109108
- { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
110109
- { python_version: "3.10", pytorch_version: "2.2", cuda_version: "12.1.0" }

‎dockers/release/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PYTHON_VERSION=3.9
16-
ARG PYTORCH_VERSION=1.13
17-
ARG CUDA_VERSION=11.3.1
15+
ARG PYTHON_VERSION=3.10
16+
ARG PYTORCH_VERSION=2.0
17+
ARG CUDA_VERSION=11.8.0
1818

1919
FROM pytorchlightning/pytorch_lightning:base-cuda-py${PYTHON_VERSION}-torch${PYTORCH_VERSION}-cuda${CUDA_VERSION}
2020

‎requirements/fabric/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.27.0
5-
torch >=1.13.0, <2.3.0
5+
torch >=2.0.0, <2.3.0
66
fsspec[http] >=2022.5.0, <2023.11.0
77
packaging >=20.0, <=23.1
88
typing-extensions >=4.4.0, <4.10.0

‎requirements/fabric/examples.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
22
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
33

4-
torchvision >=0.14.0, <0.18.0
4+
torchvision >=0.15.0, <0.18.0
55
torchmetrics >=0.10.0, <1.3.0
66
lightning-utilities >=0.8.0, <0.12.0

‎requirements/fabric/strategies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
# note: is a bug around 0.10 with `MPS_Accelerator must implement all abstract methods`
77
# shall be resolved by https://github.com/microsoft/DeepSpeed/issues/4372
8-
deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows" # strict
8+
deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows" and platform_system != "Darwin" # strict
99
bitsandbytes >=0.42.0,<0.43.0

‎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.27.0
5-
torch >=1.13.0, <2.3.0
5+
torch >=2.0.0, <2.3.0
66
tqdm >=4.57.0, <4.67.0
77
PyYAML >=5.4, <6.1.0
88
fsspec[http] >=2022.5.0, <2023.11.0

‎requirements/pytorch/examples.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
requests <2.32.0
5-
torchvision >=0.14.0, <0.18.0
5+
torchvision >=0.15.0, <0.18.0
66
gym[classic_control] >=0.17.0, <0.27.0
77
ipython[all] <8.15.0
88
torchmetrics >=0.10.0, <1.3.0

0 commit comments

Comments
 (0)