Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for PyTorch 1.11 #18691

Merged
merged 15 commits into from
Oct 4, 2023
Merged

Drop support for PyTorch 1.11 #18691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
21c19a9
drop support for PyTorch 1.11
awaelchli Oct 2, 2023
0c46fe6
chlog
awaelchli Oct 2, 2023
13cda6b
remove dead code
awaelchli Oct 2, 2023
9971327
remove runif decorations
awaelchli Oct 2, 2023
beaf302
more
awaelchli Oct 2, 2023
e546b0e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 2, 2023
fc1d14c
fix missing import
awaelchli Oct 2, 2023
5f3f86d
Merge remote-tracking branch 'origin/feature/drop-torch-1-11' into fe…
awaelchli Oct 2, 2023
e7946bf
readme
awaelchli Oct 2, 2023
ec94989
fix version
awaelchli Oct 2, 2023
e250856
fix weird import issue
awaelchli Oct 2, 2023
ca65771
missed version bump
awaelchli Oct 2, 2023
76cfc0c
Merge branch 'master' into feature/drop-torch-1-11
awaelchli Oct 3, 2023
d62bced
Merge branch 'master' into feature/drop-torch-1-11
Borda Oct 3, 2023
3c91127
bump torchvision
awaelchli Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/checkgroup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,18 @@ subprojects:
- "!*.md"
- "!**/*.md"
checks:
- "pl-cpu (macOS-11, lightning, 3.8, 1.11)"
- "pl-cpu (macOS-11, lightning, 3.8, 1.12, oldest)"
- "pl-cpu (macOS-11, lightning, 3.9, 1.12)"
awaelchli marked this conversation as resolved.
Show resolved Hide resolved
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
- "pl-cpu (macOS-11, lightning, 3.10, 2.0)"
- "pl-cpu (macOS-11, lightning, 3.8, 1.11, oldest)"
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11)"
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest)"
- "pl-cpu (ubuntu-20.04, lightning, 3.9, 1.12)"
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest)"
- "pl-cpu (windows-2022, lightning, 3.8, 1.11)"
- "pl-cpu (windows-2022, lightning, 3.8, 1.12, oldest)"
- "pl-cpu (windows-2022, lightning, 3.9, 1.12)"
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
- "pl-cpu (windows-2022, lightning, 3.10, 2.0)"
- "pl-cpu (windows-2022, lightning, 3.8, 1.11, oldest)"
- "pl-cpu (macOS-11, pytorch, 3.8, 1.13)"
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13)"
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13)"
Expand Down Expand Up @@ -189,21 +186,18 @@ subprojects:
- "!*.md"
- "!**/*.md"
checks:
- "fabric-cpu (macOS-11, lightning, 3.8, 1.11)"
- "fabric-cpu (macOS-11, lightning, 3.8, 1.12, oldest)"
- "fabric-cpu (macOS-11, lightning, 3.9, 1.12)"
- "fabric-cpu (macOS-11, lightning, 3.10, 1.13)"
- "fabric-cpu (macOS-11, lightning, 3.10, 2.0)"
- "fabric-cpu (macOS-11, lightning, 3.8, 1.11, oldest)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.11)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.12, oldest)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.9, 1.12)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.11, oldest)"
- "fabric-cpu (windows-2022, lightning, 3.8, 1.11)"
- "fabric-cpu (windows-2022, lightning, 3.8, 1.12, oldest)"
- "fabric-cpu (windows-2022, lightning, 3.9, 1.12)"
- "fabric-cpu (windows-2022, lightning, 3.10, 1.13)"
- "fabric-cpu (windows-2022, lightning, 3.10, 2.0)"
- "fabric-cpu (windows-2022, lightning, 3.8, 1.11, oldest)"
- "fabric-cpu (macOS-11, fabric, 3.8, 1.13)"
- "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13)"
- "fabric-cpu (windows-2022, fabric, 3.8, 1.13)"
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/ci-tests-fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,10 @@ jobs:
fail-fast: false
matrix:
include:
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11" }
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
# only run PyTorch latest with Python recent
Expand All @@ -60,21 +57,21 @@ jobs:
os: "macOS-11",
pkg-name: "lightning",
python-version: "3.8",
pytorch-version: "1.11",
pytorch-version: "1.12",
requires: "oldest",
}
- {
os: "ubuntu-20.04",
pkg-name: "lightning",
python-version: "3.8",
pytorch-version: "1.11",
pytorch-version: "1.12",
requires: "oldest",
}
- {
os: "windows-2022",
pkg-name: "lightning",
python-version: "3.8",
pytorch-version: "1.11",
pytorch-version: "1.12",
requires: "oldest",
}
# "fabric" installs the standalone package
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/ci-tests-pytorch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,10 @@ jobs:
fail-fast: false
matrix:
include:
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11" }
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.8", pytorch-version: "1.11" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.9", pytorch-version: "1.12" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
# only run PyTorch latest with Python recent
Expand All @@ -64,21 +61,21 @@ jobs:
os: "macOS-11",
pkg-name: "lightning",
python-version: "3.8",
pytorch-version: "1.11",
pytorch-version: "1.12",
requires: "oldest",
}
- {
os: "ubuntu-20.04",
pkg-name: "lightning",
python-version: "3.8",
pytorch-version: "1.11",
pytorch-version: "1.12",
requires: "oldest",
}
- {
os: "windows-2022",
pkg-name: "lightning",
python-version: "3.8",
pytorch-version: "1.11",
pytorch-version: "1.12",
requires: "oldest",
}
# "pytorch" installs the standalone package
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,14 +598,14 @@ Lightning is rigorously tested across multiple CPUs, GPUs, TPUs, IPUs, and HPUs

