lightning 2.4.0.dev20240929__tar.gz → 2.4.0.dev20241006__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning
-Version: 2.4.0.dev20240929
+Version: 2.4.0.dev20241006
 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.
@@ -67,7 +67,7 @@ ______________________________________________________________________
   <a href="#lightning-fabric-expert-control">Fabric</a> •
   <a href="https://lightning.ai/">Lightning AI</a> •   
   <a href="#community">Community</a> •
-  <a href="https://pytorch-lightning.readthedocs.io/en/2.4.0.dev20240929">Docs</a>
+  <a href="https://pytorch-lightning.readthedocs.io/en/2.4.0.dev20241006">Docs</a>
 </p>
 
 <!-- DO NOT ADD CONDA DOWNLOADS... README CHANGES MUST BE APPROVED BY EDEN OR WILL -->
@@ -592,7 +592,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.dev20240929)](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.dev20241006)](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.dev20240929 → lightning-2.4.0.dev20241006}/requirements/fabric/strategies.txt

@@ -6,4 +6,5 @@
 # note: is a bug around 0.10 with `MPS_Accelerator must implement all abstract methods`
 #  shall be resolved by https://github.com/microsoft/DeepSpeed/issues/4372
 deepspeed >=0.8.2, <=0.9.3; platform_system != "Windows" and platform_system != "Darwin"  # strict
-bitsandbytes >=0.42.0,<0.43.0
+bitsandbytes >=0.44.0,<0.44.2; sys_platform == 'linux' or sys_platform == 'win32'
+bitsandbytes >=0.42.0,<0.43.0 ; sys_platform == 'darwin'

{lightning-2.4.0.dev20240929 → lightning-2.4.0.dev20241006}/requirements/pytorch/extra.txt

@@ -8,4 +8,5 @@ hydra-core >=1.2.0, <1.4.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.42.0,<0.43.0
+bitsandbytes >=0.44.0,<0.44.2; sys_platform == 'linux' or sys_platform == 'win32'
+bitsandbytes >=0.42.0,<0.43.0 ; sys_platform == 'darwin'

{lightning-2.4.0.dev20240929 → lightning-2.4.0.dev20241006}/src/lightning/fabric/plugins/precision/bitsandbytes.py

@@ -43,7 +43,7 @@ _BITSANDBYTES_AVAILABLE = RequirementCache("bitsandbytes>=0.42.0")
 
 
 class BitsandbytesPrecision(Precision):
-    """Plugin for quantizing weights with `bitsandbytes <https://github.com/TimDettmers/bitsandbytes>`__.
+    """Plugin for quantizing weights with `bitsandbytes <https://github.com/bitsandbytes-foundation/bitsandbytes>`__.
 
     .. warning::  This is an :ref:`experimental <versioning:Experimental API>` feature.
 
