From d9cfe898a6ae69afeb9d01e71f9fd9df03da5950 Mon Sep 17 00:00:00 2001 From: Raymond G Schireman Date: Thu, 14 Apr 2022 10:02:50 -0400 Subject: [PATCH 1/6] remove val_transform from datamodule.py --- pytorch_lightning/core/datamodule.py | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/pytorch_lightning/core/datamodule.py b/pytorch_lightning/core/datamodule.py index b3198a64cf913..de28a6f0e00eb 100644 --- a/pytorch_lightning/core/datamodule.py +++ b/pytorch_lightning/core/datamodule.py @@ -54,44 +54,21 @@ def teardown(self): name: str = ... - def __init__(self, val_transforms=None, test_transforms=None, dims=None): + def __init__(self, test_transforms=None, dims=None): super().__init__() - if val_transforms is not None: - rank_zero_deprecation( - "DataModule property `val_transforms` was deprecated in v1.5 and will be removed in v1.7." - ) + if test_transforms is not None: rank_zero_deprecation( "DataModule property `test_transforms` was deprecated in v1.5 and will be removed in v1.7." ) if dims is not None: rank_zero_deprecation("DataModule property `dims` was deprecated in v1.5 and will be removed in v1.7.") - self._val_transforms = val_transforms self._test_transforms = test_transforms self._dims = dims if dims is not None else () # Pointer to the trainer object self.trainer = None - @property - def val_transforms(self): - """Optional transforms (or collection of transforms) you can apply to validation dataset. - - .. deprecated:: v1.5 Will be removed in v1.7.0. - """ - - rank_zero_deprecation( - "DataModule property `val_transforms` was deprecated in v1.5 and will be removed in v1.7." - ) - return self._val_transforms - - @val_transforms.setter - def val_transforms(self, t): - rank_zero_deprecation( - "DataModule property `val_transforms` was deprecated in v1.5 and will be removed in v1.7." - ) - self._val_transforms = t - @property def test_transforms(self): """Optional transforms (or collection of transforms) you can apply to test dataset. From 02a87671522a0ca4ee49a68eeab5719ff568089a Mon Sep 17 00:00:00 2001 From: Raymond G Schireman Date: Thu, 14 Apr 2022 10:05:32 -0400 Subject: [PATCH 2/6] remove val_transforms from tests --- tests/deprecated_api/test_remove_1-7.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/deprecated_api/test_remove_1-7.py b/tests/deprecated_api/test_remove_1-7.py index 5f1b2d32dc865..8108708c702fb 100644 --- a/tests/deprecated_api/test_remove_1-7.py +++ b/tests/deprecated_api/test_remove_1-7.py @@ -41,12 +41,8 @@ def test_v1_7_0_datamodule_transform_properties(tmpdir): dm = MNISTDataModule() - with pytest.deprecated_call(match=r"DataModule property `val_transforms` was deprecated in v1.5"): - dm.val_transforms = "b" with pytest.deprecated_call(match=r"DataModule property `test_transforms` was deprecated in v1.5"): dm.test_transforms = "c" - with pytest.deprecated_call(match=r"DataModule property `val_transforms` was deprecated in v1.5"): - _ = LightningDataModule(val_transforms="b") with pytest.deprecated_call(match=r"DataModule property `test_transforms` was deprecated in v1.5"): _ = LightningDataModule(test_transforms="c") with pytest.deprecated_call(match=r"DataModule property `test_transforms` was deprecated in v1.5"): From 08640d9204e93008d33cdbb879ad840f966c100e Mon Sep 17 00:00:00 2001 From: Raymond G Schireman Date: Thu, 14 Apr 2022 10:14:07 -0400 Subject: [PATCH 3/6] update docs --- docs/source/starter/core_guide.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/starter/core_guide.rst b/docs/source/starter/core_guide.rst index 20ec33534ac71..03bf130a5c27c 100644 --- a/docs/source/starter/core_guide.rst +++ b/docs/source/starter/core_guide.rst @@ -1138,7 +1138,6 @@ spread all over files. # transforms train_transforms = ... - val_transforms = ... test_transforms = ... # dataloader ... From 4879f3a685217730604f5b728e8f402235f70cce Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 15:59:22 +0000 Subject: [PATCH 4/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pytorch_lightning/core/datamodule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytorch_lightning/core/datamodule.py b/pytorch_lightning/core/datamodule.py index de28a6f0e00eb..c64e10764dfc9 100644 --- a/pytorch_lightning/core/datamodule.py +++ b/pytorch_lightning/core/datamodule.py @@ -56,7 +56,7 @@ def teardown(self): def __init__(self, test_transforms=None, dims=None): super().__init__() - + if test_transforms is not None: rank_zero_deprecation( "DataModule property `test_transforms` was deprecated in v1.5 and will be removed in v1.7." From 92eb38c6eeff864db92d16ea54bbdaf44331a196 Mon Sep 17 00:00:00 2001 From: Raymond G Schireman Date: Thu, 14 Apr 2022 13:00:04 -0400 Subject: [PATCH 5/6] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46722e5b6e8a5..6034c31bdfa0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -115,6 +115,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Removed support for passing strategy names or strategy instances to the plugins Trainer argument ([#12700](https://github.com/PyTorchLightning/pytorch-lightning/pull/12700)) +- Removed the deprecated `val_transforms` argument from the `LightningDataModule` constructor ([#12763](https://github.com/PyTorchLightning/pytorch-lightning/pull/12763)) + + ### Fixed - Run main progress bar updates independent of val progress bar updates in `TQDMProgressBar` ([#12563](https://github.com/PyTorchLightning/pytorch-lightning/pull/12563)) From 2e6577e524c8b8e073e251edcbd1234179151cba Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 21 Apr 2022 20:32:55 -0400 Subject: [PATCH 6/6] remove unused imports --- pytorch_lightning/core/datamodule.py | 1 - tests/deprecated_api/test_remove_1-7.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pytorch_lightning/core/datamodule.py b/pytorch_lightning/core/datamodule.py index 0628f3cf4e95d..cc7a1890deca6 100644 --- a/pytorch_lightning/core/datamodule.py +++ b/pytorch_lightning/core/datamodule.py @@ -19,7 +19,6 @@ from pytorch_lightning.core.hooks import CheckpointHooks, DataHooks from pytorch_lightning.core.mixins import HyperparametersMixin -from pytorch_lightning.utilities import rank_zero_deprecation from pytorch_lightning.utilities.argparse import add_argparse_args, from_argparse_args, get_init_arguments_and_types diff --git a/tests/deprecated_api/test_remove_1-7.py b/tests/deprecated_api/test_remove_1-7.py index a850b9088546f..e7f5ae6ee7618 100644 --- a/tests/deprecated_api/test_remove_1-7.py +++ b/tests/deprecated_api/test_remove_1-7.py @@ -20,7 +20,7 @@ import pytest import torch -from pytorch_lightning import Callback, LightningDataModule, Trainer +from pytorch_lightning import Callback, Trainer from pytorch_lightning.callbacks.lr_monitor import LearningRateMonitor from pytorch_lightning.loggers import LoggerCollection, TestTubeLogger from pytorch_lightning.overrides.distributed import IndexBatchSamplerWrapper @@ -34,7 +34,6 @@ from pytorch_lightning.strategies import SingleDeviceStrategy from tests.deprecated_api import _soft_unimport_module from tests.helpers import BoringModel -from tests.helpers.datamodules import MNISTDataModule from tests.loggers.test_logger import CustomLogger from tests.plugins.environments.test_lsf_environment import _make_rankfile