Drop PyTorch 2.0 from the test matrix (#20009)

Lightning-AI · Jun 30, 2024 · 14493c0 · 14493c0
1 parent 5636fe4
commit 14493c0
Show file tree

Hide file tree

Showing 42 changed files with 118 additions and 295 deletions.
diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
@@ -19,29 +19,23 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "pl-cpu (macOS-13, lightning, 3.8, 2.0, oldest)"
-      - "pl-cpu (macOS-14, lightning, 3.10, 2.0)"
+      - "pl-cpu (macOS-13, lightning, 3.8, 2.1, oldest)"
       - "pl-cpu (macOS-14, lightning, 3.10, 2.1)"
       - "pl-cpu (macOS-14, lightning, 3.10, 2.2)"
       - "pl-cpu (macOS-14, lightning, 3.10, 2.3)"
-      - "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.8, 2.1, oldest)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.2)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.3)"
-      - "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.8, 2.1, oldest)"
       - "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
       - "pl-cpu (windows-2022, lightning, 3.10, 2.2)"
       - "pl-cpu (windows-2022, lightning, 3.10, 2.3)"
-      - "pl-cpu (macOS-14, 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-14, pytorch, 3.8, 2.1)"
+      - "pl-cpu (ubuntu-20.04, pytorch, 3.8, 2.1)"
+      - "pl-cpu (windows-2022, pytorch, 3.8, 2.1)"
       - "pl-cpu (macOS-12, pytorch, 3.11, 2.1)"
-      - "pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0)"
       - "pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.1)"
-      - "pl-cpu (windows-2022, pytorch, 3.11, 2.0)"
       - "pl-cpu (windows-2022, pytorch, 3.11, 2.1)"
 
   - id: "pytorch_lightning: Azure GPU"
@@ -144,13 +138,11 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "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.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)"
@@ -171,29 +163,23 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "fabric-cpu (macOS-13, lightning, 3.8, 2.0, oldest)"
-      - "fabric-cpu (macOS-14, lightning, 3.10, 2.0)"
+      - "fabric-cpu (macOS-13, lightning, 3.8, 2.1, oldest)"
       - "fabric-cpu (macOS-14, lightning, 3.11, 2.1)"
       - "fabric-cpu (macOS-14, lightning, 3.11, 2.2)"
       - "fabric-cpu (macOS-14, lightning, 3.10, 2.3)"
-      - "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.8, 2.1, oldest)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
-      - "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.8, 2.1, oldest)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.1)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.3)"
-      - "fabric-cpu (macOS-14, 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-14, fabric, 3.8, 2.1)"
+      - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 2.1)"
+      - "fabric-cpu (windows-2022, fabric, 3.8, 2.1)"
       - "fabric-cpu (macOS-12, fabric, 3.11, 2.1)"
-      - "fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0)"
       - "fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.1)"
-      - "fabric-cpu (windows-2022, fabric, 3.11, 2.0)"
       - "fabric-cpu (windows-2022, fabric, 3.11, 2.1)"
 
   - id: "lightning_fabric: Azure GPU"

diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
@@ -39,9 +39,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: "macOS-14", 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-14", 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" }
@@ -53,32 +50,29 @@ jobs:
           - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
           - { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
           # only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
-          - { os: "macOS-12", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0" }
-          - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0" }
-          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.0" }
           - { os: "macOS-12", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" }
           - { 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-13", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
+          - { os: "macOS-13", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.1", requires: "oldest" }
           - {
               os: "ubuntu-20.04",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "2.0",
+              pytorch-version: "2.1",
               requires: "oldest",
             }
           - {
               os: "windows-2022",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "2.0",
+              pytorch-version: "2.1",
               requires: "oldest",
             }
           # "fabric" installs the standalone package
-          - { os: "macOS-14", 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" }
+          - { os: "macOS-14", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.1" }
+          - { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.1" }
+          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.1" }
     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,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: "macOS-14", 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-14", 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" }
@@ -57,32 +54,29 @@ jobs:
           - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.3" }
           - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.3" }
           # only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
-          - { os: "macOS-12", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.0" }
-          - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.0" }
-          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.0" }
           - { os: "macOS-12", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" }
           - { 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-13", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" }
+          - { os: "macOS-13", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.1", requires: "oldest" }
           - {
               os: "ubuntu-20.04",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "2.0",
+              pytorch-version: "2.1",
               requires: "oldest",
             }
           - {
               os: "windows-2022",
               pkg-name: "lightning",
               python-version: "3.8",
-              pytorch-version: "2.0",
+              pytorch-version: "2.1",
               requires: "oldest",
             }
           # "pytorch" installs the standalone package
-          - { os: "macOS-14", 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" }
+          - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.1" }
+          - { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.1" }
+          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.1" }
     timeout-minutes: 50
     env:
       PACKAGE_NAME: ${{ matrix.pkg-name }}

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -43,7 +43,6 @@ jobs:
         include:
           # We only release one docker image per PyTorch version.
           # Make sure the matrix here matches the one below.
-          - { 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" }
@@ -104,7 +103,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.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" }

diff --git a/docs/source-fabric/advanced/compile.rst b/docs/source-fabric/advanced/compile.rst
@@ -5,10 +5,6 @@ Speed up models by compiling them
 Compiling your PyTorch model can result in significant speedups, especially on the latest generations of GPUs.
 This guide shows you how to apply `torch.compile <https://pytorch.org/docs/2.2/generated/torch.compile.html>`_ correctly in your code.
 
-.. note::
-
-    This requires PyTorch >= 2.0.
-
 
 ----
 

diff --git a/docs/source-fabric/advanced/model_init.rst b/docs/source-fabric/advanced/model_init.rst
@@ -81,4 +81,4 @@ When training distributed models with :doc:`FSDP/TP <model_parallel/index>` or D
 
 .. note::
     Empty-init is experimental and the behavior may change in the future.
-    For distributed models on PyTorch 2.1+, it is required that all user-defined modules that manage parameters implement a ``reset_parameters()`` method (all PyTorch built-in modules have this too).
+    For distributed models, it is required that all user-defined modules that manage parameters implement a ``reset_parameters()`` method (all PyTorch built-in modules have this too).
diff --git a/docs/source-pytorch/advanced/compile.rst b/docs/source-pytorch/advanced/compile.rst
@@ -5,10 +5,6 @@ Speed up models by compiling them
 Compiling your LightningModule can result in significant speedups, especially on the latest generations of GPUs.
 This guide shows you how to apply `torch.compile <https://pytorch.org/docs/2.2/generated/torch.compile.html>`_ correctly in your code.
 
-.. note::
-
-    This requires PyTorch >= 2.0.
-
 
 ----
 

diff --git a/requirements/fabric/base.txt b/requirements/fabric/base.txt
@@ -1,8 +1,8 @@
 # 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
 
-numpy >=1.17.2, <1.27.0
-torch >=2.0.0, <2.4.0
+numpy >=1.21.0, <1.27.0
+torch >=2.1.0, <2.4.0
 fsspec[http] >=2022.5.0, <2024.4.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.15.0, <0.19.0
+torchvision >=0.16.0, <0.19.0
 torchmetrics >=0.10.0, <1.3.0
 lightning-utilities >=0.8.0, <0.12.0
diff --git a/requirements/pytorch/base.txt b/requirements/pytorch/base.txt
@@ -1,8 +1,8 @@
 # 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
 
-numpy >=1.17.2, <1.27.0
-torch >=2.0.0, <2.4.0
+numpy >=1.21.0, <1.27.0
+torch >=2.1.0, <2.4.0
 tqdm >=4.57.0, <4.67.0
 PyYAML >=5.4, <6.1.0
 fsspec[http] >=2022.5.0, <2024.4.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.15.0, <0.19.0
+torchvision >=0.16.0, <0.19.0
 ipython[all] <8.15.0
 torchmetrics >=0.10.0, <1.3.0
 lightning-utilities >=0.8.0, <0.12.0
diff --git a/requirements/pytorch/test.txt b/requirements/pytorch/test.txt
@@ -8,8 +8,8 @@ pytest-random-order ==1.1.0
 # needed in tests
 cloudpickle >=1.3, <2.3.0
 scikit-learn >0.22.1, <1.4.0
-onnx >=0.14.0, <1.15.0
-onnxruntime >=0.15.0, <1.17.0
+onnx >=1.12.0, <1.15.0
+onnxruntime >=1.12.0, <1.17.0
 psutil <5.9.6 # for `DeviceStatsMonitor`
 pandas >1.0, <2.2.0  # needed in benchmarks
 fastapi  # for `ServableModuleValidator`  # not setting version as re-defined in App

diff --git a/src/lightning/fabric/CHANGELOG.md b/src/lightning/fabric/CHANGELOG.md
@@ -27,7 +27,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 
--
+- Removed support for PyTorch 2.1 ([#20009](https://github.com/Lightning-AI/lightning/pull/20009))
+
 
 -
 

diff --git a/src/lightning/fabric/__init__.py b/src/lightning/fabric/__init__.py
@@ -21,7 +21,7 @@
     _logger.propagate = False
 
 
-# In PyTorch 2.0+, setting this variable will force `torch.cuda.is_available()` and `torch.cuda.device_count()`
+# Setting this variable will force `torch.cuda.is_available()` and `torch.cuda.device_count()`
 # to use an NVML-based implementation that doesn't poison forks.
 # https://github.com/pytorch/pytorch/issues/83973
 os.environ["PYTORCH_NVML_BASED_CUDA_CHECK"] = "1"

diff --git a/src/lightning/fabric/fabric.py b/src/lightning/fabric/fabric.py
@@ -225,8 +225,7 @@ def setup(
             _reapply_compile: If ``True`` (default), and the model was ``torch.compile``d before, the
                 corresponding :class:`~torch._dynamo.OptimizedModule` wrapper will be removed and reapplied with the
                 same settings after the model was set up by the strategy (e.g., after the model was wrapped by DDP,
-                FSDP etc.). Only applies on PyTorch >= 2.1. Set it to ``False`` if compiling DDP/FSDP is causing
-                issues.
+                FSDP etc.). Set it to ``False`` if compiling DDP/FSDP is causing issues.
 
         Returns:
             The tuple containing wrapped module and the optimizers, in the same order they were passed in.
@@ -292,8 +291,7 @@ def setup_module(
             _reapply_compile: If ``True`` (default), and the model was ``torch.compile``d before, the
                 corresponding :class:`~torch._dynamo.OptimizedModule` wrapper will be removed and reapplied with the
                 same settings after the model was set up by the strategy (e.g., after the model was wrapped by DDP,
-                FSDP etc.). Only applies on PyTorch >= 2.1. Set it to ``False`` if compiling DDP/FSDP is causing
-                issues.
+                FSDP etc.). Set it to ``False`` if compiling DDP/FSDP is causing issues.
         Returns:
             The wrapped model.
-Original file line number
+Diff line change
@@ Expand Up @@
     ### Removed
-    -
+    - Removed support for PyTorch 2.1 ([#20009](https://github.com/Lightning-AI/lightning/pull/20009))
     -
@@ Expand Down @@