<center>

| System / PyTorch ver. | 1.11 | 1.12 | 1.13 | 2.0 |
awaelchli marked this conversation as resolved.
Show resolved Hide resolved
| :--------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
| Linux py3.9 \[GPUs\] | - | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | Soon |
| 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) | | Soon |
| Linux py3.8 \[IPUs\] | - | - | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(IPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=25&branchName=master) | Soon |
| 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) | Soon |
| 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) | Soon |
| 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) | Soon |
| System / PyTorch ver. | 1.12 | 1.13 | 2.0 | 2.1 |
| :--------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----: |
| Linux py3.9 \[GPUs\] | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(GPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) | Soon |
| 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) | | | Soon |
| Linux py3.8 \[IPUs\] | - | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(IPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=25&branchName=master) | [![Build Status](<https://dev.azure.com/Lightning-AI/lightning/_apis/build/status/pytorch-lightning%20(IPUs)?branchName=master>)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=25&branchName=master) | Soon |
| 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) | Soon |
| 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) | Soon |
| 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) | Soon |

</center>
</details>
Expand Down
2 changes: 1 addition & 1 deletion dockers/release/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

ARG PYTHON_VERSION=3.9
ARG PYTORCH_VERSION=1.11
ARG PYTORCH_VERSION=1.12
ARG CUDA_VERSION=11.3.1

FROM pytorchlightning/pytorch_lightning:base-cuda-py${PYTHON_VERSION}-torch${PYTORCH_VERSION}-cuda${CUDA_VERSION}
Expand Down
6 changes: 6 additions & 0 deletions docs/source-pytorch/versioning.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ The table below indicates the coverage of tested versions in our CI. Versions ou
- ``torch``
- ``torchmetrics``
- Python
* - 2.1
- 2.1
- 2.1
- ≥1.12, ≤2.1
- ≥0.7.0
- ≥3.8, ≤3.11
* - 2.0
- 2.0
- 2.0 (GA)
Expand Down
2 changes: 1 addition & 1 deletion requirements/fabric/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

numpy >=1.17.2, <1.27.0
torch >=1.11.0, <2.1.0
torch >=1.12.0, <2.1.0
awaelchli marked this conversation as resolved.
Show resolved Hide resolved
fsspec[http]>2021.06.0, <2023.10.0
packaging >=20.0, <=23.1
typing-extensions >=4.0.0, <4.8.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/fabric/examples.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

torchvision >=0.12.0, <0.16.0
torchvision >=0.13.0, <0.16.0
torchmetrics >=0.10.0, <1.1.0
lightning-utilities >=0.8.0, <0.10.0
2 changes: 1 addition & 1 deletion requirements/pytorch/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

numpy >=1.17.2, <1.27.0
torch >=1.11.0, <2.1.0
torch >=1.12.0, <2.1.0
tqdm >=4.57.0, <4.67.0
PyYAML >=5.4, <6.1.0
fsspec[http] >2021.06.0, <2023.10.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/pytorch/examples.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: the upper bound for the package version is only set for CI stability, and it is dropped while installing this package
# in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment

torchvision >=0.12.0, <0.16.0
torchvision >=0.13.0, <0.16.0
gym[classic_control] >=0.17.0, <0.27.0
ipython[all] <8.15.0
torchmetrics >=0.10.0, <1.1.0
Expand Down
Loading