Merge branch 'master' into lr_finder/spacing_issue

SkafteNicki · web-flow · commit 044dd97f82d3 · 2025-08-12T07:26:08.000+02:00
diff --git a/.github/workflows/_build-packages.yml b/.github/workflows/_build-packages.yml
@@ -51,7 +51,7 @@ jobs:
     needs: build-packages
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with: # download all build artifacts
           pattern: ${{ inputs.artifact-name }}-*
           merge-multiple: true
diff --git a/.github/workflows/call-clear-cache.yml b/.github/workflows/call-clear-cache.yml
@@ -23,18 +23,18 @@ on:
 jobs:
   cron-clear:
     if: github.event_name == 'schedule' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.0
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.2
     with:
-      scripts-ref: v0.14.3
+      scripts-ref: v0.15.2
       dry-run: ${{ github.event_name == 'pull_request' }}
       pattern: "latest|docs"
       age-days: 7
 
   direct-clear:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.0
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.15.2
     with:
-      scripts-ref: v0.14.3
+      scripts-ref: v0.15.2
       dry-run: ${{ github.event_name == 'pull_request' }}
       pattern: ${{ inputs.pattern || 'pypi_wheels' }} # setting str in case of PR / debugging
       age-days: ${{ fromJSON(inputs.age-days) || 0 }} # setting 0 in case of PR / debugging
diff --git a/.github/workflows/ci-pkg-install.yml b/.github/workflows/ci-pkg-install.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: dist-packages-${{ github.sha }}
           path: dist
diff --git a/.github/workflows/ci-schema.yml b/.github/workflows/ci-schema.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   check:
-    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.15.0
+    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.15.2
     with:
       # skip azure due to the wrong schema file by MSFT
       # https://github.com/Lightning-AI/lightning-flash/pull/1455#issuecomment-1244793607
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -134,7 +134,7 @@ jobs:
             MAKE_FLAGS="-j2"
           file: dockers/base-cuda/Dockerfile
           push: ${{ env.PUSH_NIGHTLY }}
-          tags: "pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ env.PT_VERSION }}-cuda${{ matrix.cuda_version }}"
+          tags: "pytorchlightning/pytorch_lightning:base-cuda${{ matrix.cuda_version }}-py${{ matrix.python_version }}-torch${{ env.PT_VERSION }}"
         timeout-minutes: 95
       - uses: ravsamhq/notify-slack-action@v2
         if: failure() && env.PUSH_NIGHTLY == 'true'
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -159,7 +159,7 @@ jobs:
       # use input if dispatch or git tag
       VERSION: ${{ inputs.version || github.ref_name }}
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: docs-${{ matrix.pkg-name }}-${{ github.sha }}
           path: docs/build/html/
diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
@@ -54,7 +54,7 @@ jobs:
       PKG_NAME: "lightning"
     steps:
       - uses: actions/checkout@v4 # needed to use local composite action
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: nightly-packages-${{ github.sha }}
           path: dist
diff --git a/.github/workflows/release-pkg.yml b/.github/workflows/release-pkg.yml
@@ -38,7 +38,7 @@ jobs:
     if: github.event_name == 'release'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: dist-packages-${{ github.sha }}
           path: dist
@@ -140,7 +140,7 @@ jobs:
         name: ["FABRIC", "PYTORCH", "LIGHTNING"]
     steps:
       - uses: actions/checkout@v4 # needed for local action below
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: dist-packages-${{ github.sha }}
           path: dist
@@ -165,7 +165,7 @@ jobs:
         name: ["FABRIC", "PYTORCH", "LIGHTNING"]
     steps:
       - uses: actions/checkout@v4 # needed for local action below
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: dist-packages-${{ github.sha }}
           path: dist
diff --git a/_notebooks b/_notebooks
@@ -1 +1 @@
-Subproject commit 99ba2b407843a846210b64a8312bbf4ee33e51a5
+Subproject commit 69112e6fe73b50d159c4b7add6ddea412b458691
diff --git a/requirements/fabric/base.txt b/requirements/fabric/base.txt
@@ -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
 
-torch >=2.1.0, <2.8.0
+torch >=2.1.0, <2.9.0
 fsspec[http] >=2022.5.0, <2025.8.0
 packaging >=20.0, <=25.0
 typing-extensions >=4.5.0, <4.15.0
diff --git a/requirements/fabric/test.txt b/requirements/fabric/test.txt
@@ -1,4 +1,4 @@
-coverage ==7.10.2
+coverage ==7.10.3
 numpy >=1.17.2, <1.27.0
 pytest ==8.4.1
 pytest-cov ==6.2.1
diff --git a/requirements/pytorch/test.txt b/requirements/pytorch/test.txt
@@ -1,4 +1,4 @@
-coverage ==7.10.2
+coverage ==7.10.3
 pytest ==8.4.1
 pytest-cov ==6.2.1
 pytest-timeout ==2.4.0
diff --git a/requirements/typing.txt b/requirements/typing.txt
@@ -1,5 +1,5 @@
 mypy==1.17.1
-torch==2.7.1
+torch==2.7.1 # todo: update typing in separate PR
 
 types-Markdown
 types-PyYAML
diff --git a/src/lightning/__about__.py b/src/lightning/__about__.py
@@ -15,7 +15,7 @@
 import time
 
 __author__ = "Lightning AI et al."
