Merge branch 'master' into remove/mode

Author: kaushikb11

CHANGELOG.md

@@ -116,6 +116,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Removed deprecated `mode` argument from `ModelSummary` class ([#10449](https://github.com/PyTorchLightning/pytorch-lightning/pull/10449))
 
 
+- Removed deprecated `Trainer.train_loop` property in favor of `Trainer.fit_loop` ([#10482](https://github.com/PyTorchLightning/pytorch-lightning/pull/10482))
+
+
 ### Fixed
 
 - Fixed an issue where class or init-only variables of dataclasses were passed to the dataclass constructor in `utilities.apply_to_collection` ([#9702](https://github.com/PyTorchLightning/pytorch-lightning/issues/9702))

docs/source/common/lightning_module.rst

@@ -1167,14 +1167,14 @@ for more information.
 
         on_train_start()
         for epoch in epochs:
-            train_loop()
+            fit_loop()
         on_train_end()
 
         on_fit_end()
         teardown("fit")
 
 
-    def train_loop():
+    def fit_loop():
         on_epoch_start()
         on_train_epoch_start()
 

pytorch_lightning/trainer/trainer.py

@@ -2134,13 +2134,6 @@ def __getstate__(self):
     def __setstate__(self, state):
         self.__dict__ = state
 
-    @property
-    def train_loop(self) -> FitLoop:
-        rank_zero_deprecation(
-            "`Trainer.train_loop` has been renamed to `Trainer.fit_loop` and will be removed in v1.6."
-        )
-        return self.fit_loop
-
     @property
     def terminate_on_nan(self) -> bool:
         rank_zero_deprecation("`Trainer.terminate_on_nan` is deprecated in v1.5 and will be removed in 1.7.")

tests/deprecated_api/test_remove_1-6.py

@@ -68,14 +68,6 @@ def test_v1_6_0_is_overridden_model():
         assert not is_overridden("foo", model=model)
 
 
-def test_v1_6_0_train_loop(tmpdir):
-    trainer = Trainer()
-    with pytest.deprecated_call(
-        match=r"`Trainer.train_loop` has been renamed to `Trainer.fit_loop` and will be removed in v1.6."
-    ):
-        _ = trainer.train_loop
-
-
 def test_v1_6_0_deprecated_disable_validation():
     trainer = Trainer()
     with pytest.deprecated_call(match="disable_validation` is deprecated in v1.4"):