@@ -184,11 +184,15 @@ def _replace_param(
     if param.device.type == "meta":
         if isinstance(param, bnb.nn.Params4bit):
             return bnb.nn.Params4bit(
-                data,
+                data=data,
                 requires_grad=data.requires_grad,
                 quant_state=quant_state,
+                blocksize=param.blocksize,
                 compress_statistics=param.compress_statistics,
                 quant_type=param.quant_type,
+                quant_storage=param.quant_storage,
+                module=param.module,
+                bnb_quantized=param.bnb_quantized,
             )
         return torch.nn.Parameter(data, requires_grad=data.requires_grad)
     param.data = data
@@ -322,6 +326,7 @@ def _import_bitsandbytes() -> ModuleType:
                 return
             assert isinstance(self.weight, bnb.nn.Params4bit)
             self.weight = self.quantize(self.weight, weight, device)
+            self.weight.bnb_quantized = True
 
         @staticmethod
         def quantize(
@@ -337,6 +342,7 @@ def _import_bitsandbytes() -> ModuleType:
                 blocksize=params4bit.blocksize,
                 compress_statistics=params4bit.compress_statistics,
                 quant_type=params4bit.quant_type,
+                quant_storage=params4bit.quant_storage,
             )
             return _replace_param(params4bit, w_4bit, quant_state)
 

{lightning-2.4.0.dev20240929 → lightning-2.4.0.dev20241006}/src/lightning/pytorch/callbacks/progress/rich_progress.py

@@ -206,14 +206,14 @@ class RichProgressBarTheme:
 
     """
 
-    description: Union[str, "Style"] = "white"
+    description: Union[str, "Style"] = ""
     progress_bar: Union[str, "Style"] = "#6206E0"
     progress_bar_finished: Union[str, "Style"] = "#6206E0"
     progress_bar_pulse: Union[str, "Style"] = "#6206E0"
-    batch_progress: Union[str, "Style"] = "white"
-    time: Union[str, "Style"] = "grey54"
-    processing_speed: Union[str, "Style"] = "grey70"
-    metrics: Union[str, "Style"] = "white"
+    batch_progress: Union[str, "Style"] = ""
+    time: Union[str, "Style"] = "dim"
+    processing_speed: Union[str, "Style"] = "dim underline"
+    metrics: Union[str, "Style"] = "italic"
     metrics_text_delimiter: str = " "
     metrics_format: str = ".3f"
 
@@ -280,7 +280,6 @@ class RichProgressBar(ProgressBar):
         self._metric_component: Optional[MetricsTextColumn] = None
         self._progress_stopped: bool = False
         self.theme = theme
-        self._update_for_light_colab_theme()
 
     @property
     def refresh_rate(self) -> float:
@@ -318,13 +317,6 @@ class RichProgressBar(ProgressBar):
         assert self.test_progress_bar_id is not None
         return self.progress.tasks[self.test_progress_bar_id]
 
-    def _update_for_light_colab_theme(self) -> None:
-        if _detect_light_colab_theme():
-            attributes = ["description", "batch_progress", "metrics"]
-            for attr in attributes:
-                if getattr(self.theme, attr) == "white":
-                    setattr(self.theme, attr, "black")
-
     @override
     def disable(self) -> None:
         self._enabled = False
@@ -449,7 +441,7 @@ class RichProgressBar(ProgressBar):
     def _add_task(self, total_batches: Union[int, float], description: str, visible: bool = True) -> "TaskID":
         assert self.progress is not None
         return self.progress.add_task(
-            f"[{self.theme.description}]{description}",
+            f"[{self.theme.description}]{description}" if self.theme.description else description,
             total=total_batches,
             visible=visible,
         )
@@ -656,20 +648,3 @@ class RichProgressBar(ProgressBar):
         state["progress"] = None
         state["_console"] = None
         return state
-
-
-def _detect_light_colab_theme() -> bool:
-    """Detect if it's light theme in Colab."""
-    try:
-        import get_ipython
-    except (NameError, ModuleNotFoundError):
-        return False
-    ipython = get_ipython()
-    if "google.colab" in str(ipython.__class__):
-        try:
-            from google.colab import output
-
-            return output.eval_js('document.documentElement.matches("[theme=light]")')
-        except ModuleNotFoundError:
-            return False
-    return False

{lightning-2.4.0.dev20240929 → lightning-2.4.0.dev20241006}/src/lightning/pytorch/plugins/precision/bitsandbytes.py

@@ -16,7 +16,7 @@ from lightning.pytorch.plugins.precision.precision import Precision
 
 
 class BitsandbytesPrecision(Precision, FabricBNBPrecision):
-    """Plugin for quantizing weights with `bitsandbytes <https://github.com/TimDettmers/bitsandbytes>`__.
+    """Plugin for quantizing weights with `bitsandbytes <https://github.com/bitsandbytes-foundation/bitsandbytes>`__.
 
     .. warning::  This is an :ref:`experimental <versioning:Experimental API>` feature.
 

lightning-2.4.0.dev20241006/src/lightning/version.info

@@ -0,0 +1 @@
+2.4.0.dev20241006

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lightning
-Version: 2.4.0.dev20240929
+Version: 2.4.0.dev20241006
 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.
@@ -67,7 +67,7 @@ ______________________________________________________________________
   <a href="#lightning-fabric-expert-control">Fabric</a> •
   <a href="https://lightning.ai/">Lightning AI</a> •   
   <a href="#community">Community</a> •
-  <a href="https://pytorch-lightning.readthedocs.io/en/2.4.0.dev20240929">Docs</a>
+  <a href="https://pytorch-lightning.readthedocs.io/en/2.4.0.dev20241006">Docs</a>
 </p>
 
 <!-- DO NOT ADD CONDA DOWNLOADS... README CHANGES MUST BE APPROVED BY EDEN OR WILL -->
@@ -592,7 +592,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.dev20240929)](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.dev20241006)](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.dev20240929 → lightning-2.4.0.dev20241006}/src/lightning.egg-info/SOURCES.txt

@@ -17,11 +17,11 @@ requirements/pytorch/extra.txt
 requirements/pytorch/strategies.txt
 requirements/pytorch/test.txt
 src/version.info
-src/lightning/6354701a6af025b6f87424b50ec5812c5ba36bbb1e6e1b7a
 src/lightning/__about__.py
 src/lightning/__init__.py
 src/lightning/__setup__.py
 src/lightning/__version__.py
+src/lightning/f8dfc2530888d2138024e8e950c12c30e01390e950a50231
 src/lightning/py.typed
 src/lightning/version.info
 src/lightning.egg-info/PKG-INFO

{lightning-2.4.0.dev20240929 → lightning-2.4.0.dev20241006}/src/lightning.egg-info/requires.txt

@@ -9,7 +9,6 @@ typing-extensions<6.0,>=4.4.0
 pytorch-lightning
 
 [all]
-bitsandbytes<1.0,>=0.42.0
 hydra-core<2.0,>=1.2.0
 ipython[all]<9.0
 jsonargparse[signatures]<5.0,>=4.27.7
