pytorch-lightning 2.2.1__tar.gz → 2.2.2__tar.gz

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/.actions/assistant.py

@@ -44,11 +44,7 @@ REQUIREMENT_FILES = {
         "requirements/fabric/base.txt",
         "requirements/fabric/strategies.txt",
     ),
-    "data": (
-        "requirements/data/data.txt",
-        "requirements/data/cloud.txt",
-        "requirements/data/examples.txt",
-    ),
+    "data": ("requirements/data/data.txt",),
 }
 REQUIREMENT_FILES_ALL = list(chain(*REQUIREMENT_FILES.values()))
 

{pytorch-lightning-2.2.1/src/pytorch_lightning.egg-info → pytorch-lightning-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytorch-lightning
-Version: 2.2.1
+Version: 2.2.2
 Summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate.
 Home-page: https://github.com/Lightning-AI/lightning
 Author: Lightning AI et al.
@@ -28,10 +28,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: test
 Provides-Extra: strategies
-Provides-Extra: extra
 Provides-Extra: examples
+Provides-Extra: test
+Provides-Extra: extra
 Provides-Extra: deepspeed
 Provides-Extra: all
 Provides-Extra: dev
@@ -66,7 +66,7 @@ ______________________________________________________________________
 [![DockerHub](https://img.shields.io/docker/pulls/pytorchlightning/pytorch_lightning.svg)](https://hub.docker.com/r/pytorchlightning/pytorch_lightning)
 [![codecov](https://codecov.io/gh/Lightning-AI/pytorch-lightning/graph/badge.svg?token=SmzX8mnKlA)](https://codecov.io/gh/Lightning-AI/pytorch-lightning)
 
-[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=2.2.1)](https://lightning.ai/docs/pytorch/stable/)[![Discord](https://img.shields.io/discord/1077906959069626439?style=plastic)](https://discord.gg/VptPCZkGNa)
+[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=2.2.2)](https://lightning.ai/docs/pytorch/stable/)[![Discord](https://img.shields.io/discord/1077906959069626439?style=plastic)](https://discord.gg/VptPCZkGNa)
 [![license](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/Lightning-AI/lightning/blob/master/LICENSE)
 
 <!--

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/pyproject.toml

@@ -243,6 +243,7 @@ module = [
     "lightning.app.utilities.state",
     "lightning.app.utilities.tracer",
     "lightning.app.utilities.tree",
+    "lightning.data.streaming.serializers",
     "lightning.store.utils",
 ]
 ignore_errors = "True"

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/requirements/fabric/base.txt

@@ -2,8 +2,8 @@
 #  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 >=1.13.0, <2.2.0
+torch >=1.13.0, <2.3.0
 fsspec[http] >=2022.5.0, <2023.11.0
 packaging >=20.0, <=23.1
 typing-extensions >=4.4.0, <4.10.0
-lightning-utilities >=0.8.0, <0.10.0
+lightning-utilities >=0.8.0, <0.11.0

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/requirements/fabric/examples.txt

@@ -3,4 +3,4 @@
 
 torchvision >=0.14.0, <0.17.0
 torchmetrics >=0.10.0, <1.3.0
-lightning-utilities >=0.8.0, <0.10.0
+lightning-utilities >=0.8.0, <0.11.0

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/requirements/pytorch/base.txt

@@ -2,11 +2,11 @@
 #  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 >=1.13.0, <2.2.0
+torch >=1.13.0, <2.3.0
 tqdm >=4.57.0, <4.67.0
 PyYAML >=5.4, <6.1.0
 fsspec[http] >=2022.5.0, <2023.11.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.10.0
+lightning-utilities >=0.8.0, <0.11.0

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/requirements/pytorch/examples.txt

@@ -6,4 +6,4 @@ torchvision >=0.14.0, <0.17.0
 gym[classic_control] >=0.17.0, <0.27.0
 ipython[all] <8.15.0
 torchmetrics >=0.10.0, <1.3.0
-lightning-utilities >=0.8.0, <0.10.0
+lightning-utilities >=0.8.0, <0.11.0

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/requirements/pytorch/extra.txt

@@ -5,7 +5,7 @@
 matplotlib>3.1, <3.9.0
 omegaconf >=2.0.5, <2.4.0
 hydra-core >=1.0.5, <1.4.0
-jsonargparse[signatures] >=4.26.1, <4.28.0
+jsonargparse[signatures] >=4.27.7, <4.28.0
 rich >=12.3.0, <13.6.0
 tensorboardX >=2.2, <2.7.0  # min version is set by torch.onnx missing attribute
 bitsandbytes ==0.41.0  # strict

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/lightning_fabric/CHANGELOG.md

@@ -5,6 +5,15 @@ 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/).
 
 
+## [2.2.2] - 2024-04-11
+
+### Fixed
+
+- Fixed a KeyError when saving a FSDP sharded checkpoint and setting `save_weights_only=True` ([#19524](https://github.com/Lightning-AI/pytorch-lightning/pull/19524))
+- Fixed an issue causing a TypeError when using `torch.compile` as a decorator ([#19627](https://github.com/Lightning-AI/pytorch-lightning/pull/19627))
+- Fixed issue where some model methods couldn't be monkeypatched after being Fabric wrapped ([#19705](https://github.com/Lightning-AI/pytorch-lightning/pull/19705))
+- Fixed an issue causing weights to be reset in `Fabric.setup()` when using FSDP ([#19755](https://github.com/Lightning-AI/pytorch-lightning/pull/19755))
+
 ## [2.2.1] - 2024-03-04
 
 ### Fixed

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/lightning_fabric/utilities/device_dtype_mixin.py

@@ -109,14 +109,12 @@ class _DeviceDtypeModuleMixin(Module):
 def _update_properties(
     root: torch.nn.Module, device: Optional[torch.device] = None, dtype: Optional[Union[str, torch.dtype]] = None
 ) -> None:
-    def apply_fn(module: Union[_DeviceDtypeModuleMixin, Module]) -> None:
+    for module in root.modules():
         if not isinstance(module, _DeviceDtypeModuleMixin):
-            return
+            continue
         # cannot use `module.to()` because we don't actually want to move the model in case there are multiple
         # devices types (such as partial meta parameters)
         if device is not None:
             module._device = device
         if dtype is not None:
             module._dtype = dtype
-
-    root.apply(apply_fn)

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/lightning_fabric/utilities/rank_zero.py

@@ -72,7 +72,7 @@ if not _UTILITIES_GREATER_EQUAL_0_10:
 
     rank_zero_module.rank_zero_only.rank = getattr(rank_zero_module.rank_zero_only, "rank", _get_rank() or 0)
 else:
-    rank_zero_only = rank_zero_module.rank_zero_only  # type: ignore[assignment]
+    rank_zero_only = rank_zero_module.rank_zero_only
 
 # add the attribute to the function but don't overwrite in case Trainer has already set it
 rank_zero_only.rank = getattr(rank_zero_only, "rank", _get_rank() or 0)

pytorch-lightning-2.2.2/src/lightning_fabric/version.info

@@ -0,0 +1 @@
+2.2.2

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/lightning_fabric/wrappers.py

@@ -244,7 +244,7 @@ class _FabricModule(_DeviceDtypeModuleMixin):
         original_has_attr = hasattr(original_module, name)
         # Can't use super().__getattr__ because nn.Module only checks _parameters, _buffers, and _modules
         # Can't use self.__getattr__ because it would pass through to the original module
-        fabric_has_attr = name in self.__dict__
+        fabric_has_attr = name in dir(self)
 
         if not (original_has_attr or fabric_has_attr):
             setattr(original_module, name, value)
@@ -374,10 +374,14 @@ def _capture_compile_kwargs(compile_fn: Callable) -> Callable:
     # PyTorch will resolve this in the future: https://github.com/pytorch/pytorch/issues/116575
 
     @wraps(compile_fn)
-    def _capture(model: Any, **kwargs: Any) -> Any:
+    def _capture(*args: Any, **kwargs: Any) -> Any:
+        if not args or not isinstance(args[0], nn.Module):
+            # either torch.compile is being applied as a decorator or we're compiling something else
+            return compile_fn(*args, **kwargs)
+
+        model = args[0]
         compiled_model = compile_fn(model, **kwargs)
-        if isinstance(model, nn.Module):
-            compiled_model._compile_kwargs = deepcopy(kwargs)
+        compiled_model._compile_kwargs = deepcopy(kwargs)
         return compiled_model
 
     return _capture

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/pytorch_lightning/CHANGELOG.md

@@ -5,6 +5,13 @@ 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/).
 
 
+## [2.2.2] - 2024-04-11
+
+### Fixed
+
+- Fixed an issue causing a TypeError when using `torch.compile` as a decorator ([#19627](https://github.com/Lightning-AI/pytorch-lightning/pull/19627))
+
+
 ## [2.2.1] - 2024-03-04
 
 ### Fixed

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/pytorch_lightning/cli.py

@@ -31,7 +31,7 @@ from pytorch_lightning.utilities.exceptions import MisconfigurationException
 from pytorch_lightning.utilities.model_helpers import is_overridden
 from pytorch_lightning.utilities.rank_zero import rank_zero_warn
 
-_JSONARGPARSE_SIGNATURES_AVAILABLE = RequirementCache("jsonargparse[signatures]>=4.26.1")
+_JSONARGPARSE_SIGNATURES_AVAILABLE = RequirementCache("jsonargparse[signatures]>=4.27.7")
 
 if _JSONARGPARSE_SIGNATURES_AVAILABLE:
     import docstring_parser

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/pytorch_lightning/loggers/logger.py

@@ -27,6 +27,8 @@ from lightning_fabric.loggers.logger import _DummyExperiment as DummyExperiment
 from lightning_fabric.loggers.logger import rank_zero_experiment  # noqa: F401  # for backward compatibility
 from pytorch_lightning.callbacks.model_checkpoint import ModelCheckpoint
 
+__doctest_skip__ = ["merge_dicts"]
+
 
 class Logger(FabricLogger, ABC):
     """Base class for experiment loggers."""

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/pytorch_lightning/strategies/fsdp.py

@@ -568,7 +568,8 @@ class FSDPStrategy(ParallelStrategy):
 
             converted_state = {"model": checkpoint.pop("state_dict")}
             converted_state.update({
-                f"optimizer_{idx}": optim_state for idx, optim_state in enumerate(checkpoint.pop("optimizer_states"))
+                f"optimizer_{idx}": optim_state
+                for idx, optim_state in enumerate(checkpoint.pop("optimizer_states", []))
             })
 
             _distributed_checkpoint_save(converted_state, path)

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/pytorch_lightning/trainer/connectors/accelerator_connector.py

@@ -439,21 +439,25 @@ class _AcceleratorConnector:
             from lightning_graphcore import IPUStrategy
 
             return IPUStrategy.strategy_name
-        if self._accelerator_flag == "hpu":
-            if not _habana_available_and_importable():
-                raise ImportError(
-                    "You have asked for HPU but you miss install related integration."
-                    " Please run `pip install lightning-habana` or see for further instructions"
-                    " in https://github.com/Lightning-AI/lightning-Habana/."
-                )
-            if self._parallel_devices and len(self._parallel_devices) > 1:
-                from lightning_habana import HPUParallelStrategy
+        if _habana_available_and_importable():
+            from lightning_habana import HPUAccelerator
+
+            if self._accelerator_flag == "hpu" or isinstance(self._accelerator_flag, HPUAccelerator):
+                if self._parallel_devices and len(self._parallel_devices) > 1:
+                    from lightning_habana import HPUParallelStrategy
 
-                return HPUParallelStrategy.strategy_name
+                    return HPUParallelStrategy.strategy_name
 
-            from lightning_habana import SingleHPUStrategy
+                from lightning_habana import SingleHPUStrategy
+
+                return SingleHPUStrategy(device=torch.device("hpu"))
+        if self._accelerator_flag == "hpu" and not _habana_available_and_importable():
+            raise ImportError(
+                "You asked to run with HPU but you are missing a required dependency."
+                " Please run `pip install lightning-habana` or seek further instructions"
+                " in https://github.com/Lightning-AI/lightning-Habana/."
+            )
 
-            return SingleHPUStrategy(device=torch.device("hpu"))
         if self._accelerator_flag == "tpu" or isinstance(self._accelerator_flag, XLAAccelerator):
             if self._parallel_devices and len(self._parallel_devices) > 1:
                 return XLAStrategy.strategy_name

pytorch-lightning-2.2.2/src/pytorch_lightning/version.info

@@ -0,0 +1 @@
+2.2.2

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2/src/pytorch_lightning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytorch-lightning
-Version: 2.2.1
+Version: 2.2.2
 Summary: PyTorch Lightning is the lightweight PyTorch wrapper for ML researchers. Scale your models. Write less boilerplate.
 Home-page: https://github.com/Lightning-AI/lightning
 Author: Lightning AI et al.
@@ -28,10 +28,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: test
 Provides-Extra: strategies
-Provides-Extra: extra
 Provides-Extra: examples
+Provides-Extra: test
+Provides-Extra: extra
 Provides-Extra: deepspeed
 Provides-Extra: all
 Provides-Extra: dev
@@ -66,7 +66,7 @@ ______________________________________________________________________
 [![DockerHub](https://img.shields.io/docker/pulls/pytorchlightning/pytorch_lightning.svg)](https://hub.docker.com/r/pytorchlightning/pytorch_lightning)
 [![codecov](https://codecov.io/gh/Lightning-AI/pytorch-lightning/graph/badge.svg?token=SmzX8mnKlA)](https://codecov.io/gh/Lightning-AI/pytorch-lightning)
 
-[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=2.2.1)](https://lightning.ai/docs/pytorch/stable/)[![Discord](https://img.shields.io/discord/1077906959069626439?style=plastic)](https://discord.gg/VptPCZkGNa)
+[![ReadTheDocs](https://readthedocs.org/projects/pytorch-lightning/badge/?version=2.2.2)](https://lightning.ai/docs/pytorch/stable/)[![Discord](https://img.shields.io/discord/1077906959069626439?style=plastic)](https://discord.gg/VptPCZkGNa)
 [![license](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/Lightning-AI/lightning/blob/master/LICENSE)
 
 <!--

{pytorch-lightning-2.2.1 → pytorch-lightning-2.2.2}/src/pytorch_lightning.egg-info/requires.txt

@@ -12,7 +12,7 @@ lightning-utilities>=0.8.0
 matplotlib>3.1
 omegaconf>=2.0.5
 hydra-core>=1.0.5
-jsonargparse[signatures]>=4.26.1
+jsonargparse[signatures]>=4.27.7
 rich>=12.3.0
 tensorboardX>=2.2
 bitsandbytes==0.41.0
@@ -35,7 +35,7 @@ deepspeed<=0.9.3,>=0.8.2
 matplotlib>3.1
 omegaconf>=2.0.5
 hydra-core>=1.0.5
-jsonargparse[signatures]>=4.26.1
+jsonargparse[signatures]>=4.27.7
 rich>=12.3.0
 tensorboardX>=2.2
 bitsandbytes==0.41.0
@@ -76,7 +76,7 @@ lightning-utilities>=0.8.0
 matplotlib>3.1
 omegaconf>=2.0.5
 hydra-core>=1.0.5
-jsonargparse[signatures]>=4.26.1
+jsonargparse[signatures]>=4.27.7
 rich>=12.3.0
 tensorboardX>=2.2
 bitsandbytes==0.41.0

pytorch-lightning-2.2.2/src/version.info

@@ -0,0 +1 @@
+2.2.2

pytorch-lightning-2.2.1/src/lightning_fabric/version.info

@@ -1 +0,0 @@
-2.2.1

pytorch-lightning-2.2.1/src/pytorch_lightning/version.info

@@ -1 +0,0 @@
-2.2.1

pytorch-lightning-2.2.1/src/version.info

@@ -1 +0,0 @@
-2.2.1