Skip to content

Commit 1a59097

Browse files
awaelchlicarmoccaBorda
authored
Drop support for PyTorch 1.12 (#19300)
Co-authored-by: Carlos Mocholí <[email protected]> Co-authored-by: Jirka Borovec <[email protected]>
1 parent 3bd133b commit 1a59097

File tree

42 files changed

+92
-172
lines changed

Some content is hidden

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

42 files changed

+92
-172
lines changed

‎.github/checkgroup.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ subprojects:
1919
- "!*.md"
2020
- "!**/*.md"
2121
checks:
22-
- "pl-cpu (macOS-11, lightning, 3.8, 1.12, oldest)"
23-
- "pl-cpu (macOS-11, lightning, 3.9, 1.12)"
22+
- "pl-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
2423
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
2524
- "pl-cpu (macOS-11, lightning, 3.10, 2.0)"
2625
- "pl-cpu (macOS-11, lightning, 3.10, 2.1)"
27-
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest)"
28-
- "pl-cpu (ubuntu-20.04, lightning, 3.9, 1.12)"
26+
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
2927
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
3028
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
3129
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
32-
- "pl-cpu (windows-2022, lightning, 3.8, 1.12, oldest)"
33-
- "pl-cpu (windows-2022, lightning, 3.9, 1.12)"
30+
- "pl-cpu (windows-2022, lightning, 3.8, 1.13, oldest)"
3431
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
3532
- "pl-cpu (windows-2022, lightning, 3.10, 2.0)"
3633
- "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
@@ -143,13 +140,11 @@ subprojects:
143140
- "!*.md"
144141
- "!**/*.md"
145142
checks:
146-
- "build-cuda (3.9, 1.12, 11.7.1)"
147143
- "build-cuda (3.9, 1.13, 11.8.0)"
148144
- "build-cuda (3.9, 1.13, 12.0.1)"
149145
- "build-cuda (3.10, 2.0, 11.8.0)"
150146
- "build-cuda (3.10, 2.1, 12.1.0)"
151147
#- "build-NGC"
152-
- "build-pl (3.9, 1.12, 11.7.1)"
153148
- "build-pl (3.9, 1.13, 11.8.0)"
154149
- "build-pl (3.9, 1.13, 12.0.1)"
155150
- "build-pl (3.10, 2.0, 11.8.0)"
@@ -193,18 +188,15 @@ subprojects:
193188
- "!*.md"
194189
- "!**/*.md"
195190
checks:
196-
- "fabric-cpu (macOS-11, lightning, 3.8, 1.12, oldest)"
197-
- "fabric-cpu (macOS-11, lightning, 3.9, 1.12)"
191+
- "fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
198192
- "fabric-cpu (macOS-11, lightning, 3.10, 1.13)"
199193
- "fabric-cpu (macOS-11, lightning, 3.10, 2.0)"
200194
- "fabric-cpu (macOS-11, lightning, 3.11, 2.1)"
201-
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest)"
202-
- "fabric-cpu (ubuntu-20.04, lightning, 3.9, 1.12)"
195+
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
203196
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
204197
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
205198
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)"
206-
- "fabric-cpu (windows-2022, lightning, 3.8, 1.12, oldest)"
207-
- "fabric-cpu (windows-2022, lightning, 3.9, 1.12)"
199+
- "fabric-cpu (windows-2022, lightning, 3.8, 1.13, oldest)"
208200
- "fabric-cpu (windows-2022, lightning, 3.10, 1.13)"
209201
- "fabric-cpu (windows-2022, lightning, 3.10, 2.0)"
210202
- "fabric-cpu (windows-2022, lightning, 3.11, 2.1)"

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
include:
42-
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
4342
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
44-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
4543
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
46-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
4744
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
4845
# only run PyTorch latest
4946
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
@@ -68,21 +65,21 @@ jobs:
6865
os: "macOS-11",
6966
pkg-name: "lightning",
7067
python-version: "3.8",
71-
pytorch-version: "1.12",
68+
pytorch-version: "1.13",
7269
requires: "oldest",
7370
}
7471
- {
7572
os: "ubuntu-20.04",
7673
pkg-name: "lightning",
7774
python-version: "3.8",
78-
pytorch-version: "1.12",
75+
pytorch-version: "1.13",
7976
requires: "oldest",
8077
}
8178
- {
8279
os: "windows-2022",
8380
pkg-name: "lightning",
8481
python-version: "3.8",
85-
pytorch-version: "1.12",
82+
pytorch-version: "1.13",
8683
requires: "oldest",
8784
}
8885
# "fabric" installs the standalone package

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,8 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
include:
46-
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
4746
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
48-
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
4947
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
50-
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
5148
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
5249
# only run PyTorch latest
5350
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
@@ -72,21 +69,21 @@ jobs:
7269
os: "macOS-11",
7370
pkg-name: "lightning",
7471
python-version: "3.8",
75-
pytorch-version: "1.12",
72+
pytorch-version: "1.13",
7673
requires: "oldest",
7774
}
7875
- {
7976
os: "ubuntu-20.04",
8077
pkg-name: "lightning",
8178
python-version: "3.8",
82-
pytorch-version: "1.12",
79+
pytorch-version: "1.13",
8380
requires: "oldest",
8481
}
8582
- {
8683
os: "windows-2022",
8784
pkg-name: "lightning",
8885
python-version: "3.8",
89-
pytorch-version: "1.12",
86+
pytorch-version: "1.13",
9087
requires: "oldest",
9188
}
9289
# "pytorch" installs the standalone package

