lightning 2.4.0__tar.gz → 2.4.0.dev20240707__tar.gz

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/.actions/assistant.py

@@ -18,13 +18,13 @@ import re
 import shutil
 import tempfile
 import urllib.request
+from distutils.version import LooseVersion
 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, Dict, Iterable, Iterator, List, Optional, Sequence, Tuple, Union
 
-from packaging.requirements import Requirement
-from packaging.version import Version
+from pkg_resources import Requirement, parse_requirements, yield_lines
 
 REQUIREMENT_FILES = {
     "pytorch": (
@@ -80,15 +80,14 @@ class _RequirementWithComment(Requirement):
         out = str(self)
         if self.strict:
             return f"{out}  {self.strict_string}"
-        specs = [(spec.operator, spec.version) for spec in self.specifier]
         if unfreeze == "major":
-            for operator, version in specs:
+            for operator, version in self.specs:
                 if operator in ("<", "<="):
-                    major = Version(version).major
+                    major = LooseVersion(version).version[0]
                     # replace upper bound with major version increased by one
                     return out.replace(f"{operator}{version}", f"<{major + 1}.0")
         elif unfreeze == "all":
-            for operator, version in specs:
+            for operator, version in self.specs:
                 if operator in ("<", "<="):
                     # drop upper bound
                     return out.replace(f"{operator}{version},", "")
@@ -97,25 +96,33 @@ class _RequirementWithComment(Requirement):
         return out
 
 
-def _parse_requirements(lines: Iterable[str]) -> Iterator[_RequirementWithComment]:
+def _parse_requirements(strs: Union[str, Iterable[str]]) -> Iterator[_RequirementWithComment]:
     """Adapted from `pkg_resources.parse_requirements` to include comments.
 
     >>> txt = ['# ignored', '', 'this # is an', '--piparg', 'example', 'foo # strict', 'thing', '-r different/file.txt']
     >>> [r.adjust('none') for r in _parse_requirements(txt)]
     ['this', 'example', 'foo  # strict', 'thing']
+    >>> txt = '\\n'.join(txt)
+    >>> [r.adjust('none') for r in _parse_requirements(txt)]
+    ['this', 'example', 'foo  # strict', 'thing']
 
     """
+    lines = yield_lines(strs)
     pip_argument = None
     for line in lines:
-        line = line.strip()
-        if not line or line.startswith("#"):
-            continue
         # Drop comments -- a hash without a space may be in a URL.
         if " #" in line:
             comment_pos = line.find(" #")
             line, comment = line[:comment_pos], line[comment_pos:]
         else:
             comment = ""
+        # If there is a line continuation, drop it, and append the next line.
+        if line.endswith("\\"):
+            line = line[:-2].strip()
+            try:
+                line += next(lines)
+            except StopIteration:
+                return
         # If there's a pip argument, save it
         if line.startswith("--"):
             pip_argument = line
@@ -141,7 +148,7 @@ def load_requirements(path_dir: str, file_name: str = "base.txt", unfreeze: str
         logging.warning(f"Folder {path_dir} does not have any base requirements.")
         return []
     assert path.exists(), (path_dir, file_name, path)
-    text = path.read_text().splitlines()
+    text = path.read_text()
     return [req.adjust(unfreeze) for req in _parse_requirements(text)]
 
 
@@ -361,7 +368,7 @@ class AssistantCLI:
             if not ln_ or ln_.startswith("#"):
                 final.append(line)
                 continue
-            req = list(_parse_requirements([ln_]))[0]
+            req = list(parse_requirements(ln_))[0]
             if req.name not in packages:
                 final.append(line)
         print(final)

{lightning-2.4.0/src/lightning.egg-info → lightning-2.4.0.dev20240707}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning
-Version: 2.4.0
+Version: 2.4.0.dev20240707
 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.
@@ -21,35 +21,35 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.9
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: pytorch-examples
-Provides-Extra: pytorch-extra
-Provides-Extra: pytorch-test
-Provides-Extra: pytorch-strategies
+Provides-Extra: fabric-strategies
 Provides-Extra: fabric-examples
 Provides-Extra: fabric-test
-Provides-Extra: fabric-strategies
+Provides-Extra: pytorch-strategies
+Provides-Extra: pytorch-examples
+Provides-Extra: pytorch-test
+Provides-Extra: pytorch-extra
 Provides-Extra: fabric-all
 Provides-Extra: fabric-dev
 Provides-Extra: pytorch-all
 Provides-Extra: pytorch-dev
+Provides-Extra: data
+Provides-Extra: strategies
 Provides-Extra: examples
-Provides-Extra: extra
 Provides-Extra: test
-Provides-Extra: strategies
-Provides-Extra: data
+Provides-Extra: extra
 Provides-Extra: all
 Provides-Extra: dev
 License-File: LICENSE
 
 <div align="center">
 
-<img alt="Lightning" src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/ptl_banner.png" width="800px" style="max-width: 100%;">
+<img alt="Lightning" src="https://pl-public-data.s3.amazonaws.com/assets_lightning/LightningColor.png" width="800px" style="max-width: 100%;">
 
 <br/>
 <br/>
@@ -65,7 +65,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.4.0">Docs</a> •
+  <a href="https://pytorch-lightning.readthedocs.io/en/2.4.0.dev20240707">Docs</a> •
   <a href="#community">Community</a> •
   <a href="https://lightning.ai/docs/pytorch/stable/generated/CONTRIBUTING.html">Contribute</a> •
 </p>
@@ -141,17 +141,12 @@ ______________________________________________________________________
 ### Examples
 Explore various types of training possible with PyTorch Lightning. Pretrain and finetune ANY kind of model to perform ANY task like classification, segmentation, summarization and more:    
 
-| Task                                                                                                        | Description                                                    | Run |
-|-------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------|---|
-| [Hello world](#hello-simple-model)                                                                          | Pretrain - Hello world example                                 | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/pytorch-lightning-hello-world"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |
-| [Image classification](https://lightning.ai/lightning-ai/studios/image-classification-with-pytorch-lightning) | Finetune - ResNet-34 model to classify images of cars          | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/image-classification-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Image segmentation](https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning)   | Finetune - ResNet-50 model to segment images                   | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Object detection](https://lightning.ai/lightning-ai/studios/object-detection-with-pytorch-lightning)       | Finetune - Faster R-CNN model to detect objects                   | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/object-detection-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |
-| [Text classification](https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning) | Finetune - text classifier (BERT model)                        | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Text summarization](https://lightning.ai/lightning-ai/studios/text-summarization-with-pytorch-lightning)   | Finetune - text summarization (Hugging Face transformer model) | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/text-summarization-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Audio generation](https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator)        | Finetune - audio generator (transformer model)                 | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [LLM finetuning](https://lightning.ai/lightning-ai/studios/finetune-an-llm-with-pytorch-lightning)          | Finetune - LLM (Meta Llama 3.1 8B)                | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/finetune-an-llm-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> | 
-| [Image generation](https://lightning.ai/lightning-ai/studios/train-a-diffusion-model-with-pytorch-lightning)          | Pretrain - Image generator (diffusion model)                | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/train-a-diffusion-model-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> | 
+| Task                                                                                                        | Description                                    | Run |
+|-------------------------------------------------------------------------------------------------------------|------------------------------------------------|---|
+| [Hello world](#hello-simple-model)                                                                          | Pretrain - Hello world example                 | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/pytorch-lightning-hello-world"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |
+| [Image segmentation](https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning)   | Finetune - ResNet-50 model to segment images   | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
+| [Text classification](https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning) | Finetune - text classifier (BERT model)        | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
+| [Audio generation](https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator)    | Finetune - audio generator (transformer model) | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
 
 ### Hello simple model
 
@@ -587,7 +582,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.4.0)](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.4.0.dev20240707)](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.4.0 → lightning-2.4.0.dev20240707}/README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-<img alt="Lightning" src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/ptl_banner.png" width="800px" style="max-width: 100%;">
+<img alt="Lightning" src="https://pl-public-data.s3.amazonaws.com/assets_lightning/LightningColor.png" width="800px" style="max-width: 100%;">
 
 <br/>
 <br/>
@@ -133,17 +133,12 @@ ______________________________________________________________________
 ### Examples
 Explore various types of training possible with PyTorch Lightning. Pretrain and finetune ANY kind of model to perform ANY task like classification, segmentation, summarization and more:    
 
-| Task                                                                                                        | Description                                                    | Run |
-|-------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------|---|
-| [Hello world](#hello-simple-model)                                                                          | Pretrain - Hello world example                                 | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/pytorch-lightning-hello-world"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |
-| [Image classification](https://lightning.ai/lightning-ai/studios/image-classification-with-pytorch-lightning) | Finetune - ResNet-34 model to classify images of cars          | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/image-classification-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Image segmentation](https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning)   | Finetune - ResNet-50 model to segment images                   | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Object detection](https://lightning.ai/lightning-ai/studios/object-detection-with-pytorch-lightning)       | Finetune - Faster R-CNN model to detect objects                   | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/object-detection-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |
-| [Text classification](https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning) | Finetune - text classifier (BERT model)                        | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Text summarization](https://lightning.ai/lightning-ai/studios/text-summarization-with-pytorch-lightning)   | Finetune - text summarization (Hugging Face transformer model) | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/text-summarization-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [Audio generation](https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator)        | Finetune - audio generator (transformer model)                 | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
-| [LLM finetuning](https://lightning.ai/lightning-ai/studios/finetune-an-llm-with-pytorch-lightning)          | Finetune - LLM (Meta Llama 3.1 8B)                | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/finetune-an-llm-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> | 
-| [Image generation](https://lightning.ai/lightning-ai/studios/train-a-diffusion-model-with-pytorch-lightning)          | Pretrain - Image generator (diffusion model)                | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/train-a-diffusion-model-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> | 
+| Task                                                                                                        | Description                                    | Run |
+|-------------------------------------------------------------------------------------------------------------|------------------------------------------------|---|
+| [Hello world](#hello-simple-model)                                                                          | Pretrain - Hello world example                 | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/pytorch-lightning-hello-world"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |
+| [Image segmentation](https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning)   | Finetune - ResNet-50 model to segment images   | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/image-segmentation-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
+| [Text classification](https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning) | Finetune - text classifier (BERT model)        | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/text-classification-with-pytorch-lightning"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
+| [Audio generation](https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator)    | Finetune - audio generator (transformer model) | <a target="_blank" href="https://lightning.ai/lightning-ai/studios/finetune-a-personal-ai-music-generator"><img src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/app-2/studio-badge.svg" alt="Open In Studio"/></a> |   
 
 ### Hello simple model
 

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/pyproject.toml

@@ -16,7 +16,6 @@
 requires = [
     "setuptools",
     "wheel",
-    "packaging",
 ]
 
 

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/requirements/base.txt

@@ -1,6 +1,7 @@
 PyYAML<7.0,>=5.4
 fsspec[http]<2025.0,>=2022.5.0
 lightning-utilities<1.0,>=0.10.0
+numpy<2.0,>=1.21.0
 packaging<24.0,>=20.0
 torch<3.0,>=2.1.0
 torchmetrics<2.0,>=0.7.0

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/requirements/fabric/base.txt

@@ -1,6 +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
 
+numpy >=1.21.0, <1.27.0
 torch >=2.1.0, <2.5.0
 fsspec[http] >=2022.5.0, <2024.4.0
 packaging >=20.0, <=23.1

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/requirements/fabric/test.txt

@@ -1,5 +1,4 @@
 coverage ==7.3.1
-numpy >=1.17.2, <1.27.0
 pytest ==7.4.0
 pytest-cov ==4.1.0
 pytest-timeout ==2.1.0

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/requirements/pytorch/base.txt

@@ -1,7 +1,8 @@
 # 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.5.0
+numpy >=1.21.0, <1.27.0
+torch >=2.1.0, <2.4.0
 tqdm >=4.57.0, <4.67.0
 PyYAML >=5.4, <6.1.0
 fsspec[http] >=2022.5.0, <2024.4.0

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/requirements/pytorch/examples.txt

@@ -2,7 +2,7 @@
 #  in case you want to preserve/enforce restrictions on the latest compatible version, add "strict" as an in-line comment
 
 requests <2.32.0
-torchvision >=0.16.0, <0.20.0
+torchvision >=0.16.0, <0.19.0
 ipython[all] <8.15.0
 torchmetrics >=0.10.0, <1.3.0
 lightning-utilities >=0.8.0, <0.12.0

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/requirements/pytorch/test.txt

@@ -8,9 +8,8 @@ pytest-random-order ==1.1.0
 # needed in tests
 cloudpickle >=1.3, <2.3.0
 scikit-learn >0.22.1, <1.4.0
-numpy >=1.17.2, <1.27.0
-onnx >=1.12.0, <1.17.0
-onnxruntime >=1.12.0, <1.19.0
+onnx >=1.12.0, <1.15.0
+onnxruntime >=1.12.0, <1.17.0
 psutil <5.9.6 # for `DeviceStatsMonitor`
 pandas >1.0, <2.2.0  # needed in benchmarks
 fastapi  # for `ServableModuleValidator`  # not setting version as re-defined in App

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/__setup__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from types import ModuleType
 from typing import Any, Dict
 
-from setuptools import find_namespace_packages
+from setuptools import find_packages
 
 _PROJECT_ROOT = "."
 _SOURCE_ROOT = os.path.join(_PROJECT_ROOT, "src")
@@ -87,14 +87,14 @@ def _setup_args() -> Dict[str, Any]:
         "url": about.__homepage__,
         "download_url": "https://github.com/Lightning-AI/lightning",
         "license": about.__license__,
-        "packages": find_namespace_packages(where="src", include=["lightning", "lightning.*"]),
+        "packages": find_packages(where="src", include=["lightning", "lightning.*"]),
         "package_dir": {"": "src"},
         "long_description": long_description,
         "long_description_content_type": "text/markdown",
         "include_package_data": True,
         "zip_safe": False,
-        "keywords": ["deep learning", "pytorch", "AI"],
-        "python_requires": ">=3.9",
+        "keywords": ["deep learning", "pytorch", "AI"],  # todo: aggregate tags from all packages
+        "python_requires": ">=3.8",  # todo: take the lowes based on all packages
         "entry_points": {
             "console_scripts": [
                 "fabric = lightning.fabric.cli:_main",
@@ -124,9 +124,9 @@ def _setup_args() -> Dict[str, Any]:
             "Operating System :: OS Independent",
             # Specify the Python versions you support here.
             "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
-            "Programming Language :: Python :: 3.12",
         ],  # todo: consider aggregation/union of tags from particular packages
     }

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/CHANGELOG.md

@@ -5,29 +5,39 @@ 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.4.0] - 2024-08-06
+## [unreleased] - YYYY-MM-DD
 
 ### Added
 
 - Made saving non-distributed checkpoints fully atomic ([#20011](https://github.com/Lightning-AI/pytorch-lightning/pull/20011))
-- Added a flag `verbose` to the `seed_everything()` function ([#20108](https://github.com/Lightning-AI/pytorch-lightning/pull/20108))
-- Added support for PyTorch 2.4 ([#20028](https://github.com/Lightning-AI/pytorch-lightning/pull/20028))
-- Added support for Python 3.12 ([20078](https://github.com/Lightning-AI/pytorch-lightning/pull/20078))
+
+-
 
 ### Changed
 
-- Changed the implementation of how seeds are chosen for dataloader workers when using `seed_everything(..., workers=True)` ([#20055](https://github.com/Lightning-AI/pytorch-lightning/pull/20055))
-- NumPy is no longer a required dependency ([#20090](https://github.com/Lightning-AI/pytorch-lightning/issues/20090))
+-
+
+-
+
+### Deprecated
+
+-
+
+-
 
 ### Removed
 
 - Removed support for PyTorch 2.1 ([#20009](https://github.com/Lightning-AI/lightning/pull/20009))
-- Removed support for Python 3.8 ([#20071](https://github.com/Lightning-AI/lightning/pull/20071))
+
+
+-
 
 ### Fixed
 
-- Fixed an attribute error when loading a checkpoint into a quantized model using the `_lazy_load()` function ([#20121](https://github.com/Lightning-AI/lightning/pull/20121))
-- Fixed `_optimizer_to_device` logic for special 'step' key in optimizer state causing performance regression ([#20019](https://github.com/Lightning-AI/lightning/pull/20019))
+-
+
+-
+
 
 
 ## [2.3.0] - 2024-06-13

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/__init__.py

@@ -37,6 +37,9 @@ import lightning.fabric._graveyard  # noqa: E402, F401  # isort: skip
 
 __all__ = ["Fabric", "seed_everything", "is_wrapped"]
 
+# for compatibility with namespace packages
+__import__("pkg_resources").declare_namespace(__name__)
+
 
 if os.environ.get("POSSIBLE_USER_WARNINGS", "").lower() in ("0", "off"):
     disable_possible_user_warnings()

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/fabric.py

@@ -909,7 +909,7 @@ class Fabric:
             logger.log_metrics(metrics=metrics, step=step)
 
     @staticmethod
-    def seed_everything(seed: Optional[int] = None, workers: Optional[bool] = None, verbose: bool = True) -> int:
+    def seed_everything(seed: Optional[int] = None, workers: Optional[bool] = None) -> int:
         r"""Helper function to seed everything without explicitly importing Lightning.
 
         See :func:`~lightning.fabric.utilities.seed.seed_everything` for more details.
@@ -919,7 +919,7 @@ class Fabric:
             # Lightning sets `workers=False` by default to avoid breaking reproducibility, but since this is a new
             # release, we can afford to do it.
             workers = True
-        return seed_everything(seed=seed, workers=workers, verbose=verbose)
+        return seed_everything(seed=seed, workers=workers)
 
     def _wrap_and_launch(self, to_run: Callable, *args: Any, **kwargs: Any) -> Any:
         self._launched = True

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/loggers/csv_logs.py

@@ -172,6 +172,7 @@ class CSVLogger(Logger):
         versions_root = os.path.join(self._root_dir, self.name)
 
         if not _is_dir(self._fs, versions_root, strict=True):
+            log.warning("Missing logger folder: %s", versions_root)
             return 0
 
         existing_versions = []

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/loggers/tensorboard.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 import os
 from argparse import Namespace
 from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional, Union
@@ -29,6 +30,8 @@ from lightning.fabric.utilities.rank_zero import rank_zero_only, rank_zero_warn
 from lightning.fabric.utilities.types import _PATH
 from lightning.fabric.wrappers import _unwrap_objects
 
+log = logging.getLogger(__name__)
+
 _TENSORBOARD_AVAILABLE = RequirementCache("tensorboard")
 _TENSORBOARDX_AVAILABLE = RequirementCache("tensorboardX")
 if TYPE_CHECKING:
@@ -302,6 +305,8 @@ class TensorBoardLogger(Logger):
         try:
             listdir_info = self._fs.listdir(save_dir)
         except OSError:
+            # TODO(fabric): This message can be confusing (did user do something wrong?). Improve it or remove it.
+            log.warning("Missing logger folder: %s", save_dir)
             return 0
 
         existing_versions = []

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/plugins/collectives/torch_collective.py

@@ -95,11 +95,11 @@ class TorchCollective(Collective):
 
     @override
     def send(self, tensor: Tensor, dst: int, tag: int = 0) -> None:
-        dist.send(tensor, dst, tag=tag, group=self.group)  # type: ignore[arg-type]
+        dist.send(tensor, dst, tag=tag, group=self.group)
 
     @override
     def recv(self, tensor: Tensor, src: Optional[int] = None, tag: int = 0) -> Tensor:
-        dist.recv(tensor, src, tag=tag, group=self.group)  # type: ignore[arg-type]
+        dist.recv(tensor, src, tag=tag, group=self.group)
         return tensor
 
     def all_gather_object(self, object_list: List[Any], obj: Any) -> List[Any]:

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/plugins/precision/amp.py

@@ -40,7 +40,7 @@ class MixedPrecision(Precision):
         self,
         precision: Literal["16-mixed", "bf16-mixed"],
         device: str,
-        scaler: Optional["torch.amp.GradScaler"] = None,
+        scaler: Optional["torch.cuda.amp.GradScaler"] = None,
     ) -> None:
         if precision not in ("16-mixed", "bf16-mixed"):
             raise ValueError(

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/strategies/deepspeed.py

@@ -43,7 +43,6 @@ if TYPE_CHECKING:
     from deepspeed import DeepSpeedEngine
 
 _DEEPSPEED_AVAILABLE = RequirementCache("deepspeed")
-_DEEPSPEED_GREATER_EQUAL_0_14_1 = RequirementCache("deepspeed>=0.14.1")
 
 
 # TODO(fabric): Links in the docstrings to PL-specific deepspeed user docs need to be replaced.
@@ -499,10 +498,7 @@ class DeepSpeedStrategy(DDPStrategy, _Sharded):
             )
         engine = engines[0]
 
-        if _DEEPSPEED_GREATER_EQUAL_0_14_1:
-            from deepspeed.runtime.base_optimizer import DeepSpeedOptimizer
-        else:
-            from deepspeed.runtime import DeepSpeedOptimizer
+        from deepspeed.runtime import DeepSpeedOptimizer
 
         optimzer_state_requested = any(isinstance(item, (Optimizer, DeepSpeedOptimizer)) for item in state.values())
 

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/strategies/fsdp.py

@@ -864,7 +864,7 @@ def _distributed_checkpoint_save(converted_state: Dict[str, Any], path: Path) ->
 
         # let torch automatically infer the writer to use. This might also support fsspec paths in the future
         # https://github.com/pytorch/pytorch/issues/118036
-        save(converted_state, checkpoint_id=path)
+        save(converted_state, checkpoint_id=path)  # type: ignore[call-arg]
     else:  # deprecated
         from torch.distributed.checkpoint import FileSystemWriter
 
@@ -883,7 +883,7 @@ def _distributed_checkpoint_load(module_state: Dict[str, Any], path: Path) -> No
 
         # let torch automatically infer the reader to use. This might also support fsspec paths in the future
         # https://github.com/pytorch/pytorch/issues/118036
-        load(module_state, checkpoint_id=path)
+        load(module_state, checkpoint_id=path)  # type: ignore[call-arg]
     else:  # deprecated
         from torch.distributed.checkpoint import FileSystemReader
 

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/strategies/model_parallel.py

@@ -172,7 +172,7 @@ class ModelParallelStrategy(ParallelStrategy):
         )
 
     @override
-    def setup_module(self, module: Module) -> Module:
+    def setup_module(self, module: TModel) -> TModel:
         from torch.distributed.fsdp import FullyShardedDataParallel
 
         if any(isinstance(mod, FullyShardedDataParallel) for mod in module.modules()):
@@ -181,7 +181,7 @@ class ModelParallelStrategy(ParallelStrategy):
                 f" The `{self.__class__.__name__}` only supports the new FSDP2 APIs in PyTorch >= 2.4."
             )
 
-        module = self._parallelize_fn(module, self.device_mesh)  # type: ignore[arg-type]
+        module = self._parallelize_fn(module, self.device_mesh)
         if not isinstance(module, Module):
             raise TypeError(
                 f"The `parallelize_fn` must return a `nn.Module` instance, but got: {type(module).__name__}"
@@ -458,11 +458,11 @@ def _load_checkpoint(
         return metadata
 
     if _is_full_checkpoint(path):
-        checkpoint = torch.load(path, mmap=True, map_location="cpu", weights_only=False)
+        checkpoint = torch.load(path, mmap=True, map_location="cpu")
         _load_raw_module_state(checkpoint.pop(module_key), module, strict=strict)
 
         state_dict_options = StateDictOptions(
-            broadcast_from_rank0=True,
+            broadcast_from_rank0=True,  # type: ignore[call-arg]
             full_state_dict=True,
             strict=strict,
         )
@@ -546,7 +546,7 @@ def _load_raw_module_state(
         from torch.distributed.checkpoint.state_dict import StateDictOptions, set_model_state_dict
 
         state_dict_options = StateDictOptions(
-            broadcast_from_rank0=True,
+            broadcast_from_rank0=True,  # type: ignore[call-arg]
             full_state_dict=True,
             # must be set False to allow loading each param separately below
             strict=False,

{lightning-2.4.0 → lightning-2.4.0.dev20240707}/src/lightning/fabric/utilities/apply_func.py

@@ -15,22 +15,19 @@
 
 from abc import ABC
 from functools import partial
-from typing import TYPE_CHECKING, Any, Callable, List, Tuple, Union
+from typing import Any, Callable, List, Tuple, Union
 
+import numpy as np
 import torch
 from lightning_utilities.core.apply_func import apply_to_collection
 from torch import Tensor
 
-from lightning.fabric.utilities.imports import _NUMPY_AVAILABLE
 from lightning.fabric.utilities.types import _DEVICE
 
-if TYPE_CHECKING:
-    import numpy as np
-
 _BLOCKING_DEVICE_TYPES = ("cpu", "mps")
 
 
-def _from_numpy(value: "np.ndarray", device: _DEVICE) -> Tensor:
+def _from_numpy(value: np.ndarray, device: _DEVICE) -> Tensor:
     return torch.from_numpy(value).to(device)
 
 
@@ -39,13 +36,9 @@ CONVERSION_DTYPES: List[Tuple[Any, Callable[[Any, Any], Tensor]]] = [
     (bool, partial(torch.tensor, dtype=torch.uint8)),
     (int, partial(torch.tensor, dtype=torch.int)),
     (float, partial(torch.tensor, dtype=torch.float)),
+    (np.ndarray, _from_numpy),
 ]
 
-if _NUMPY_AVAILABLE:
-    import numpy as np
-
-    CONVERSION_DTYPES.append((np.ndarray, _from_numpy))
-
 
 class _TransferableDataType(ABC):
     """A custom type for data that can be moved to a torch device via ``.to(...)``.