diff --git a/CHANGELOG.md b/CHANGELOG.md index 701ef3a5a6d3b..5bcbb6766d786 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -123,6 +123,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Removed +- Removed the deprecated `Logger.close` method ([#13149](https://github.com/PyTorchLightning/pytorch-lightning/pull/13149)) + + - Removed the deprecated `weights_summary` argument from the `Trainer` constructor ([#13070](https://github.com/PyTorchLightning/pytorch-lightning/pull/13070)) diff --git a/pytorch_lightning/loggers/logger.py b/pytorch_lightning/loggers/logger.py index 80c37f03e02d9..e9f7c165d07ed 100644 --- a/pytorch_lightning/loggers/logger.py +++ b/pytorch_lightning/loggers/logger.py @@ -177,21 +177,6 @@ def finalize(self, status: str) -> None: """ self.save() - def close(self) -> None: - """Do any cleanup that is necessary to close an experiment. - - See deprecation warning below. - - .. deprecated:: v1.5 - This method is deprecated in v1.5 and will be removed in v1.7. - Please use `Logger.finalize` instead. - """ - rank_zero_deprecation( - "`Logger.close` method is deprecated in v1.5 and will be removed in v1.7." - " Please use `Logger.finalize` instead." - ) - self.save() - @property def save_dir(self) -> Optional[str]: """Return the root directory where experiment logs get saved, or `None` if the logger does not save data @@ -285,19 +270,6 @@ def finalize(self, status: str) -> None: for logger in self._logger_iterable: logger.finalize(status) - def close(self) -> None: - """ - .. deprecated:: v1.5 - This method is deprecated in v1.5 and will be removed in v1.7. - Please use `LoggerCollection.finalize` instead. - """ - rank_zero_deprecation( - "`LoggerCollection.close` method is deprecated in v1.5 and will be removed in v1.7." - " Please use `LoggerCollection.finalize` instead." - ) - for logger in self._logger_iterable: - logger.close() - @property def save_dir(self) -> Optional[str]: """Returns ``None`` as checkpoints should be saved to default / chosen location when using multiple diff --git a/tests/deprecated_api/test_remove_1-7.py b/tests/deprecated_api/test_remove_1-7.py index 6a0f3df5579e9..d681a554e7e9c 100644 --- a/tests/deprecated_api/test_remove_1-7.py +++ b/tests/deprecated_api/test_remove_1-7.py @@ -22,7 +22,6 @@ from pytorch_lightning import Callback, Trainer from pytorch_lightning.callbacks.lr_monitor import LearningRateMonitor -from pytorch_lightning.loggers import LoggerCollection from pytorch_lightning.overrides.distributed import IndexBatchSamplerWrapper from pytorch_lightning.plugins.environments import ( KubeflowEnvironment, @@ -34,7 +33,6 @@ from pytorch_lightning.strategies import SingleDeviceStrategy from tests.deprecated_api import _soft_unimport_module from tests.helpers import BoringModel -from tests.loggers.test_logger import CustomLogger from tests.plugins.environments.test_lsf_environment import _make_rankfile @@ -80,17 +78,6 @@ def test_v1_7_0_deprecate_add_get_queue(tmpdir): trainer.fit(model) -def test_v1_7_0_lightning_logger_base_close(tmpdir): - logger = CustomLogger() - with pytest.deprecated_call(match="`Logger.close` method is deprecated in v1.5 and will be removed in v1.7."): - logger.close() - with pytest.deprecated_call( - match="`LoggerCollection.close` method is deprecated in v1.5 and will be removed in v1.7." - ): - logger = LoggerCollection([logger]) - logger.close() - - def test_v1_7_0_deprecate_lightning_distributed(tmpdir): with pytest.deprecated_call(match="LightningDistributed is deprecated in v1.5 and will be removed in v1.7."): from pytorch_lightning.distributed.dist import LightningDistributed