‎.github/workflows/docker-build.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
matrix:
4343
include:
4444
# We only release one docker image per PyTorch version.
45-
# The matrix here is the same as the one in release-docker.yml.
46-
- { python_version: "3.9", pytorch_version: "1.12", cuda_version: "11.7.1" }
45+
# Make sure the matrix here matches the one below.
4746
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
4847
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
4948
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
@@ -102,9 +101,8 @@ jobs:
102101
fail-fast: false
103102
matrix:
104103
include:
105-
# These are the base images for PL release docker images,
106-
# so include at least all the combinations in release-dockers.yml.
107-
- { python_version: "3.9", pytorch_version: "1.12", cuda_version: "11.7.1" }
104+
# These are the base images for PL release docker images.
105+
# Make sure the matrix here matches the one above.
108106
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
109107
- { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
110108
- { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,13 @@ Lightning is rigorously tested across multiple CPUs, GPUs and TPUs and against m
598598

599599
<center>
600600

601-
| System / PyTorch ver. | 1.12 | 1.13 | 2.0 | 2.1 |
602-
| :--------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
603-
| Linux py3.9 \[GPUs\] | | | | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status%2Fpytorch-lightning%20%28GPUs%29?branchName=master)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) |
604-
| Linux py3.9 \[TPUs\] | | | [![Test PyTorch - TPU](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml) | |
605-
| Linux (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
606-
| OSX (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
607-
| Windows (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
601+
| System / PyTorch ver. | 1.13 | 2.0 | 2.1 |
602+
| :--------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
603+
| Linux py3.9 \[GPUs\] | | | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status%2Fpytorch-lightning%20%28GPUs%29?branchName=master)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) |
604+
| Linux py3.9 \[TPUs\] | | [![Test PyTorch - TPU](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml) | |
605+
| Linux (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
606+
| OSX (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
607+
| Windows (multiple Python versions) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) |
608608

609609
</center>
610610
</details>

‎dockers/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ sudo systemctl restart docker
4545
and later run the docker image with `--gpus all`. For example,
4646

4747
```
48-
docker run --rm -it --gpus all pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.12-cuda11.7.1
48+
docker run --rm -it --gpus all pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.13-cuda11.7.1
4949
```
5050

5151
## Run Jupyter server

‎dockers/release/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG PYTHON_VERSION=3.9
16-
ARG PYTORCH_VERSION=1.12
16+
ARG PYTORCH_VERSION=1.13
1717
ARG CUDA_VERSION=11.3.1
1818

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

‎docs/source-pytorch/versioning.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ The table below indicates the coverage of tested versions in our CI. Versions ou
8181
- ``torch``
8282
- ``torchmetrics``
8383
- Python
84+
* - 2.2
85+
- 2.2
86+
- 2.2
87+
- ≥1.13, ≤2.2
88+
- ≥0.7.0
89+
- ≥3.8, ≤3.11
8490
* - 2.1
8591
- 2.1
8692
- 2.1

‎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.12.0, <2.2.0
5+
torch >=1.13.0, <2.2.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.13.0, <0.17.0
4+
torchvision >=0.14.0, <0.17.0
55
torchmetrics >=0.10.0, <1.3.0
66
lightning-utilities >=0.8.0, <0.10.0

0 commit comments

Comments
 (0)