Remove support for PyTorch 1.13 (#19706)

Lightning-AI · Apr 27, 2024 · 5e0e02b · 5e0e02b
1 parent b9680a3
commit 5e0e02b
Show file tree

Hide file tree

Showing 66 changed files with 221 additions and 871 deletions.
diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
@@ -19,21 +19,21 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "pl-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
-      - "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
+      - "pl-cpu (macOS-11, lightning, 3.8, 2.0, oldest)"
+      - "pl-cpu (macOS-11, lightning, 3.10, 2.0)"
       - "pl-cpu (macOS-11, lightning, 3.10, 2.1)"
       - "pl-cpu (macOS-11, lightning, 3.10, 2.2)"
-      - "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
-      - "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
+      - "pl-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)"
+      - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.2)"
-      - "pl-cpu (windows-2022, lightning, 3.8, 1.13, oldest)"
-      - "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
+      - "pl-cpu (windows-2022, lightning, 3.8, 2.0, oldest)"
+      - "pl-cpu (windows-2022, lightning, 3.10, 2.0)"
       - "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
       - "pl-cpu (windows-2022, lightning, 3.10, 2.2)"
-      - "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)"
+      - "pl-cpu (macOS-11, pytorch, 3.8, 2.0)"
+      - "pl-cpu (ubuntu-20.04, pytorch, 3.8, 2.0)"
+      - "pl-cpu (windows-2022, pytorch, 3.8, 2.0)"
       - "pl-cpu (macOS-12, pytorch, 3.11, 2.0)"
       - "pl-cpu (macOS-12, pytorch, 3.11, 2.1)"
       - "pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0)"
@@ -140,15 +140,17 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "build-cuda (3.9, 1.13, 11.8.0)"
-      - "build-cuda (3.9, 1.13, 12.0.1)"
       - "build-cuda (3.10, 2.0, 11.8.0)"
       - "build-cuda (3.10, 2.1, 12.1.0)"
+      - "build-cuda (3.10, 2.2, 12.1.0)"
+      - "build-cuda (3.11, 2.1, 12.1.0)"
+      - "build-cuda (3.11, 2.2, 12.1.0)"
       #- "build-NGC"
-      - "build-pl (3.9, 1.13, 11.8.0)"
-      - "build-pl (3.9, 1.13, 12.0.1)"
       - "build-pl (3.10, 2.0, 11.8.0)"
       - "build-pl (3.10, 2.1, 12.1.0)"
+      - "build-pl (3.10, 2.2, 12.1.0)"
+      - "build-pl (3.11, 2.1, 12.1.0)"
+      - "build-pl (3.11, 2.2, 12.1.0)"
 
   # SECTION: lightning_fabric
 
@@ -165,21 +167,21 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
-      - "fabric-cpu (macOS-11, lightning, 3.10, 1.13)"
+      - "fabric-cpu (macOS-11, lightning, 3.8, 2.0, oldest)"
+      - "fabric-cpu (macOS-11, lightning, 3.10, 2.0)"
       - "fabric-cpu (macOS-11, lightning, 3.11, 2.1)"
       - "fabric-cpu (macOS-11, lightning, 3.11, 2.2)"
-      - "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
-      - "fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
+      - "fabric-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)"
+      - "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
-      - "fabric-cpu (windows-2022, lightning, 3.8, 1.13, oldest)"
-      - "fabric-cpu (windows-2022, lightning, 3.10, 1.13)"
+      - "fabric-cpu (windows-2022, lightning, 3.8, 2.0, oldest)"
+      - "fabric-cpu (windows-2022, lightning, 3.10, 2.0)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.1)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
-      - "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)"
+      - "fabric-cpu (macOS-11, fabric, 3.8, 2.0)"
+      - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 2.0)"
+      - "fabric-cpu (windows-2022, fabric, 3.8, 2.0)"
       - "fabric-cpu (macOS-12, fabric, 3.11, 2.0)"
       - "fabric-cpu (macOS-12, fabric, 3.11, 2.1)"
       - "fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0)"

diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
@@ -39,9 +39,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
-          - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
-          - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
+          - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
+          - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
+          - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
           # only run PyTorch latest
           - { os: "macOS-11", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" }
           - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" }
@@ -57,31 +57,25 @@ jobs:
           - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
           - { os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
           # "oldest" versions tests, only on minimum Python
-          - {
-              os: "macOS-11",
-              pkg-name: "lightning",
-              python-version: "3.8",
-              pytorch-version: "1.13",
-              requires: "oldest",
-            }
+          - { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
           - {
               os: "ubuntu-20.04",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "1.13",
+              pytorch-version: "2.0",
               requires: "oldest",
             }
           - {
               os: "windows-2022",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "1.13",
+              pytorch-version: "2.0",
               requires: "oldest",
             }
           # "fabric" installs the standalone package
-          - { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
-          - { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
-          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
+          - { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
+          - { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
+          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" }
     timeout-minutes: 25 # because of building grpcio on Mac
     env:
       PACKAGE_NAME: ${{ matrix.pkg-name }}

diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml
@@ -43,9 +43,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
-          - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
-          - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
+          - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
+          - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
+          - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" }
           # only run PyTorch latest
           - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
           - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
@@ -61,31 +61,25 @@ jobs:
           - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" }
           - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" }
           # "oldest" versions tests, only on minimum Python
-          - {
-              os: "macOS-11",
-              pkg-name: "lightning",
-              python-version: "3.8",
-              pytorch-version: "1.13",
-              requires: "oldest",
-            }
+          - { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
           - {
               os: "ubuntu-20.04",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "1.13",
+              pytorch-version: "2.0",
               requires: "oldest",
             }
           - {
               os: "windows-2022",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "1.13",
+              pytorch-version: "2.0",
               requires: "oldest",
             }
           # "pytorch" installs the standalone package
-          - { os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
-          - { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
-          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
+          - { os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" }
+          - { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" }
+          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" }
     timeout-minutes: 50
     env:
       PACKAGE_NAME: ${{ matrix.pkg-name }}

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -43,10 +43,11 @@ jobs:
         include:
           # We only release one docker image per PyTorch version.
           # Make sure the matrix here matches the one below.
-          - { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
-          - { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
           - { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
           - { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
+          - { python_version: "3.10", pytorch_version: "2.2", cuda_version: "12.1.0" }
+          - { python_version: "3.11", pytorch_version: "2.1", cuda_version: "12.1.0" }
+          - { python_version: "3.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
     steps:
       - uses: actions/checkout@v4
         with:
@@ -103,8 +104,6 @@ jobs:
         include:
           # These are the base images for PL release docker images.
           # Make sure the matrix here matches the one above.
-          - { python_version: "3.9", pytorch_version: "1.13", cuda_version: "11.8.0" }
-          - { python_version: "3.9", pytorch_version: "1.13", cuda_version: "12.0.1" }
           - { python_version: "3.10", pytorch_version: "2.0", cuda_version: "11.8.0" }
           - { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
           - { python_version: "3.10", pytorch_version: "2.2", cuda_version: "12.1.0" }

diff --git a/dockers/release/Dockerfile b/dockers/release/Dockerfile
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG PYTHON_VERSION=3.9
-ARG PYTORCH_VERSION=1.13
-ARG CUDA_VERSION=11.3.1
+ARG PYTHON_VERSION=3.10
+ARG PYTORCH_VERSION=2.0
+ARG CUDA_VERSION=11.8.0
 
 FROM pytorchlightning/pytorch_lightning:base-cuda-py${PYTHON_VERSION}-torch${PYTORCH_VERSION}-cuda${CUDA_VERSION}
 

diff --git a/requirements/fabric/base.txt b/requirements/fabric/base.txt
@@ -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.13.0, <2.3.0
+torch >=2.0.0, <2.3.0
 fsspec[http] >=2022.5.0, <2023.11.0
 packaging >=20.0, <=23.1
 typing-extensions >=4.4.0, <4.10.0

diff --git a/requirements/fabric/examples.txt b/requirements/fabric/examples.txt
@@ -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.14.0, <0.18.0
+torchvision >=0.15.0, <0.18.0
 torchmetrics >=0.10.0, <1.3.0
 lightning-utilities >=0.8.0, <0.12.0
diff --git a/requirements/fabric/strategies.txt b/requirements/fabric/strategies.txt
@@ -5,5 +5,5 @@
 
 # note: is a bug around 0.10 with `MPS_Accelerator must implement all abstract methods`
 #  shall be resolved by https://github.com/microsoft/DeepSpeed/issues/4372
-deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows"  # strict
+deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows" and platform_system != "Darwin"  # strict
 bitsandbytes >=0.42.0,<0.43.0
diff --git a/requirements/pytorch/base.txt b/requirements/pytorch/base.txt
@@ -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.13.0, <2.3.0
+torch >=2.0.0, <2.3.0
 tqdm >=4.57.0, <4.67.0
 PyYAML >=5.4, <6.1.0
 fsspec[http] >=2022.5.0, <2023.11.0

diff --git a/requirements/pytorch/examples.txt b/requirements/pytorch/examples.txt
@@ -2,7 +2,7 @@
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
 requests <2.32.0
-torchvision >=0.14.0, <0.18.0
+torchvision >=0.15.0, <0.18.0
 gym[classic_control] >=0.17.0, <0.27.0
 ipython[all] <8.15.0
 torchmetrics >=0.10.0, <1.3.0

diff --git a/requirements/pytorch/strategies.txt b/requirements/pytorch/strategies.txt
@@ -3,4 +3,4 @@
 
 # note: is a bug around 0.10 with `MPS_Accelerator must implement all abstract methods`
 #  shall be resolved by https://github.com/microsoft/DeepSpeed/issues/4372
-deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows"  # strict
+deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows" and platform_system != "Darwin"  # strict
diff --git a/src/lightning/fabric/CHANGELOG.md b/src/lightning/fabric/CHANGELOG.md
@@ -39,7 +39,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 
--
+- Removed support for PyTorch 1.13 ([#19706](https://github.com/Lightning-AI/lightning/pull/19706))
 
 -