From 92d8ae066fce292ef11ed37b7fcabccf00445a4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 18:12:33 +0000 Subject: [PATCH 01/11] Update pytorch-lightning requirement in /requirements Updates the requirements on [pytorch-lightning](https://github.com/Lightning-AI/lightning) to permit the latest version. - [Release notes](https://github.com/Lightning-AI/lightning/releases) - [Commits](https://github.com/Lightning-AI/lightning/compare/1.7.1...2.0.3) --- updated-dependencies: - dependency-name: pytorch-lightning dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 40d503aed..eeb8f0e56 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ numpy <1.25.0 -pytorch-lightning >1.7.0, <2.0.0 # strict +pytorch-lightning >1.7.0, <3.0.0 # strict torchmetrics <0.11.0 # strict lightning-utilities >0.3.1 # this is needed for PL 1.7 torchvision >=0.10.0 # todo: move to topic related extras From 9daca59c6c23c344df22dfffc57383de57a3b0c7 Mon Sep 17 00:00:00 2001 From: Jirka Borovec <6035284+Borda@users.noreply.github.com> Date: Fri, 16 Jun 2023 20:17:45 +0200 Subject: [PATCH 02/11] 2.1.0 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index eeb8f0e56..b4701ee17 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ numpy <1.25.0 -pytorch-lightning >1.7.0, <3.0.0 # strict +pytorch-lightning >1.7.0, <2.1.0 # strict torchmetrics <0.11.0 # strict lightning-utilities >0.3.1 # this is needed for PL 1.7 torchvision >=0.10.0 # todo: move to topic related extras From 2027ba3ff55bf5a762fd19ed801fe6e95361e284 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 17 Jun 2023 01:01:17 +0200 Subject: [PATCH 03/11] apply_to_collection --- requirements/base.txt | 2 +- src/pl_bolts/callbacks/data_monitor.py | 3 ++- src/pl_bolts/callbacks/verification/batch_gradient.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b4701ee17..3817ed26c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ numpy <1.25.0 -pytorch-lightning >1.7.0, <2.1.0 # strict +pytorch-lightning >1.7.0, <2.1.0 torchmetrics <0.11.0 # strict lightning-utilities >0.3.1 # this is needed for PL 1.7 torchvision >=0.10.0 # todo: move to topic related extras diff --git a/src/pl_bolts/callbacks/data_monitor.py b/src/pl_bolts/callbacks/data_monitor.py index 62ec3b7f7..f84032b2f 100644 --- a/src/pl_bolts/callbacks/data_monitor.py +++ b/src/pl_bolts/callbacks/data_monitor.py @@ -2,10 +2,11 @@ import numpy as np import torch +from lightning_utilities import apply_to_collection from pytorch_lightning import Callback, LightningModule, Trainer from pytorch_lightning.loggers import TensorBoardLogger, WandbLogger from pytorch_lightning.utilities import rank_zero_warn -from pytorch_lightning.utilities.apply_func import apply_to_collection + from torch import Tensor, nn from torch.nn import Module from torch.utils.hooks import RemovableHandle diff --git a/src/pl_bolts/callbacks/verification/batch_gradient.py b/src/pl_bolts/callbacks/verification/batch_gradient.py index a7fef8254..466e7b902 100644 --- a/src/pl_bolts/callbacks/verification/batch_gradient.py +++ b/src/pl_bolts/callbacks/verification/batch_gradient.py @@ -4,8 +4,8 @@ import torch import torch.nn as nn +from lightning_utilities import apply_to_collection from pytorch_lightning import LightningModule, Trainer -from pytorch_lightning.utilities.apply_func import apply_to_collection from pytorch_lightning.utilities.exceptions import MisconfigurationException from torch import Tensor From 3515466c7b8137f71a2c527c2f16fabd69c2c653 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:01:38 +0000 Subject: [PATCH 04/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pl_bolts/callbacks/data_monitor.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pl_bolts/callbacks/data_monitor.py b/src/pl_bolts/callbacks/data_monitor.py index f84032b2f..2d67c9d6b 100644 --- a/src/pl_bolts/callbacks/data_monitor.py +++ b/src/pl_bolts/callbacks/data_monitor.py @@ -6,7 +6,6 @@ from pytorch_lightning import Callback, LightningModule, Trainer from pytorch_lightning.loggers import TensorBoardLogger, WandbLogger from pytorch_lightning.utilities import rank_zero_warn - from torch import Tensor, nn from torch.nn import Module from torch.utils.hooks import RemovableHandle From dd886e172badc10e53c0493863f31aa37d8b24b5 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 17 Jun 2023 01:12:25 +0200 Subject: [PATCH 05/11] _SignalConnector --- tests/conftest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 7637c059b..6bdc26155 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,9 +5,13 @@ import pytest import torch + from pl_bolts.utils import _IS_WINDOWS, _TORCHVISION_AVAILABLE, _TORCHVISION_LESS_THAN_0_13 from pl_bolts.utils.stability import UnderReviewWarning -from pytorch_lightning.trainer.connectors.signal_connector import SignalConnector +try: + from pytorch_lightning.trainer.connectors.signal_connector import SignalConnector +except ImportError: # patch for PL v2.0+ + from pytorch_lightning.trainer.connectors.signal_connector import _SignalConnector as SignalConnector # GitHub Actions use this path to cache datasets. # Use `datadir` fixture where possible and use `DATASETS_PATH` in From 2a5fe749552165da85c475b5b2367ba0a90d9b41 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:14:20 +0000 Subject: [PATCH 06/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 6bdc26155..e7209607a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,9 +5,9 @@ import pytest import torch - from pl_bolts.utils import _IS_WINDOWS, _TORCHVISION_AVAILABLE, _TORCHVISION_LESS_THAN_0_13 from pl_bolts.utils.stability import UnderReviewWarning + try: from pytorch_lightning.trainer.connectors.signal_connector import SignalConnector except ImportError: # patch for PL v2.0+ From 9751448866a4e07c3a908ccf6bfb4bcc7aa84770 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 17 Jun 2023 08:36:29 +0200 Subject: [PATCH 07/11] LightningCLI --- src/pl_bolts/models/detection/yolo/yolo_module.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pl_bolts/models/detection/yolo/yolo_module.py b/src/pl_bolts/models/detection/yolo/yolo_module.py index b306684fa..f1f28c260 100644 --- a/src/pl_bolts/models/detection/yolo/yolo_module.py +++ b/src/pl_bolts/models/detection/yolo/yolo_module.py @@ -4,9 +4,12 @@ import torch import torch.nn as nn from pytorch_lightning import LightningModule -from pytorch_lightning.utilities.cli import LightningCLI from pytorch_lightning.utilities.types import STEP_OUTPUT from torch import Tensor, optim +try: # Backward compatibility for Lightning CLI + from pytorch_lightning.cli import LightningCLI # PL v1.9+ +except ImportError: + from pytorch_lightning.utilities.cli import LightningCLI # PL v1.8 # It seems to be impossible to avoid mypy errors if using import instead of getattr(). # See https://github.com/python/mypy/issues/8823 From 3e7e0e1ba50d53293bc732633feb94b91c780c76 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 17 Jun 2023 06:36:57 +0000 Subject: [PATCH 08/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pl_bolts/models/detection/yolo/yolo_module.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pl_bolts/models/detection/yolo/yolo_module.py b/src/pl_bolts/models/detection/yolo/yolo_module.py index f1f28c260..f8c70a811 100644 --- a/src/pl_bolts/models/detection/yolo/yolo_module.py +++ b/src/pl_bolts/models/detection/yolo/yolo_module.py @@ -6,6 +6,7 @@ from pytorch_lightning import LightningModule from pytorch_lightning.utilities.types import STEP_OUTPUT from torch import Tensor, optim + try: # Backward compatibility for Lightning CLI from pytorch_lightning.cli import LightningCLI # PL v1.9+ except ImportError: From 0ea4aab501b70e42eccffef2c22fc7c8c92666a0 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 17 Jun 2023 08:44:28 +0200 Subject: [PATCH 09/11] DataParallelStrategy --- src/pl_bolts/models/rl/dqn_model.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pl_bolts/models/rl/dqn_model.py b/src/pl_bolts/models/rl/dqn_model.py index 1aea71a11..5fb7f4ddf 100644 --- a/src/pl_bolts/models/rl/dqn_model.py +++ b/src/pl_bolts/models/rl/dqn_model.py @@ -7,10 +7,13 @@ import torch from pytorch_lightning import LightningModule, Trainer, seed_everything from pytorch_lightning.callbacks import ModelCheckpoint -from pytorch_lightning.strategies import DataParallelStrategy from torch import Tensor, optim from torch.optim.optimizer import Optimizer from torch.utils.data import DataLoader +try: + from pytorch_lightning.strategies import DataParallelStrategy # for PL v1.X +except ImportError: + from lightning_fabric.strategies import DataParallelStrategy # for PL v2.X from pl_bolts.datamodules.experience_source import Experience, ExperienceSourceDataset from pl_bolts.losses.rl import dqn_loss From 76b0cfb040cfa241fd67c32741ba79b7cf0aba1e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 17 Jun 2023 06:44:59 +0000 Subject: [PATCH 10/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pl_bolts/models/rl/dqn_model.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pl_bolts/models/rl/dqn_model.py b/src/pl_bolts/models/rl/dqn_model.py index 5fb7f4ddf..3b17e33ec 100644 --- a/src/pl_bolts/models/rl/dqn_model.py +++ b/src/pl_bolts/models/rl/dqn_model.py @@ -10,6 +10,7 @@ from torch import Tensor, optim from torch.optim.optimizer import Optimizer from torch.utils.data import DataLoader + try: from pytorch_lightning.strategies import DataParallelStrategy # for PL v1.X except ImportError: From fc31c1467783bcb920b077520fff076f19bccf37 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sat, 17 Jun 2023 09:13:27 +0200 Subject: [PATCH 11/11] pytorch_lightning.core.lightning --- docs/source/callbacks/monitor.rst | 2 +- tests/callbacks/test_ort.py | 2 +- tests/callbacks/test_sparseml.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/callbacks/monitor.rst b/docs/source/callbacks/monitor.rst index 20ea42d07..9fab1243d 100644 --- a/docs/source/callbacks/monitor.rst +++ b/docs/source/callbacks/monitor.rst @@ -24,7 +24,7 @@ Data Monitoring in LightningModule The data monitoring callbacks allow you to log and inspect the distribution of data that passes through the training step and layers of the model. When used in combination with a supported logger, the :class:`~pl_bolts.callbacks.data_monitor.TrainingDataMonitor` creates a histogram for each `batch` input in -:meth:`~pytorch_lightning.core.lightning.LightningModule.training_step` and sends it to the logger: +:meth:`~pytorch_lightning.core.LightningModule.training_step` and sends it to the logger: .. code-block:: python diff --git a/tests/callbacks/test_ort.py b/tests/callbacks/test_ort.py index 9186c3ad3..628521648 100644 --- a/tests/callbacks/test_ort.py +++ b/tests/callbacks/test_ort.py @@ -16,7 +16,7 @@ from pl_bolts.callbacks import ORTCallback from pl_bolts.utils import _TORCH_ORT_AVAILABLE from pytorch_lightning import Callback, Trainer -from pytorch_lightning.core.lightning import LightningModule +from pytorch_lightning.core import LightningModule from pytorch_lightning.utilities.exceptions import MisconfigurationException from tests.helpers.boring_model import BoringModel diff --git a/tests/callbacks/test_sparseml.py b/tests/callbacks/test_sparseml.py index 7fc4b2e52..6c508fec6 100644 --- a/tests/callbacks/test_sparseml.py +++ b/tests/callbacks/test_sparseml.py @@ -19,7 +19,7 @@ from pl_bolts.callbacks import SparseMLCallback from pl_bolts.utils import _SPARSEML_AVAILABLE from pytorch_lightning import Callback, Trainer -from pytorch_lightning.core.lightning import LightningModule +from pytorch_lightning.core import LightningModule from pytorch_lightning.utilities.exceptions import MisconfigurationException from tests.helpers.boring_model import BoringModel