diff --git a/CHANGELOG.md b/CHANGELOG.md index d21359729d6f3..f0fbc34988d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -121,6 +121,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)) + + - Removed the deprecated `test_transforms` argument from the `LightningDataModule` constructor ([#12773](https://github.com/PyTorchLightning/pytorch-lightning/pull/12773)) diff --git a/pytorch_lightning/core/datamodule.py b/pytorch_lightning/core/datamodule.py index e971fb5ca0774..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 @@ -54,35 +53,11 @@ def teardown(self): name: str = ... - def __init__(self, val_transforms=None): + def __init__(self) -> 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." - ) - self._val_transforms = val_transforms # 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 - @classmethod def add_argparse_args(cls, parent_parser: ArgumentParser, **kwargs) -> ArgumentParser: """Extends existing argparse by default `LightningDataModule` attributes.""" diff --git a/tests/deprecated_api/test_remove_1-7.py b/tests/deprecated_api/test_remove_1-7.py index 329f181ccb485..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,19 +34,10 @@ 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 -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 `val_transforms` was deprecated in v1.5"): - _ = LightningDataModule(val_transforms="b") - - def test_v1_7_0_moved_get_progress_bar_dict(tmpdir): class TestModel(BoringModel): def get_progress_bar_dict(self):