Merge branch 'master' into feat/19761_apply_ignore_save_params

Author: lantiga

.actions/assistant.py

@@ -18,10 +18,11 @@
 import shutil
 import tempfile
 import urllib.request
+from collections.abc import Iterable, Iterator, Sequence
 from itertools import chain
 from os.path import dirname, isfile
 from pathlib import Path
-from typing import Any, Dict, Iterable, Iterator, List, Optional, Sequence, Tuple
+from typing import Any, Optional
 
 from packaging.requirements import Requirement
 from packaging.version import Version
@@ -127,7 +128,7 @@ def _parse_requirements(lines: Iterable[str]) -> Iterator[_RequirementWithCommen
         pip_argument = None
 
 
-def load_requirements(path_dir: str, file_name: str = "base.txt", unfreeze: str = "all") -> List[str]:
+def load_requirements(path_dir: str, file_name: str = "base.txt", unfreeze: str = "all") -> list[str]:
     """Loading requirements from a file.
 
     >>> path_req = os.path.join(_PROJECT_ROOT, "requirements")
@@ -222,7 +223,7 @@ def _load_aggregate_requirements(req_dir: str = "requirements", freeze_requireme
         fp.writelines([ln + os.linesep for ln in requires] + [os.linesep])
 
 
-def _retrieve_files(directory: str, *ext: str) -> List[str]:
+def _retrieve_files(directory: str, *ext: str) -> list[str]:
     all_files = []
     for root, _, files in os.walk(directory):
         for fname in files:
@@ -232,7 +233,7 @@ def _retrieve_files(directory: str, *ext: str) -> List[str]:
     return all_files
 
 
-def _replace_imports(lines: List[str], mapping: List[Tuple[str, str]], lightning_by: str = "") -> List[str]:
+def _replace_imports(lines: list[str], mapping: list[tuple[str, str]], lightning_by: str = "") -> list[str]:
     """Replace imports of standalone package to lightning.
 
     >>> lns = [
@@ -320,7 +321,7 @@ def copy_replace_imports(
             fo.writelines(lines)
 
 
-def create_mirror_package(source_dir: str, package_mapping: Dict[str, str]) -> None:
+def create_mirror_package(source_dir: str, package_mapping: dict[str, str]) -> None:
     """Create a mirror package with adjusted imports."""
     # replace imports and copy the code
     mapping = package_mapping.copy()
@@ -480,6 +481,25 @@ def convert_version2nightly(ver_file: str = "src/version.info") -> None:
         with open(ver_file, "w") as fo:
             fo.write(version + os.linesep)
 
+    @staticmethod
+    def generate_docker_tags(
+        release_version: str,
+        python_version: str,
+        torch_version: str,
+        cuda_version: str,
+        docker_project: str = "pytorchlightning/pytorch_lightning",
+        add_latest: bool = False,
+    ) -> None:
+        """Generate docker tags for the given versions."""
+        tags = [f"latest-py{python_version}-torch{torch_version}-cuda{cuda_version}"]
+        if release_version:
+            tags += [f"{release_version}-py{python_version}-torch{torch_version}-cuda{cuda_version}"]
+        if add_latest:
+            tags += ["latest"]
+
+        tags = [f"{docker_project}:{tag}" for tag in tags]
+        print(",".join(tags))
+
 
 if __name__ == "__main__":
     import jsonargparse

.actions/requirements.txt

@@ -1,3 +1,3 @@
-jsonargparse >=4.16.0, <4.28.0
+jsonargparse >=4.16.0, <=4.35.0
 requests
 packaging

.azure/gpu-benchmarks.yml

@@ -75,7 +75,9 @@ jobs:
           pip list
         displayName: "Image info & NVIDIA"
 
-      - bash: pip install -e .[dev] --find-links ${TORCH_URL}
+      - bash: |
+          pip install -e .[dev] --find-links ${TORCH_URL}
+          pip install setuptools==75.6.0 jsonargparse==4.35.0
         env:
           FREEZE_REQUIREMENTS: "1"
         displayName: "Install package"

.azure/gpu-tests-fabric.yml

@@ -107,6 +107,7 @@ jobs:
       - bash: |
           extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
           pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
+          pip install setuptools==75.6.0 jsonargparse==4.35.0
         displayName: "Install package & dependencies"
 
       - bash: |
@@ -134,13 +135,13 @@ jobs:
         condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
         displayName: "Adjust tests & examples"
 
-      - bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest . -v --durations=50
-        workingDirectory: tests/tests_fabric/
+      - bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest tests_fabric/ -v --durations=50
+        workingDirectory: tests/
         displayName: "Testing: fabric standard"
         timeoutInMinutes: "10"
 
-      - bash: bash ../run_standalone_tests.sh "."
-        workingDirectory: tests/tests_fabric/
+      - bash: bash ./run_standalone_tests.sh "tests_fabric"
+        workingDirectory: tests/
         env:
           PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
         displayName: "Testing: fabric standalone"
@@ -157,7 +158,7 @@ jobs:
           ./codecov --token=$(CODECOV_TOKEN) --commit=$(Build.SourceVersion) \
             --flags=gpu,pytest,${COVERAGE_SOURCE} --name="GPU-coverage" --env=linux,azure
           ls -l
-        workingDirectory: tests/tests_fabric/
+        workingDirectory: tests/
         displayName: "Statistics"
 
       - script: |

.azure/gpu-tests-pytorch.yml

@@ -111,6 +111,7 @@ jobs:
       - bash: |
           extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
           pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
+          pip install setuptools==75.6.0 jsonargparse==4.35.0
         displayName: "Install package & dependencies"
 
       - bash: pip uninstall -y lightning
@@ -155,13 +156,13 @@ jobs:
           ls -l checkpoints/
         displayName: "Get legacy checkpoints"
 
-      - bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest -v --durations=50
-        workingDirectory: tests/tests_pytorch
+      - bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest tests_pytorch/ -v --durations=50
+        workingDirectory: tests/
         displayName: "Testing: PyTorch standard"
         timeoutInMinutes: "35"
 
-      - bash: bash ../run_standalone_tests.sh "."
-        workingDirectory: tests/tests_pytorch
+      - bash: bash ./run_standalone_tests.sh "tests_pytorch"
+        workingDirectory: tests/
         env:
           PL_USE_MOCKED_MNIST: "1"
           PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)

.github/CODEOWNERS

@@ -5,39 +5,16 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-* @lantiga @borda @tchaton @awaelchli @justusschock
-
-# CI/CD and configs
-/.actions/                  @borda @ethanwharris @justusschock
-/.github/                   @borda @ethanwharris @justusschock
-/.azure/                    @borda @ethanwharris @justusschock
-/dockers/                   @borda @ethanwharris @justusschock
-*.yml                       @borda @ethanwharris @justusschock
+* @lantiga @borda @tchaton @justusschock @ethanwharris
 
 # Docs
-/docs/                                      @lantiga @borda @awaelchli
-/docs/*/conf.py                             @borda @awaelchli
 /.github/*.md                               @williamfalcon @lantiga @borda
-/.github/ISSUE_TEMPLATE/                    @borda @tchaton @awaelchli
-/docs/source-fabric/conf.py                 @borda @awaelchli
-/docs/source-fabric/index.rst               @awaelchli @lantiga
-/docs/source-pytorch/conf.py                @borda @awaelchli
+/docs/source-fabric/index.rst               @williamfalcon @lantiga
 /docs/source-pytorch/index.rst              @williamfalcon @lantiga
 /docs/source-pytorch/levels                 @williamfalcon @lantiga
 
-# PyTorch Lightning
-/src/lightning/pytorch                      @lantiga @borda @tchaton @awaelchli @justusschock
-
-# Lightning Data
-/src/lightning/data/                        @tchaton @lantiga
-
-# Lightning Fabric
-/src/lightning/fabric                       @lantiga @borda @tchaton @awaelchli @justusschock
-
 /.github/CODEOWNERS                  @williamfalcon
 /SECURITY.md                         @williamfalcon @lantiga
 /README.md                           @williamfalcon @lantiga
-/setup.py                            @williamfalcon @borda
-/src/pytorch_lightning/__about__.py  @williamfalcon @borda
-/src/lightning_fabric/__about__.py   @williamfalcon @borda @awaelchli
-/src/*/__setup__.py                  @borda @justusschock
+/src/pytorch_lightning/__about__.py  @williamfalcon @lantiga @borda
+/src/lightning_fabric/__about__.py   @williamfalcon @lantiga @borda

.github/CONTRIBUTING.md

@@ -182,7 +182,7 @@ We welcome any useful contribution! For your convenience here's a recommended wo
 1. Use tags in PR name for the following cases:
 
    - **\[blocked by #<number>\]** if your work is dependent on other PRs.
-   - **\[wip\]** when you start to re-edit your work, mark it so no one will accidentally merge it in meantime.
+   - **[wip]** when you start to re-edit your work, mark it so no one will accidentally merge it in meantime.
 
 ### Question & Answer
 

.github/ISSUE_TEMPLATE/1_bug_report.yaml

@@ -37,6 +37,7 @@ body:
         - "v2.2"
         - "v2.3"
         - "v2.4"
+        - "v2.5"
         - "master"
     validations:
       required: true
@@ -91,8 +92,8 @@ body:
           <summary>Current environment</summary>
 
         ```
-        #- PyTorch Lightning Version (e.g., 2.4.0):
-        #- PyTorch Version (e.g., 2.4):
+        #- PyTorch Lightning Version (e.g., 2.5.0):
+        #- PyTorch Version (e.g., 2.5):
         #- Python version (e.g., 3.12):
         #- OS (e.g., Linux):
         #- CUDA/cuDNN version:

.github/advanced-issue-labeler.yml

@@ -16,5 +16,7 @@ policy:
             keys: ["v2_3", "v2.3", "2.3.x"]
           - name: "ver: 2.4.x"
             keys: ["v2_4", "v2.4", "2.4.x"]
-          - name: "ver: 2.4.x"
+          - name: "ver: 2.5.x"
+            keys: ["v2_5", "v2.5", "2.5.x"]
+          - name: "ver: 2.5.x"
             keys: ["master"]

.github/checkgroup.yml

@@ -23,26 +23,26 @@ subprojects:
       - "pl-cpu (macOS-14, lightning, 3.10, 2.1)"
       - "pl-cpu (macOS-14, lightning, 3.11, 2.2.2)"
       - "pl-cpu (macOS-14, lightning, 3.11, 2.3)"
-      - "pl-cpu (macOS-14, lightning, 3.12, 2.4.1)"
-      - "pl-cpu (macOS-14, lightning, 3.12, 2.5.1)"
+      - "pl-cpu (macOS-14, lightning, 3.12.7, 2.4.1)"
+      - "pl-cpu (macOS-14, lightning, 3.12.7, 2.5.1)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.2.2)"
       - "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
-      - "pl-cpu (ubuntu-22.04, lightning, 3.12, 2.4.1)"
-      - "pl-cpu (ubuntu-22.04, lightning, 3.12, 2.5.1)"
+      - "pl-cpu (ubuntu-22.04, lightning, 3.12.7, 2.4.1)"
+      - "pl-cpu (ubuntu-22.04, lightning, 3.12.7, 2.5.1)"
       - "pl-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
       - "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
       - "pl-cpu (windows-2022, lightning, 3.11, 2.2.2)"
       - "pl-cpu (windows-2022, lightning, 3.11, 2.3)"
-      - "pl-cpu (windows-2022, lightning, 3.12, 2.4.1)"
-      - "pl-cpu (windows-2022, lightning, 3.12, 2.5.1)"
+      - "pl-cpu (windows-2022, lightning, 3.12.7, 2.4.1)"
+      - "pl-cpu (windows-2022, lightning, 3.12.7, 2.5.1)"
       - "pl-cpu (macOS-14, pytorch, 3.9, 2.1)"
       - "pl-cpu (ubuntu-20.04, pytorch, 3.9, 2.1)"
       - "pl-cpu (windows-2022, pytorch, 3.9, 2.1)"
-      - "pl-cpu (macOS-14, pytorch, 3.12, 2.5.1)"
-      - "pl-cpu (ubuntu-22.04, pytorch, 3.12, 2.5.1)"
-      - "pl-cpu (windows-2022, pytorch, 3.12, 2.5.1)"
+      - "pl-cpu (macOS-14, pytorch, 3.12.7, 2.5.1)"
+      - "pl-cpu (ubuntu-22.04, pytorch, 3.12.7, 2.5.1)"
+      - "pl-cpu (windows-2022, pytorch, 3.12.7, 2.5.1)"
 
   - id: "pytorch_lightning: Azure GPU"
     paths:
@@ -145,17 +145,17 @@ subprojects:
       - "!*.md"
       - "!**/*.md"
     checks:
-      - "build-cuda (3.10, 2.1.2, 12.1.0)"
-      - "build-cuda (3.11, 2.2.2, 12.1.0)"
-      - "build-cuda (3.11, 2.3.1, 12.1.0)"
-      - "build-cuda (3.11, 2.4.1, 12.1.0)"
-      - "build-cuda (3.12, 2.5.1, 12.1.0)"
+      - "build-cuda (3.10, 2.1.2, 12.1.1)"
+      - "build-cuda (3.11, 2.2.2, 12.1.1)"
+      - "build-cuda (3.11, 2.3.1, 12.1.1)"
+      - "build-cuda (3.11, 2.4.1, 12.1.1)"
+      - "build-cuda (3.12, 2.5.1, 12.1.1)"
       #- "build-NGC"
-      - "build-pl (3.10, 2.1, 12.1.0)"
-      - "build-pl (3.11, 2.2, 12.1.0)"
-      - "build-pl (3.11, 2.3, 12.1.0)"
-      - "build-pl (3.11, 2.4, 12.1.0)"
-      - "build-pl (3.12, 2.5, 12.1.0)"
+      - "build-pl (3.10, 2.1, 12.1.1)"
+      - "build-pl (3.11, 2.2, 12.1.1)"
+      - "build-pl (3.11, 2.3, 12.1.1)"
+      - "build-pl (3.11, 2.4, 12.1.1)"
+      - "build-pl (3.12, 2.5, 12.1.1, true)"
 
   # SECTION: lightning_fabric
 
@@ -176,26 +176,26 @@ subprojects:
       - "fabric-cpu (macOS-14, lightning, 3.10, 2.1)"
       - "fabric-cpu (macOS-14, lightning, 3.11, 2.2.2)"
       - "fabric-cpu (macOS-14, lightning, 3.11, 2.3)"
-      - "fabric-cpu (macOS-14, lightning, 3.12, 2.4.1)"
-      - "fabric-cpu (macOS-14, lightning, 3.12, 2.5.1)"
+      - "fabric-cpu (macOS-14, lightning, 3.12.7, 2.4.1)"
+      - "fabric-cpu (macOS-14, lightning, 3.12.7, 2.5.1)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2.2)"
       - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
-      - "fabric-cpu (ubuntu-22.04, lightning, 3.12, 2.4.1)"
-      - "fabric-cpu (ubuntu-22.04, lightning, 3.12, 2.5.1)"
+      - "fabric-cpu (ubuntu-22.04, lightning, 3.12.7, 2.4.1)"
+      - "fabric-cpu (ubuntu-22.04, lightning, 3.12.7, 2.5.1)"
       - "fabric-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
       - "fabric-cpu (windows-2022, lightning, 3.10, 2.1)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.2.2)"
       - "fabric-cpu (windows-2022, lightning, 3.11, 2.3)"
-      - "fabric-cpu (windows-2022, lightning, 3.12, 2.4.1)"
-      - "fabric-cpu (windows-2022, lightning, 3.12, 2.5.1)"
+      - "fabric-cpu (windows-2022, lightning, 3.12.7, 2.4.1)"
+      - "fabric-cpu (windows-2022, lightning, 3.12.7, 2.5.1)"
       - "fabric-cpu (macOS-14, fabric, 3.9, 2.1)"
       - "fabric-cpu (ubuntu-20.04, fabric, 3.9, 2.1)"
       - "fabric-cpu (windows-2022, fabric, 3.9, 2.1)"
-      - "fabric-cpu (macOS-14, fabric, 3.12, 2.5.1)"
-      - "fabric-cpu (ubuntu-22.04, fabric, 3.12, 2.5.1)"
-      - "fabric-cpu (windows-2022, fabric, 3.12, 2.5.1)"
+      - "fabric-cpu (macOS-14, fabric, 3.12.7, 2.5.1)"
+      - "fabric-cpu (ubuntu-22.04, fabric, 3.12.7, 2.5.1)"
+      - "fabric-cpu (windows-2022, fabric, 3.12.7, 2.5.1)"
 
   - id: "lightning_fabric: Azure GPU"
     paths: