lightning 2.3.0.dev20240616__tar.gz → 2.3.0.dev20240623__tar.gz

{lightning-2.3.0.dev20240616/src/lightning.egg-info → lightning-2.3.0.dev20240623}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning
-Version: 2.3.0.dev20240616
+Version: 2.3.0.dev20240623
 Summary: The Deep Learning framework to train, deploy, and ship AI products Lightning fast.
 Home-page: https://github.com/Lightning-AI/lightning
 Author: Lightning AI et al.
@@ -27,18 +27,18 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: fabric-examples
-Provides-Extra: fabric-strategies
-Provides-Extra: fabric-test
-Provides-Extra: store-test
 Provides-Extra: app-ui
+Provides-Extra: app-components
 Provides-Extra: app-cloud
 Provides-Extra: app-test
-Provides-Extra: app-components
-Provides-Extra: pytorch-examples
+Provides-Extra: store-test
+Provides-Extra: fabric-strategies
+Provides-Extra: fabric-examples
+Provides-Extra: fabric-test
 Provides-Extra: pytorch-strategies
-Provides-Extra: pytorch-extra
+Provides-Extra: pytorch-examples
 Provides-Extra: pytorch-test
+Provides-Extra: pytorch-extra
 Provides-Extra: fabric-all
 Provides-Extra: fabric-dev
 Provides-Extra: pytorch-all
@@ -46,14 +46,14 @@ Provides-Extra: pytorch-dev
 Provides-Extra: app-extra
 Provides-Extra: app-all
 Provides-Extra: app-dev
-Provides-Extra: data
-Provides-Extra: examples
-Provides-Extra: strategies
-Provides-Extra: test
 Provides-Extra: ui
+Provides-Extra: components
 Provides-Extra: cloud
+Provides-Extra: test
 Provides-Extra: app
-Provides-Extra: components
+Provides-Extra: data
+Provides-Extra: strategies
+Provides-Extra: examples
 Provides-Extra: extra
 Provides-Extra: all
 Provides-Extra: dev
@@ -78,7 +78,7 @@ ______________________________________________________________________
   <a href="#examples">Examples</a> •
   <a href="#pytorch-lightning-train-and-deploy-pytorch-at-scale">PyTorch Lightning</a> •
   <a href="#lightning-fabric-expert-control">Fabric</a> •
-  <a href="https://pytorch-lightning.readthedocs.io/en/2.3.0.dev20240616">Docs</a> •
+  <a href="https://pytorch-lightning.readthedocs.io/en/2.3.0.dev20240623">Docs</a> •
   <a href="#community">Community</a> •
   <a href="https://lightning.ai/docs/pytorch/stable/generated/CONTRIBUTING.html">Contribute</a> •
 </p>
@@ -594,7 +594,7 @@ Lightning is rigorously tested across multiple CPUs, GPUs and TPUs and against m
 
 |       System / PyTorch ver.        | 1.13                                                                                                                                                                                                                            | 2.0                                                                                                                                                                                                                             |                                                                                                               2.1                                                                                                               |
 | :--------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|        Linux py3.9 \[GPUs\]        |  |  | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status%2Fpytorch-lightning%20%28GPUs%29?branchName=refs%2Ftags%2F2.3.0.dev20240616)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) |
+|        Linux py3.9 \[GPUs\]        |  |  | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status%2Fpytorch-lightning%20%28GPUs%29?branchName=refs%2Ftags%2F2.3.0.dev20240623)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) |
 |        Linux py3.9 \[TPUs\]        |                                                                                                                                                                                                                                 |  [![Test PyTorch - TPU](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml)     |      |
 |  Linux (multiple Python versions)  | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 |
 |   OSX (multiple Python versions)   | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 |

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/requirements/base.txt

@@ -1,6 +1,6 @@
 PyYAML<7.0,>=5.4
 fsspec[http]<2025.0,>=2022.5.0
-lightning-utilities<1.0,>=0.8.0
+lightning-utilities<1.0,>=0.10.0
 numpy<2.0,>=1.17.2
 packaging<24.0,>=20.0
 torch<3.0,>=2.0.0

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/requirements/fabric/base.txt

@@ -6,4 +6,4 @@ torch >=2.0.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
-lightning-utilities >=0.8.0, <0.12.0
+lightning-utilities >=0.10.0, <0.12.0

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/requirements/pytorch/base.txt

@@ -9,4 +9,4 @@ fsspec[http] >=2022.5.0, <2024.4.0
 torchmetrics >=0.7.0, <1.3.0  # needed for using fixed compare_version
 packaging >=20.0, <=23.1
 typing-extensions >=4.4.0, <4.10.0
-lightning-utilities >=0.8.0, <0.12.0
+lightning-utilities >=0.10.0, <0.12.0

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/fabric/CHANGELOG.md

@@ -5,6 +5,40 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 
+## [unreleased] - YYYY-MM-DD
+
+### Added
+
+-
+
+-
+
+### Changed
+
+-
+
+-
+
+### Deprecated
+
+-
+
+-
+
+### Removed
+
+-
+
+-
+
+### Fixed
+
+-
+
+-
+
+
+
 ## [2.3.0] - 2024-06-13
 
 ### Added

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/fabric/utilities/distributed.py

@@ -2,6 +2,7 @@ import atexit
 import contextlib
 import logging
 import os
+import signal
 import time
 from contextlib import nullcontext
 from datetime import timedelta
@@ -306,8 +307,11 @@ def _init_dist_connection(
 
 
 def _destroy_dist_connection() -> None:
+    # Don't allow Ctrl+C to interrupt this handler
+    signal.signal(signal.SIGINT, signal.SIG_IGN)
     if _distributed_is_initialized():
         torch.distributed.destroy_process_group()
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
 
 
 def _get_default_process_group_backend_for_device(device: torch.device) -> str:

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/fabric/utilities/testing/_runif.py

@@ -17,7 +17,7 @@ import sys
 from typing import Dict, List, Optional, Tuple
 
 import torch
-from lightning_utilities.core.imports import compare_version
+from lightning_utilities.core.imports import RequirementCache, compare_version
 from packaging.version import Version
 
 from lightning.fabric.accelerators import XLAAccelerator
@@ -112,7 +112,7 @@ def _runif_reasons(
             reasons.append("Standalone execution")
         kwargs["standalone"] = True
 
-    if deepspeed and not _DEEPSPEED_AVAILABLE:
+    if deepspeed and not (_DEEPSPEED_AVAILABLE and RequirementCache(module="deepspeed.utils")):
         reasons.append("Deepspeed")
 
     if dynamo:

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/CHANGELOG.md

@@ -4,6 +4,41 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+
+## [unreleased] - YYYY-MM-DD
+
+### Added
+
+-
+
+-
+
+### Changed
+
+- Triggering KeyboardInterrupt (Ctrl+C) during `.fit()`, `.evaluate()`, `.test()` or `.predict()` now terminates all processes launched by the Trainer and exits the program ([#19976](https://github.com/Lightning-AI/pytorch-lightning/pull/19976))
+
+-
+
+### Deprecated
+
+-
+
+-
+
+### Removed
+
+-
+
+-
+
+### Fixed
+
+-
+
+-
+
+
+
 ## [2.3.0] - 2024-06-13
 
 ### Added

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/loggers/comet.py

@@ -268,7 +268,7 @@ class CometLogger(Logger):
             self.logger.experiment.some_comet_function()
 
         """
-        if self._experiment is not None:
+        if self._experiment is not None and self._experiment.alive:
             return self._experiment
 
         if self._future_experiment_key is not None:

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/strategies/launchers/multiprocessing.py

@@ -259,7 +259,7 @@ class _MultiProcessingLauncher(_Launcher):
     def kill(self, signum: _SIGNUM) -> None:
         for proc in self.procs:
             if proc.is_alive() and proc.pid is not None:
-                log.info(f"pid {os.getpid()} killing {proc.pid} with {signum}")
+                log.debug(f"Process {os.getpid()} is terminating {proc.pid} with {signum}")
                 with suppress(ProcessLookupError):
                     os.kill(proc.pid, signum)
 

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/strategies/launchers/subprocess_script.py

@@ -107,7 +107,7 @@ class _SubprocessScriptLauncher(_Launcher):
     @override
     def kill(self, signum: _SIGNUM) -> None:
         for proc in self.procs:
-            log.info(f"pid {os.getpid()} killing {proc.pid} with {signum}")
+            log.debug(f"Process {os.getpid()} is terminating {proc.pid} with {signum}")
             # this skips subprocesses already terminated
             proc.send_signal(signum)
 

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/trainer/call.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+import signal
 from copy import deepcopy
 from typing import Any, Callable, Dict, Optional, Type, Union
 
@@ -20,10 +21,12 @@ from packaging.version import Version
 import lightning.pytorch as pl
 from lightning.fabric.utilities.device_dtype_mixin import _DeviceDtypeModuleMixin
 from lightning.pytorch.callbacks import Checkpoint, EarlyStopping
+from lightning.pytorch.strategies.launchers import _SubprocessScriptLauncher
+from lightning.pytorch.trainer.connectors.signal_connector import _get_sigkill_signal
 from lightning.pytorch.trainer.states import TrainerStatus
 from lightning.pytorch.utilities.exceptions import _TunerExitException
 from lightning.pytorch.utilities.model_helpers import is_overridden
-from lightning.pytorch.utilities.rank_zero import rank_zero_warn
+from lightning.pytorch.utilities.rank_zero import rank_zero_info, rank_zero_warn
 
 log = logging.getLogger(__name__)
 
@@ -49,12 +52,17 @@ def _call_and_handle_interrupt(trainer: "pl.Trainer", trainer_fn: Callable, *arg
         trainer.state.status = TrainerStatus.FINISHED
         trainer.state.stage = None
 
-    # TODO: Unify both exceptions below, where `KeyboardError` doesn't re-raise
     except KeyboardInterrupt as exception:
-        rank_zero_warn("Detected KeyboardInterrupt, attempting graceful shutdown...")
-        # user could press Ctrl+c many times... only shutdown once
-        if not trainer.interrupted:
-            _interrupt(trainer, exception)
+        rank_zero_info("\nDetected KeyboardInterrupt, attempting graceful shutdown ...")
+        # user could press Ctrl+C many times, disable KeyboardInterrupt for shutdown
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+        _interrupt(trainer, exception)
+        trainer._teardown()
+        launcher = trainer.strategy.launcher
+        if isinstance(launcher, _SubprocessScriptLauncher):
+            launcher.kill(_get_sigkill_signal())
+        exit(1)
+
     except BaseException as exception:
         _interrupt(trainer, exception)
         trainer._teardown()

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/trainer/connectors/signal_connector.py

@@ -2,7 +2,6 @@ import logging
 import os
 import re
 import signal
-import sys
 import threading
 from subprocess import call
 from types import FrameType
@@ -54,7 +53,7 @@ class _SignalConnector:
             sigterm_handlers.append(self._sigterm_handler_fn)
 
         # Windows seems to have signal incompatibilities
-        if not self._is_on_windows():
+        if not _IS_WINDOWS:
             sigusr = environment.requeue_signal if isinstance(environment, SLURMEnvironment) else signal.SIGUSR1
             assert sigusr is not None
             if sigusr_handlers and not self._has_already_handler(sigusr):
@@ -155,10 +154,6 @@ class _SignalConnector:
             }
         return set(signal.Signals)
 
-    @staticmethod
-    def _is_on_windows() -> bool:
-        return sys.platform == "win32"
-
     @staticmethod
     def _has_already_handler(signum: _SIGNUM) -> bool:
         return signal.getsignal(signum) not in (None, signal.SIG_DFL)
@@ -172,3 +167,7 @@ class _SignalConnector:
         state = self.__dict__.copy()
         state["_original_handlers"] = {}
         return state
+
+
+def _get_sigkill_signal() -> _SIGNUM:
+    return signal.SIGTERM if _IS_WINDOWS else signal.SIGKILL

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning/pytorch/utilities/types.py

@@ -107,7 +107,7 @@ class LRSchedulerConfigType(TypedDict, total=False):
     frequency: int
     reduce_on_plateau: bool
     monitor: Optional[str]
-    scrict: bool
+    strict: bool
 
 
 class OptimizerLRSchedulerConfig(TypedDict):

lightning-2.3.0.dev20240623/src/lightning/version.info

@@ -0,0 +1 @@
+2.3.0.dev20240623

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623/src/lightning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning
-Version: 2.3.0.dev20240616
+Version: 2.3.0.dev20240623
 Summary: The Deep Learning framework to train, deploy, and ship AI products Lightning fast.
 Home-page: https://github.com/Lightning-AI/lightning
 Author: Lightning AI et al.
@@ -27,18 +27,18 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: fabric-examples
-Provides-Extra: fabric-strategies
-Provides-Extra: fabric-test
-Provides-Extra: store-test
 Provides-Extra: app-ui
+Provides-Extra: app-components
 Provides-Extra: app-cloud
 Provides-Extra: app-test
-Provides-Extra: app-components
-Provides-Extra: pytorch-examples
+Provides-Extra: store-test
+Provides-Extra: fabric-strategies
+Provides-Extra: fabric-examples
+Provides-Extra: fabric-test
 Provides-Extra: pytorch-strategies
-Provides-Extra: pytorch-extra
+Provides-Extra: pytorch-examples
 Provides-Extra: pytorch-test
+Provides-Extra: pytorch-extra
 Provides-Extra: fabric-all
 Provides-Extra: fabric-dev
 Provides-Extra: pytorch-all
@@ -46,14 +46,14 @@ Provides-Extra: pytorch-dev
 Provides-Extra: app-extra
 Provides-Extra: app-all
 Provides-Extra: app-dev
-Provides-Extra: data
-Provides-Extra: examples
-Provides-Extra: strategies
-Provides-Extra: test
 Provides-Extra: ui
+Provides-Extra: components
 Provides-Extra: cloud
+Provides-Extra: test
 Provides-Extra: app
-Provides-Extra: components
+Provides-Extra: data
+Provides-Extra: strategies
+Provides-Extra: examples
 Provides-Extra: extra
 Provides-Extra: all
 Provides-Extra: dev
@@ -78,7 +78,7 @@ ______________________________________________________________________
   <a href="#examples">Examples</a> •
   <a href="#pytorch-lightning-train-and-deploy-pytorch-at-scale">PyTorch Lightning</a> •
   <a href="#lightning-fabric-expert-control">Fabric</a> •
-  <a href="https://pytorch-lightning.readthedocs.io/en/2.3.0.dev20240616">Docs</a> •
+  <a href="https://pytorch-lightning.readthedocs.io/en/2.3.0.dev20240623">Docs</a> •
   <a href="#community">Community</a> •
   <a href="https://lightning.ai/docs/pytorch/stable/generated/CONTRIBUTING.html">Contribute</a> •
 </p>
@@ -594,7 +594,7 @@ Lightning is rigorously tested across multiple CPUs, GPUs and TPUs and against m
 
 |       System / PyTorch ver.        | 1.13                                                                                                                                                                                                                            | 2.0                                                                                                                                                                                                                             |                                                                                                               2.1                                                                                                               |
 | :--------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|        Linux py3.9 \[GPUs\]        |  |  | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status%2Fpytorch-lightning%20%28GPUs%29?branchName=refs%2Ftags%2F2.3.0.dev20240616)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) |
+|        Linux py3.9 \[GPUs\]        |  |  | [![Build Status](https://dev.azure.com/Lightning-AI/lightning/_apis/build/status%2Fpytorch-lightning%20%28GPUs%29?branchName=refs%2Ftags%2F2.3.0.dev20240623)](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=24&branchName=master) |
 |        Linux py3.9 \[TPUs\]        |                                                                                                                                                                                                                                 |  [![Test PyTorch - TPU](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/tpu-tests.yml)     |      |
 |  Linux (multiple Python versions)  | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 |
 |   OSX (multiple Python versions)   | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 | [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                                 |                 [![Test PyTorch](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml)                 |

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning.egg-info/SOURCES.txt

@@ -28,7 +28,7 @@ src/lightning/__init__.py
 src/lightning/__main__.py
 src/lightning/__setup__.py
 src/lightning/__version__.py
-src/lightning/d6e4d22907d0d72219215f761637dd0a6e691152289e30ee
+src/lightning/dca3690e20c0651235509a0496c1547141ad999b5018e95e
 src/lightning/py.typed
 src/lightning/version.info
 src/lightning.egg-info/PKG-INFO

{lightning-2.3.0.dev20240616 → lightning-2.3.0.dev20240623}/src/lightning.egg-info/requires.txt

@@ -1,6 +1,6 @@
 PyYAML<8.0,>=5.4
 fsspec[http]<2026.0,>=2022.5.0
-lightning-utilities<2.0,>=0.8.0
+lightning-utilities<2.0,>=0.10.0
 numpy<3.0,>=1.17.2
 packaging<25.0,>=20.0
 torch<4.0,>=2.0.0

lightning-2.3.0.dev20240623/src/version.info

@@ -0,0 +1 @@
+2.3.0.dev20240623

lightning-2.3.0.dev20240616/src/lightning/version.info

@@ -1 +0,0 @@
-2.3.0.dev20240616

lightning-2.3.0.dev20240616/src/version.info

@@ -1 +0,0 @@
-2.3.0.dev20240616