Merge branch 'master' into pytorch_2.9_warning_comp

bhimrazy · web-flow · commit a24161eb7aa0 · 2025-11-19T19:13:03.000+05:45
diff --git a/.github/workflows/_legacy-checkpoints.yml b/.github/workflows/_legacy-checkpoints.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           # TODO: Avoid activating environment like this
           # see: https://github.com/astral-sh/setup-uv/tree/v6/?tab=readme-ov-file#activate-environment
           activate-environment: true
diff --git a/.github/workflows/ci-pkg-install.yml b/.github/workflows/ci-pkg-install.yml
@@ -44,7 +44,7 @@ jobs:
       matrix:
         os: ["ubuntu-22.04", "macOS-14", "windows-2022"]
         pkg-name: ["fabric", "pytorch", "lightning", "notset"]
-        python-version: ["3.9", "3.11"]
+        python-version: ["3.10", "3.11"]
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
@@ -40,23 +40,20 @@ jobs:
       matrix:
         os: [macOS-14, ubuntu-22.04, windows-2022]
         config:
-          # only run PyTorch latest
+          # Test unified "lightning" package with PyTorch 2.1-2.5
           - { pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
           - { pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
           - { pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
           - { pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
           - { pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
 
-          # only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
+          # Test "fabric" package with PyTorch 2.6-2.9
           - { pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
-
-          # "fabric" installs the standalone package
-          - { pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.7" }
-
-          # adding recently cut Torch 2.7 - FUTURE
+          - { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
           - { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.8" }
+          - { pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.9" }
 
-          # "oldest" versions tests, only on minimum Python
+          # Test minimum supported versions (oldest)
           - { pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
     timeout-minutes: 25 # because of building grpcio on Mac
     env:
@@ -73,7 +70,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:
-          python-version: ${{ matrix.config.python-version || '3.9' }}
+          python-version: ${{ matrix.config.python-version || '3.10' }}
           # TODO: Avoid activating environment like this
           # see: https://github.com/astral-sh/setup-uv/tree/v6/?tab=readme-ov-file#activate-environment
           activate-environment: true
diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml
@@ -44,23 +44,20 @@ jobs:
       matrix:
         os: [macOS-14, ubuntu-22.04, windows-2022]
         config:
-          # only run PyTorch latest
+          # Test unified "lightning" package with PyTorch 2.1-2.5
           - { pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
           - { pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2.2" }
           - { pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.3" }
           - { pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.4.1" }
           - { pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
 
-          # only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
+          # Test "pytorch" package with PyTorch 2.6-2.9
           - { pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
-
-          # "pytorch" installs the standalone package
-          - { pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.7" }
-
-          # adding recently cut Torch 2.7 - FUTURE
+          - { pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
           - { pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.8" }
+          - { pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.9" }
 
-          # "oldest" versions tests, only on minimum Python
+          # Test minimum supported versions (oldest)
           - { pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
     timeout-minutes: 50
     env:
@@ -78,7 +75,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v7
         with:
-          python-version: ${{ matrix.config.python-version || '3.9' }}
+          python-version: ${{ matrix.config.python-version || '3.10' }}
           # TODO: Avoid activating environment like this
           # see: https://github.com/astral-sh/setup-uv/tree/v6/?tab=readme-ov-file#activate-environment
           activate-environment: true
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Convert actual version to nightly
         run: |
diff --git a/.github/workflows/release-pkg.yml b/.github/workflows/release-pkg.yml
@@ -24,7 +24,7 @@ defaults:
 env:
   FREEZE_REQUIREMENTS: 1
   TORCH_URL: "https://download.pytorch.org/whl/cpu/"
-  PYTHON_VER: "3.9"
+  PYTHON_VER: "3.10"
 
 jobs:
   build-packages:
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -31,7 +31,7 @@ sphinx:
 build:
   os: ubuntu-20.04
   tools:
-    python: "3.9"
+    python: "3.10"
   apt_packages:
     - texlive-latex-extra
     - dvipng
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -3,7 +3,7 @@ myst-parser >=0.18.1, <5.0.0
 nbsphinx >=0.8.5, <=0.9.7
 nbconvert >7.14, <7.17
 pandoc >=1.0, <=2.4
-docutils>=0.18.1,<=0.22.2
+docutils>=0.18.1,<=0.22.3
 sphinxcontrib-fulltoc >=1.0, <=1.2.0
 sphinxcontrib-mockautodoc
 sphinx-autobuild
diff --git a/requirements/pytorch/docs.txt b/requirements/pytorch/docs.txt
@@ -1,7 +1,7 @@
 -r ../docs.txt
 
 nbformat  # used for generate empty notebook
-ipython[notebook] <9.7.0
+ipython[notebook] <9.8.0
 setuptools<81.0  # workaround for `error in ipython setup command: use_2to3 is invalid.`
 
 onnxscript >= 0.2.2, < 0.6.0
diff --git a/requirements/pytorch/extra.txt b/requirements/pytorch/extra.txt
@@ -6,6 +6,6 @@ matplotlib>3.1, <3.11.0
 omegaconf >=2.2.3, <2.4.0
 hydra-core >=1.2.0, <1.4.0
 jsonargparse[signatures,jsonnet] >=4.39.0, <4.43.0
-rich >=12.3.0, <14.2.0
+rich >=12.3.0, <14.3.0
 tensorboardX >=2.2, <2.7.0  # min version is set by torch.onnx missing attribute
 bitsandbytes >=0.45.2,<0.47.0; platform_system != "Darwin"
diff --git a/src/lightning/pytorch/utilities/imports.py b/src/lightning/pytorch/utilities/imports.py
@@ -28,6 +28,7 @@
 _TORCHMETRICS_GREATER_EQUAL_0_11 = RequirementCache("torchmetrics>=0.11.0")  # using new API with task
 _TORCHMETRICS_GREATER_EQUAL_1_0_0 = RequirementCache("torchmetrics>=1.0.0")
 _TORCH_EQUAL_2_8 = RequirementCache("torch>=2.8.0,<2.9.0")
+_TORCH_EQUAL_2_9 = RequirementCache("torch>=2.9.0,<2.10.0")
 
 _OMEGACONF_AVAILABLE = package_available("omegaconf")
 _TORCHVISION_AVAILABLE = RequirementCache("torchvision")
diff --git a/tests/legacy/generate_checkpoints.sh b/tests/legacy/generate_checkpoints.sh
@@ -36,7 +36,6 @@ do
   source $ENV_PATH/bin/activate
 
   uv pip install "pytorch_lightning==$pl_ver" \
-    -r $LEGACY_FOLDER/requirements.txt \
     -r "$(dirname $TESTS_FOLDER)/requirements/pytorch/test.txt" \
     -f https://download.pytorch.org/whl/cpu/torch_stable.html
 
@@ -52,7 +51,6 @@ if [[ -z "$@" ]]; then
   printf "\n\n processing local version\n"
 
   uv pip install \
-    -r $LEGACY_FOLDER/requirements.txt \
     -r "$(dirname $TESTS_FOLDER)/requirements/pytorch/test.txt" \
     -f https://download.pytorch.org/whl/cpu/torch_stable.html
   pl_ver="local"
diff --git a/tests/legacy/requirements.txt b/tests/legacy/requirements.txt
diff --git a/tests/tests_pytorch/helpers/runif.py b/tests/tests_pytorch/helpers/runif.py
@@ -14,7 +14,7 @@
 import pytest
 
 from lightning.fabric.utilities.imports import _IS_WINDOWS
-from lightning.pytorch.utilities.imports import _TORCH_EQUAL_2_8
+from lightning.pytorch.utilities.imports import _TORCH_EQUAL_2_8, _TORCH_EQUAL_2_9
 from lightning.pytorch.utilities.testing import _runif_reasons
 
 
@@ -27,6 +27,6 @@ def RunIf(**kwargs):
 _xfail_gloo_windows = pytest.mark.xfail(
     RuntimeError,
     strict=True,
-    condition=(_IS_WINDOWS and _TORCH_EQUAL_2_8),
+    condition=(_IS_WINDOWS and (_TORCH_EQUAL_2_8 or _TORCH_EQUAL_2_9)),
     reason="makeDeviceForHostname(): unsupported gloo device",
 )