@@ -25,11 +24,16 @@ torchvision<1.0,>=0.16.0
 [all:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
+[all:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[all:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [data]
 litdata<1.0,>=0.2.0rc
 
 [dev]
-bitsandbytes<1.0,>=0.42.0
 click==8.1.7
 cloudpickle<3.0,>=1.3
 coverage==7.3.1
@@ -63,6 +67,12 @@ uvicorn
 [dev:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
+[dev:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[dev:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [examples]
 ipython[all]<9.0
 lightning-utilities<1.0,>=0.8.0
@@ -71,7 +81,6 @@ torchmetrics<2.0,>=0.10.0
 torchvision<1.0,>=0.16.0
 
 [extra]
-bitsandbytes<1.0,>=0.42.0
 hydra-core<2.0,>=1.2.0
 jsonargparse[signatures]<5.0,>=4.27.7
 matplotlib<4.0,>3.1
@@ -79,8 +88,13 @@ omegaconf<3.0,>=2.2.3
 rich<14.0,>=12.3.0
 tensorboardX<3.0,>=2.2
 
-[fabric-all]
+[extra:sys_platform == "darwin"]
 bitsandbytes<1.0,>=0.42.0
+
+[extra:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
+[fabric-all]
 lightning-utilities<1.0,>=0.8.0
 torchmetrics<2.0,>=0.10.0
 torchvision<1.0,>=0.16.0
@@ -88,8 +102,13 @@ torchvision<1.0,>=0.16.0
 [fabric-all:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
-[fabric-dev]
+[fabric-all:sys_platform == "darwin"]
 bitsandbytes<1.0,>=0.42.0
+
+[fabric-all:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
+[fabric-dev]
 click==8.1.7
 coverage==7.3.1
 lightning-utilities<1.0,>=0.8.0
@@ -107,17 +126,28 @@ torchvision<1.0,>=0.16.0
 [fabric-dev:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
+[fabric-dev:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[fabric-dev:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [fabric-examples]
 lightning-utilities<1.0,>=0.8.0
 torchmetrics<2.0,>=0.10.0
 torchvision<1.0,>=0.16.0
 
 [fabric-strategies]
-bitsandbytes<1.0,>=0.42.0
 
 [fabric-strategies:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
+[fabric-strategies:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[fabric-strategies:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [fabric-test]
 click==8.1.7
 coverage==7.3.1
@@ -131,7 +161,6 @@ tensorboardX<3.0,>=2.2
 torchmetrics<2.0,>=0.7.0
 
 [pytorch-all]
-bitsandbytes<1.0,>=0.42.0
 hydra-core<2.0,>=1.2.0
 ipython[all]<9.0
 jsonargparse[signatures]<5.0,>=4.27.7
@@ -147,8 +176,13 @@ torchvision<1.0,>=0.16.0
 [pytorch-all:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
-[pytorch-dev]
+[pytorch-all:sys_platform == "darwin"]
 bitsandbytes<1.0,>=0.42.0
+
+[pytorch-all:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
+[pytorch-dev]
 cloudpickle<3.0,>=1.3
 coverage==7.3.1
 fastapi
@@ -180,6 +214,12 @@ uvicorn
 [pytorch-dev:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
+[pytorch-dev:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[pytorch-dev:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [pytorch-examples]
 ipython[all]<9.0
 lightning-utilities<1.0,>=0.8.0
@@ -188,7 +228,6 @@ torchmetrics<2.0,>=0.10.0
 torchvision<1.0,>=0.16.0
 
 [pytorch-extra]
-bitsandbytes<1.0,>=0.42.0
 hydra-core<2.0,>=1.2.0
 jsonargparse[signatures]<5.0,>=4.27.7
 matplotlib<4.0,>3.1
@@ -196,6 +235,12 @@ omegaconf<3.0,>=2.2.3
 rich<14.0,>=12.3.0
 tensorboardX<3.0,>=2.2
 
+[pytorch-extra:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[pytorch-extra:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [pytorch-strategies]
 
 [pytorch-strategies:platform_system != "Windows" and platform_system != "Darwin"]
@@ -220,11 +265,16 @@ tensorboard<3.0,>=2.9.1
 uvicorn
 
 [strategies]
-bitsandbytes<1.0,>=0.42.0
 
 [strategies:platform_system != "Windows" and platform_system != "Darwin"]
 deepspeed<=0.9.3,>=0.8.2
 
+[strategies:sys_platform == "darwin"]
+bitsandbytes<1.0,>=0.42.0
+
+[strategies:sys_platform == "linux" or sys_platform == "win32"]
+bitsandbytes<1.0,>=0.44.0
+
 [test]
 click==8.1.7
 cloudpickle<3.0,>=1.3

lightning-2.4.0.dev20241006/src/version.info

@@ -0,0 +1 @@
+2.4.0.dev20241006

lightning-2.4.0.dev20240929/src/lightning/version.info

@@ -1 +0,0 @@
-2.4.0.dev20240929

lightning-2.4.0.dev20240929/src/version.info

@@ -1 +0,0 @@
-2.4.0.dev20240929