Remove the deprecated pl.loops.base module (#16142)

Author: carmocca

src/pytorch_lightning/CHANGELOG.md

@@ -140,6 +140,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Removed the deprecated `pytorch_lightning.loggers.base` module in favor of `pytorch_lightning.loggers.logger` ([#16120](https://github.com/PyTorchLightning/pytorch-lightning/pull/16120))
 
 
+- Removed the deprecated `pytorch_lightning.loops.base` module in favor of `pytorch_lightning.loops.loop` ([#16142](https://github.com/PyTorchLightning/pytorch-lightning/pull/16142))
+
+
 - Removed the deprecated `Trainer.reset_train_val_dataloaders()` in favor of `Trainer.reset_{train,val}_dataloader` ([#16131](https://github.com/Lightning-AI/lightning/pull/16131))
 
 

src/pytorch_lightning/_graveyard/__init__.py

@@ -18,6 +18,7 @@
 import pytorch_lightning._graveyard.core
 import pytorch_lightning._graveyard.legacy_import_unpickler
 import pytorch_lightning._graveyard.loggers
+import pytorch_lightning._graveyard.loops
 import pytorch_lightning._graveyard.profiler
 import pytorch_lightning._graveyard.strategies
 import pytorch_lightning._graveyard.trainer

src/pytorch_lightning/loops/base.py renamed to src/pytorch_lightning/_graveyard/loops.py

@@ -11,15 +11,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from pytorch_lightning.loops import Loop as NewLoop
-from pytorch_lightning.utilities.rank_zero import rank_zero_deprecation
+import sys
+from typing import Any
 
 
-class Loop(NewLoop):
-    def __init__(self) -> None:
-        rank_zero_deprecation(
-            "pytorch_lightning.loops.base.Loop has been deprecated in v1.7"
-            " and will be removed in v1.9."
-            " Use the equivalent class from the pytorch_lightning.loops.loop.Loop class instead."
+def _patch_sys_modules() -> None:
+    # TODO: Remove in v2.0.0
+    self = sys.modules[__name__]
+    sys.modules["pytorch_lightning.loops.base"] = self
+
+
+class Loop:
+    # TODO: Remove in v2.0.0
+    def __init__(self, *_: Any, **__: Any) -> None:
+        raise NotImplementedError(
+            "`pytorch_lightning.loops.base.Loop` was deprecated in v1.7.0 and removed as of v1.9.0."
+            " Please use `pytorch_lightning.loops.loop.Loop` instead"
         )
-        super().__init__()
+
+
+_patch_sys_modules()

tests/tests_pytorch/deprecated_api/test_remove_1-9.py

@@ -25,23 +25,6 @@ def test_old_lightningmodule_path():
         LightningModule()
 
 
-def test_old_loop_path():
-    from pytorch_lightning.loops.base import Loop
-
-    class MyLoop(Loop):
-        def advance(self):
-            ...
-
-        def done(self):
-            ...
-
-        def reset(self):
-            ...
-
-    with pytest.deprecated_call(match="pytorch_lightning.loops.base.Loop has been deprecated in v1.7"):
-        MyLoop()
-
-
 def test_old_callback_path():
     from pytorch_lightning.callbacks.base import Callback
 

tests/tests_pytorch/graveyard/test_loops.py

@@ -0,0 +1,8 @@
+import pytest
+
+
+def test_v2_0_0_unsupported_base_loop():
+    from pytorch_lightning.loops.base import Loop
+
+    with pytest.raises(NotImplementedError, match="Loop` was deprecated in v1.7.0 and removed as of v1.9"):
+        Loop()