-__author_email__ = "pytorch@lightning.ai"
+__author_email__ = "developer@lightning.ai"
 __license__ = "Apache-2.0"
 __copyright__ = f"Copyright (c) 2018-{time.strftime('%Y')}, {__author__}."
 __homepage__ = "https://github.com/Lightning-AI/lightning"
diff --git a/src/lightning/fabric/utilities/consolidate_checkpoint.py b/src/lightning/fabric/utilities/consolidate_checkpoint.py
@@ -1,4 +1,5 @@
 import logging
+import sys
 from argparse import ArgumentParser, Namespace
 from pathlib import Path
 
@@ -40,23 +41,23 @@ def _parse_cli_args() -> Namespace:
 def _process_cli_args(args: Namespace) -> Namespace:
     if not _TORCH_GREATER_EQUAL_2_3:
         _log.error("Processing distributed checkpoints requires PyTorch >= 2.3.")
-        exit(1)
+        sys.exit(1)
 
     checkpoint_folder = Path(args.checkpoint_folder)
     if not checkpoint_folder.exists():
         _log.error(f"The provided checkpoint folder does not exist: {checkpoint_folder}")
-        exit(1)
+        sys.exit(1)
     if not checkpoint_folder.is_dir():
         _log.error(
             f"The provided checkpoint path must be a folder, containing the checkpoint shards: {checkpoint_folder}"
         )
-        exit(1)
+        sys.exit(1)
     if not (checkpoint_folder / _METADATA_FILENAME).is_file():
         _log.error(
             "Only FSDP-sharded checkpoints saved with Lightning are supported for consolidation. The provided folder"
             f" is not in that format: {checkpoint_folder}"
         )
-        exit(1)
+        sys.exit(1)
 
     if args.output_file is None:
         output_file = checkpoint_folder.with_suffix(checkpoint_folder.suffix + ".consolidated")
@@ -67,7 +68,7 @@ def _process_cli_args(args: Namespace) -> Namespace:
             "The path for the converted checkpoint already exists. Choose a different path by providing"
             f" `--output_file` or move/delete the file first: {output_file}"
         )
-        exit(1)
+        sys.exit(1)
 
     return Namespace(checkpoint_folder=checkpoint_folder, output_file=output_file)
 
diff --git a/src/lightning/pytorch/trainer/call.py b/src/lightning/pytorch/trainer/call.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 import logging
 import signal
+import sys
 from copy import deepcopy
 from typing import Any, Callable, Optional, Union
 
@@ -62,7 +63,7 @@ def _call_and_handle_interrupt(trainer: "pl.Trainer", trainer_fn: Callable, *arg
         launcher = trainer.strategy.launcher
         if isinstance(launcher, _SubprocessScriptLauncher):
             launcher.kill(_get_sigkill_signal())
-        exit(1)
+        sys.exit(1)
 
     except BaseException as exception:
         _interrupt(trainer, exception)
diff --git a/src/lightning/pytorch/utilities/upgrade_checkpoint.py b/src/lightning/pytorch/utilities/upgrade_checkpoint.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 import glob
 import logging
+import sys
 from argparse import ArgumentParser, Namespace
 from pathlib import Path
 from shutil import copyfile
@@ -35,7 +36,7 @@ def _upgrade(args: Namespace) -> None:
             f"The path {path} does not exist. Please provide a valid path to a checkpoint file or a directory"
             f" containing checkpoints ending in {extension}."
         )
-        exit(1)
+        sys.exit(1)
 
     if path.is_file():
         files = [path]
@@ -46,7 +47,7 @@ def _upgrade(args: Namespace) -> None:
             f"No checkpoint files with extension {extension} were found in {path}."
             f" HINT: Try setting the `--extension` option to specify the right file extension to look for."
         )
-        exit(1)
+        sys.exit(1)
 
     _log.info("Creating a backup of the existing checkpoint files before overwriting in the upgrade process.")
     for file in files:
diff --git a/src/lightning_fabric/__about__.py b/src/lightning_fabric/__about__.py
@@ -1,7 +1,7 @@
 import time
 
 __author__ = "Lightning AI et al."
-__author_email__ = "pytorch@lightning.ai"
+__author_email__ = "developer@lightning.ai"
 __license__ = "Apache-2.0"
 __copyright__ = f"Copyright (c) 2022-{time.strftime('%Y')}, {__author__}."
 __homepage__ = "https://github.com/Lightning-AI/lightning"
diff --git a/src/pytorch_lightning/__about__.py b/src/pytorch_lightning/__about__.py
@@ -14,7 +14,7 @@
 import time
 
 __author__ = "Lightning AI et al."
-__author_email__ = "pytorch@lightning.ai"
+__author_email__ = "developer@lightning.ai"
 __license__ = "Apache-2.0"
 __copyright__ = f"Copyright (c) 2018-{time.strftime('%Y')}, {__author__}."
 __homepage__ = "https://github.com/Lightning-AI/lightning"

-Original file line number
+Diff line change
 jobs:
   check:
 -    uses: Lightning-AI/utilities/.github/workflows/[email protected].0
 +    uses: Lightning-AI/utilities/.github/workflows/[email protected].2
     with:
       # skip azure due to the wrong schema file by MSFT
       # https://github.com/Lightning-AI/lightning-flash/pull/1455#issuecomment-1244793607