[tests/checkpointing] refactor with BoringModel (#4661)

* [tests/checkpointing] refactor with BoringModel

* [tests/checkpointing] refactor with BoringModel

* [tests/checkpointing] refactor with BoringModel

* LessBoringModel -> LogInTwoMethods

* LessBoringModel -> LogInTwoMethods

* LessBoringModel -> TrainingStepCalled

Co-authored-by: chaton <[email protected]>
Co-authored-by: Ananya Harsh Jha <[email protected]>

(cherry picked from commit 7d96fd1)

Author: Jeff Yang

tests/checkpointing/test_checkpoint_callback_frequency.py

@@ -18,14 +18,14 @@
 import torch
 
 from pytorch_lightning import Trainer, callbacks, seed_everything
-from tests.base import BoringModel, EvalModelTemplate
+from tests.base import BoringModel
 
 
 @mock.patch.dict(os.environ, {"PL_DEV_DEBUG": "1"})
 def test_mc_called_on_fastdevrun(tmpdir):
     seed_everything(1234)
 
-    train_val_step_model = EvalModelTemplate()
+    train_val_step_model = BoringModel()
 
     # fast dev run = called once
     # train loop only, dict, eval result
@@ -38,7 +38,18 @@ def test_mc_called_on_fastdevrun(tmpdir):
     # -----------------------
     # also called once with no val step
     # -----------------------
-    train_step_only_model = EvalModelTemplate()
+    class TrainingStepCalled(BoringModel):
+        def __init__(self):
+            super().__init__()
+            self.training_step_called = False
+            self.validation_step_called = False
+            self.test_step_called = False
+
+        def training_step(self, batch, batch_idx):
+            self.training_step_called = True
+            return super().training_step(batch, batch_idx)
+
+    train_step_only_model = TrainingStepCalled()
     train_step_only_model.validation_step = None
 
     # fast dev run = called once
@@ -62,7 +73,7 @@ def test_mc_called(tmpdir):
     # -----------------
     # TRAIN LOOP ONLY
     # -----------------
-    train_step_only_model = EvalModelTemplate()
+    train_step_only_model = BoringModel()
     train_step_only_model.validation_step = None
 
     # no callback
@@ -73,7 +84,7 @@ def test_mc_called(tmpdir):
     # -----------------
     # TRAIN + VAL LOOP ONLY
     # -----------------
-    val_train_model = EvalModelTemplate()
+    val_train_model = BoringModel()
     # no callback
     trainer = Trainer(max_epochs=3, checkpoint_callback=False)
     trainer.fit(val_train_model)