From a055592fc6db1464b8121d679be743743ebfcc8b Mon Sep 17 00:00:00 2001 From: Krishna Kalyan Date: Fri, 26 Aug 2022 08:47:12 -0400 Subject: [PATCH 1/4] remove lr_schedulers --- tests/tests_pytorch/deprecated_api/test_remove_1-8.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/tests_pytorch/deprecated_api/test_remove_1-8.py b/tests/tests_pytorch/deprecated_api/test_remove_1-8.py index a69071fd67610..54a910e22965e 100644 --- a/tests/tests_pytorch/deprecated_api/test_remove_1-8.py +++ b/tests/tests_pytorch/deprecated_api/test_remove_1-8.py @@ -154,12 +154,6 @@ def test_v1_8_0_deprecated_trainer_should_rank_save_checkpoint(tmpdir): _ = trainer.should_rank_save_checkpoint -def test_v1_8_0_deprecated_lr_scheduler(): - trainer = Trainer() - with pytest.deprecated_call(match=r"`Trainer.lr_schedulers` is deprecated in v1.6 and will be removed in v1.8."): - assert trainer.lr_schedulers == [] - - def test_v1_8_0_trainer_optimizers_mixin(): trainer = Trainer() model = BoringModel() From ca906a81d64d6f01ea4fa26bee6a654b6d6e5e4c Mon Sep 17 00:00:00 2001 From: Krishna Kalyan Date: Fri, 26 Aug 2022 08:52:52 -0400 Subject: [PATCH 2/4] remove lr_scheduler --- src/pytorch_lightning/trainer/trainer.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/pytorch_lightning/trainer/trainer.py b/src/pytorch_lightning/trainer/trainer.py index 8bee0ac6dfb7f..aadf270fc49b7 100644 --- a/src/pytorch_lightning/trainer/trainer.py +++ b/src/pytorch_lightning/trainer/trainer.py @@ -2141,17 +2141,6 @@ def lightning_optimizers(self) -> Dict[int, LightningOptimizer]: def lr_scheduler_configs(self) -> List[LRSchedulerConfig]: return self.strategy.lr_scheduler_configs - @property - def lr_schedulers(self) -> List[Dict[str, Any]]: - rank_zero_deprecation( - "`Trainer.lr_schedulers` is deprecated in v1.6 and will be removed in v1.8." - " You can use `trainer.lr_scheduler_configs` instead which contains dataclasses instead of dictionaries.", - stacklevel=5, - ) - from dataclasses import asdict - - return [asdict(config) for config in self.strategy.lr_scheduler_configs] - @property def optimizer_frequencies(self) -> List[int]: return self.strategy.optimizer_frequencies From 7f10c5645d119754b99cdc10247327537912fd1e Mon Sep 17 00:00:00 2001 From: Krishna Kalyan Date: Fri, 26 Aug 2022 08:55:07 -0400 Subject: [PATCH 3/4] depricate lr_scheduler --- src/pytorch_lightning/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index 6ca49228cb140..ffd3d5138c4cd 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -59,6 +59,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Deprecated the `on_colab_kaggle` function ([#14247](https://github.com/Lightning-AI/lightning/pull/14247)) +- Deprecated the `lr_schedulers` from `Trainer` ([#14408](https://github.com/Lightning-AI/lightning/pull/14408/files)) + ### Removed - Removed the deprecated `Trainer.training_type_plugin` property in favor of `Trainer.strategy` ([#14011](https://github.com/Lightning-AI/lightning/pull/14011)) From 7c3858e2409274a3bbe51db50740b34271fb80b2 Mon Sep 17 00:00:00 2001 From: Rohit Gupta Date: Fri, 26 Aug 2022 18:33:27 +0530 Subject: [PATCH 4/4] chlog --- src/pytorch_lightning/CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pytorch_lightning/CHANGELOG.md b/src/pytorch_lightning/CHANGELOG.md index ffd3d5138c4cd..b7f34d8e71591 100644 --- a/src/pytorch_lightning/CHANGELOG.md +++ b/src/pytorch_lightning/CHANGELOG.md @@ -59,8 +59,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Deprecated the `on_colab_kaggle` function ([#14247](https://github.com/Lightning-AI/lightning/pull/14247)) -- Deprecated the `lr_schedulers` from `Trainer` ([#14408](https://github.com/Lightning-AI/lightning/pull/14408/files)) - ### Removed - Removed the deprecated `Trainer.training_type_plugin` property in favor of `Trainer.strategy` ([#14011](https://github.com/Lightning-AI/lightning/pull/14011)) @@ -78,6 +76,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Removed the experimental `pytorch_lightning.utiltiies.meta` functions in favor of built-in https://github.com/pytorch/torchdistx support ([#13868](https://github.com/Lightning-AI/lightning/pull/13868)) +- Removed the deprecated the `trainer.lr_schedulers` ([#14408](https://github.com/Lightning-AI/lightning/pull/14408)) + + ### Fixed - Fixed an assertion error when using a `ReduceOnPlateau` scheduler with the Horovod strategy ([#14215](https://github.com/Lightning-AI/lightning/pull/14215))