Finishing touches to the graveyard (#15123)

Author: carmocca

.pre-commit-config.yaml

@@ -66,10 +66,6 @@ repos:
     hooks:
       - id: yesqa
         name: Unused noqa
-        exclude: |
-            (?x)^(
-                src/pytorch_lightning/_graveyard
-            )$
 
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1

src/pytorch_lightning/_graveyard/callbacks.py

@@ -18,11 +18,10 @@
 
 
 def _save_checkpoint(_: ModelCheckpoint, __: Any) -> None:
-    # Remove in v2.0.0
+    # TODO: Remove in v2.0.0
     raise NotImplementedError(
         f"`{ModelCheckpoint.__name__}.save_checkpoint()` was deprecated in v1.6 and is no longer supported"
-        f" as of 1.8. Please use `trainer.save_checkpoint()` to manually save a checkpoint. This method will be"
-        f" removed completely in v2.0."
+        f" as of 1.8. Please use `trainer.save_checkpoint()` to manually save a checkpoint."
     )
 
 

src/pytorch_lightning/_graveyard/core.py

@@ -13,25 +13,47 @@
 # limitations under the License.
 from typing import Any
 
-from pytorch_lightning import LightningDataModule
+from pytorch_lightning import LightningDataModule, LightningModule
 
 
 def _on_save_checkpoint(_: LightningDataModule, __: Any) -> None:
     # TODO: Remove in v2.0.0
     raise NotImplementedError(
-        "`LightningDataModule.on_save_checkpoint` was deprecated in v1.6 and removed in v1.8."
+        "`LightningDataModule.on_save_checkpoint` was deprecated in v1.6 and is no longer supported as of v1.8."
         " Use `state_dict` instead."
     )
 
 
 def _on_load_checkpoint(_: LightningDataModule, __: Any) -> None:
     # TODO: Remove in v2.0.0
     raise NotImplementedError(
-        "`LightningDataModule.on_load_checkpoint` was deprecated in v1.6 and removed in v1.8."
+        "`LightningDataModule.on_load_checkpoint` was deprecated in v1.6 and is no longer supported as of v1.8."
         " Use `load_state_dict` instead."
     )
 
 
+def _use_amp(_: LightningModule) -> None:
+    # Remove in v2.0.0 and the skip in `__jit_unused_properties__`
+    if not LightningModule._jit_is_scripting:
+        # cannot use `AttributeError` as it messes up with `nn.Module.__getattr__`
+        raise RuntimeError(
+            "`LightningModule.use_amp` was deprecated in v1.6 and is no longer accessible as of v1.8."
+            " Please use `Trainer.amp_backend`.",
+        )
+
+
+def _use_amp_setter(_: LightningModule, __: bool) -> None:
+    # Remove in v2.0.0
+    # cannot use `AttributeError` as it messes up with `nn.Module.__getattr__`
+    raise RuntimeError(
+        "`LightningModule.use_amp` was deprecated in v1.6 and is no longer accessible as of v1.8."
+        " Please use `Trainer.amp_backend`.",
+    )
+
+
+# Properties
+LightningModule.use_amp = property(fget=_use_amp, fset=_use_amp_setter)
+
 # Methods
 LightningDataModule.on_save_checkpoint = _on_save_checkpoint
 LightningDataModule.on_load_checkpoint = _on_load_checkpoint

src/pytorch_lightning/_graveyard/loggers.py

@@ -21,8 +21,8 @@
 class LoggerCollection:
     # TODO: Remove in v2.0.0
     def __init__(self, _: Any):
-        raise RuntimeError(
-            "`LoggerCollection` was deprecated in v1.6 and removed in v1.8. Directly pass a list of loggers"
+        raise NotImplementedError(
+            "`LoggerCollection` was deprecated in v1.6 and removed as of v1.8. Directly pass a list of loggers"
             " to the `Trainer` and access the list via the `trainer.loggers` attribute."
         )
 
@@ -37,7 +37,7 @@ def _update_agg_funcs(logger: Logger, *__: Any, **___: Any) -> None:
 def _agg_and_log_metrics(logger: Logger, *__: Any, **___: Any) -> None:
     # TODO: Remove in v2.0.0
     raise NotImplementedError(
-        f"`{type(logger).__name__}.update_agg_funcs` was deprecated in v1.6 and is no longer supported as of v1.8."
+        f"`{type(logger).__name__}.agg_and_log_metrics` was deprecated in v1.6 and is no longer supported as of v1.8."
     )
 
 

src/pytorch_lightning/_graveyard/trainer.py

@@ -18,6 +18,7 @@
 
 
 def _patch_sys_modules() -> None:
+    # TODO: Remove in v2.0.0
     self = sys.modules[__name__]
     sys.modules["pytorch_lightning.trainer.data_loading"] = self
     sys.modules["pytorch_lightning.trainer.optimizers"] = self
@@ -192,22 +193,26 @@ def _call_hook(_: Trainer, *__: Any, **___: Any) -> Any:
 
 
 def _prepare_dataloader(_: Trainer, *__: Any, **___: Any) -> None:
+    # TODO: Remove in v2.0.0
     raise NotImplementedError(
         "`Trainer.prepare_dataloader` was deprecated in v1.6 and is no longer supported as of v1.8."
     )
 
 
 def _request_dataloader(_: Trainer, *__: Any, **___: Any) -> None:
+    # TODO: Remove in v2.0.0
     raise NotImplementedError(
         "`Trainer.request_dataloader` was deprecated in v1.6 and is no longer supported as of v1.8."
     )
 
 
 def _init_optimizers(_: Trainer, *__: Any, **___: Any) -> None:
+    # TODO: Remove in v2.0.0
     raise NotImplementedError("`Trainer.init_optimizers` was deprecated in v1.6 and is no longer supported as of v1.8.")
 
 
 def _convert_to_lightning_optimizers(_: Trainer) -> None:
+    # TODO: Remove in v2.0.0
     raise NotImplementedError(
         "`Trainer.convert_to_lightning_optimizers` was deprecated in v1.6 and is no longer supported as of v1.8."
     )

src/pytorch_lightning/_graveyard/training_type.py

@@ -19,6 +19,7 @@
 
 
 def _patch_sys_modules() -> None:
+    # TODO: Remove in v2.0.0
     self = sys.modules[__name__]
     sys.modules["pytorch_lightning.plugins.training_type"] = self
     sys.modules["pytorch_lightning.plugins.training_type.ddp"] = self
@@ -40,13 +41,15 @@ def _patch_sys_modules() -> None:
 
 
 def _ttp_constructor(self: Any, *_: Any, **__: Any) -> None:
-    raise RuntimeError(
-        f"The `pl.plugins.{self._name}Plugin` class was removed in v1.8. Use `pl.strategies.{self._name}Strategy`"
-        " instead."
+    # TODO: Remove in v2.0.0
+    raise NotImplementedError(
+        f"The `pl.plugins.{self._name}Plugin` class was deprecated in v1.6 and is no longer supported as of v1.8."
+        f" Use `pl.strategies.{self._name}Strategy` instead."
     )
 
 
 def _patch_plugin_classes() -> None:
+    # TODO: Remove in v2.0.0
     self = sys.modules[__name__]
     for name in (
         "DDP",
@@ -73,16 +76,23 @@ def _patch_plugin_classes() -> None:
 
 
 def on_colab_kaggle() -> None:
-    raise RuntimeError(
-        "`pl.plugins.training_type.utils.on_colab_kaggle` was removed in v1.8."
+    # TODO: Remove in v2.0.0
+    raise NotImplementedError(
+        "`pl.plugins.training_type.utils.on_colab_kaggle` was deprecated in v1.6 and is no longer supported as of v1.8."
         " Use `pl.strategies.utils.on_colab_kaggle` instead."
     )
 
 
 def _training_type_plugin(_: pl.Trainer) -> None:
-    raise RuntimeError("`Trainer.training_type_plugin` was removed in v1.8. Use `Trainer.strategy` instead.")
+    # TODO: Remove in v2.0.0
+    raise AttributeError(
+        "`Trainer.training_type_plugin` was deprecated in v1.6 and is no longer accessible as of v1.8."
+        " Use `Trainer.strategy` instead."
+    )
 
 
 _patch_sys_modules()
 _patch_plugin_classes()
+
+# Properties
 pl.Trainer.training_type_plugin = property(_training_type_plugin)

src/pytorch_lightning/core/module.py

@@ -88,6 +88,7 @@ class LightningModule(
             "automatic_optimization",
             "truncated_bptt_steps",
             "trainer",
+            "use_amp",  # from graveyard
         ]
         + _DeviceDtypeModuleMixin.__jit_unused_properties__
         + HyperparametersMixin.__jit_unused_properties__

src/pytorch_lightning/trainer/configuration_validator.py

@@ -288,11 +288,11 @@ def _check_unsupported_datamodule_hooks(trainer: "pl.Trainer") -> None:
 
     if is_overridden("on_save_checkpoint", datahook_selector.datamodule):
         raise NotImplementedError(
-            "`LightningDataModule.on_save_checkpoint` was deprecated in v1.6 and removed in v1.8."
+            "`LightningDataModule.on_save_checkpoint` was deprecated in v1.6 and is no longer supported as of v1.8."
             " Use `state_dict` instead."
         )
     if is_overridden("on_load_checkpoint", datahook_selector.datamodule):
         raise NotImplementedError(
-            "`LightningDataModule.on_load_checkpoint` was deprecated in v1.6 and removed in v1.8."
+            "`LightningDataModule.on_load_checkpoint` was deprecated in v1.6 and is no longer supported as of v1.8."
             " Use `load_state_dict` instead."
         )

tests/tests_pytorch/graveyard/test_core.py

@@ -13,21 +13,21 @@
 # limitations under the License.
 import pytest
 
-from pytorch_lightning import Trainer
+from pytorch_lightning import LightningDataModule, Trainer
 from pytorch_lightning.demos.boring_classes import BoringDataModule, BoringModel
 
 
 def test_v2_0_0_unsupported_datamodule_on_save_load_checkpoint():
-    datamodule = BoringDataModule()
+    datamodule = LightningDataModule()
     with pytest.raises(
         NotImplementedError,
-        match="`LightningDataModule.on_save_checkpoint` was deprecated in v1.6 and removed in v1.8.",
+        match="`LightningDataModule.on_save_checkpoint`.*no longer supported as of v1.8",
     ):
         datamodule.on_save_checkpoint({})
 
     with pytest.raises(
         NotImplementedError,
-        match="`LightningDataModule.on_load_checkpoint` was deprecated in v1.6 and removed in v1.8.",
+        match="`LightningDataModule.on_load_checkpoint.*no longer supported as of v1.8",
     ):
         datamodule.on_load_checkpoint({})
 
@@ -44,12 +44,27 @@ def on_load_checkpoint(self, checkpoint):
 
     with pytest.raises(
         NotImplementedError,
-        match="`LightningDataModule.on_save_checkpoint` was deprecated in v1.6 and removed in v1.8.",
+        match="`LightningDataModule.on_save_checkpoint`.*no longer supported as of v1.8.",
     ):
         trainer.fit(model, OnSaveDataModule())
 
     with pytest.raises(
         NotImplementedError,
-        match="`LightningDataModule.on_load_checkpoint` was deprecated in v1.6 and removed in v1.8.",
+        match="`LightningDataModule.on_load_checkpoint`.*no longer supported as of v1.8.",
     ):
         trainer.fit(model, OnLoadDataModule())
+
+
+def test_v2_0_0_lightning_module_unsupported_use_amp():
+    model = BoringModel()
+    with pytest.raises(
+        RuntimeError,
+        match="`LightningModule.use_amp`.*no longer accessible as of v1.8.",
+    ):
+        model.use_amp
+
+    with pytest.raises(
+        RuntimeError,
+        match="`LightningModule.use_amp`.*no longer accessible as of v1.8.",
+    ):
+        model.use_amp = False

tests/tests_pytorch/graveyard/test_loggers.py

@@ -19,32 +19,42 @@
 
 
 def test_v2_0_0_unsupported_agg_and_log_metrics(tmpdir):
+    logger = CSVLogger(tmpdir)
+    with pytest.raises(
+        RuntimeError,
+        match="CSVLogger.agg_and_log_metrics`.*no longer supported as of v1.8",
+    ):
+        logger.agg_and_log_metrics()
+
     class AggAndLogMetricsLogger(CSVLogger):
         def agg_and_log_metrics(self, metrics, step):
             pass
 
-    model = BoringModel()
     logger = AggAndLogMetricsLogger(tmpdir)
-
+    model = BoringModel()
     trainer = Trainer(logger=logger)
-
     with pytest.raises(
         RuntimeError,
-        match="`AggAndLogMetricsLogger.agg_and_log_metrics` was deprecated in v1.6 and is no longer supported",
+        match="`AggAndLogMetricsLogger.agg_and_log_metrics`.*no longer supported as of v1.8",
     ):
         trainer.fit(model)
 
 
 def test_v2_0_0_unsupported_update_agg_funcs(tmpdir):
+    logger = CSVLogger(tmpdir)
+    with pytest.raises(
+        RuntimeError,
+        match="CSVLogger.update_agg_funcs`.*no longer supported as of v1.8",
+    ):
+        logger.update_agg_funcs()
+
     class UpdateAggFuncsLogger(CSVLogger):
         def update_agg_funcs(self, metrics, step):
             pass
 
     model = BoringModel()
     logger = UpdateAggFuncsLogger(tmpdir)
-
     trainer = Trainer(logger=logger)
-
     with pytest.raises(
         RuntimeError,
         match="`UpdateAggFuncsLogger.update_agg_funcs` was deprecated in v1.6 and is no longer supported",
@@ -55,10 +65,10 @@ def update_agg_funcs(self, metrics, step):
 def test_v2_0_0_unsupported_logger_collection_class():
     from pytorch_lightning.loggers.base import LoggerCollection
 
-    with pytest.raises(RuntimeError, match="`LoggerCollection` was deprecated in v1.6 and removed in v1.8."):
+    with pytest.raises(NotImplementedError, match="`LoggerCollection` was deprecated in v1.6 and removed as of v1.8."):
         LoggerCollection(None)
 
     from pytorch_lightning.loggers.logger import LoggerCollection
 
-    with pytest.raises(RuntimeError, match="`LoggerCollection` was deprecated in v1.6 and removed in v1.8."):
+    with pytest.raises(RuntimeError, match="`LoggerCollection` was deprecated in v1.6 and removed as of v1.8."):
         LoggerCollection(None)