Deprecate callback hooks on_pretrain_routine_start and on_pretrain_routine_end

pytorch_lightning/callbacks/base.py

@@ -231,10 +231,22 @@ def on_train_end(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -
         """Called when the train ends."""
 
     def on_pretrain_routine_start(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
-        """Called when the pretrain routine begins."""
+        r"""
+        .. deprecated:: v1.6
+            This callback hook was deprecated in v1.6 and will be removed in v1.8. Use
+            ``on_fit_start`` or ``setup`` instead.
+
+        Called when the pretrain routine begins.
+        """
 
     def on_pretrain_routine_end(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
-        """Called when the pretrain routine ends."""
+        r"""
+        .. deprecated:: v1.6
+            This callback hook was deprecated in v1.6 and will be removed in v1.8. Use
+            ``on_fit_start`` or ``setup`` instead.
+
+        Called when the pretrain routine ends.
+        """
 
     def on_validation_start(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
         """Called when the validation loop begins."""

pytorch_lightning/callbacks/lambda_function.py

@@ -68,8 +68,6 @@ def __init__(
         on_batch_end: Optional[Callable] = None,
         on_train_start: Optional[Callable] = None,
         on_train_end: Optional[Callable] = None,
-        on_pretrain_routine_start: Optional[Callable] = None,
-        on_pretrain_routine_end: Optional[Callable] = None,
         on_validation_start: Optional[Callable] = None,
         on_validation_end: Optional[Callable] = None,
         on_test_start: Optional[Callable] = None,

pytorch_lightning/callbacks/model_checkpoint.py

@@ -248,19 +248,18 @@ def state_key(self) -> str:
         )
 
     def setup(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule", stage: Optional[str] = None) -> None:
+        # When pretrain routine starts we build the ckpt dir on the fly.
+        self.__resolve_ckpt_dir(trainer)
+        if trainer.is_global_zero:
+            self.__warn_if_dir_not_empty(self.dirpath)
+
         # NOTE: setting these attributes needs to happen as early as possible BEFORE reloading callback states,
         # because the attributes are part of the state_key which needs to be fully defined before reloading.
         if self._save_on_train_epoch_end is None:
             # if the user runs validation multiple times per training epoch or multiple training epochs without
             # validation, then we run after validation instead of on train epoch end
             self._save_on_train_epoch_end = trainer.val_check_interval == 1.0 and trainer.check_val_every_n_epoch == 1
 
-    def on_pretrain_routine_start(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
-        """When pretrain routine starts we build the ckpt dir on the fly."""
-        self.__resolve_ckpt_dir(trainer)
-        if trainer.is_global_zero:
-            self.__warn_if_dir_not_empty(self.dirpath)
-
     def on_train_start(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
         self._last_time_checked = time.monotonic()
 

pytorch_lightning/callbacks/model_summary.py

@@ -49,7 +49,7 @@ class ModelSummary(Callback):
     def __init__(self, max_depth: int = 1) -> None:
         self._max_depth: int = max_depth
 
-    def on_pretrain_routine_start(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
+    def setup(self, trainer: "pl.Trainer", pl_module: "pl.LightningModule") -> None:
         if not self._max_depth:
             return None
 

pytorch_lightning/core/hooks.py

@@ -64,19 +64,17 @@ def on_predict_end(self) -> None:
     def on_pretrain_routine_start(self) -> None:
         """Called at the beginning of the pretrain routine (between fit and train start).
 
-        - fit
-        - pretrain_routine start
-        - pretrain_routine end
-        - training_start
+        .. deprecated:: v1.6
+            :meth:`on_val_dataloader` is deprecated and will be removed in v1.8.0.
+            Please use :meth:`on_fit_start` or :meth:`setup` directly.
         """
 
     def on_pretrain_routine_end(self) -> None:
         """Called at the end of the pretrain routine (between fit and train start).
 
-        - fit
-        - pretrain_routine start
-        - pretrain_routine end
-        - training_start
+        .. deprecated:: v1.6
+            :meth:`on_val_dataloader` is deprecated and will be removed in v1.8.0.
+            Please use :meth:`on_fit_start` or :meth:`setup` directly.
         """
 
     def on_train_batch_start(self, batch: Any, batch_idx: int, unused: int = 0) -> Optional[int]:

pytorch_lightning/trainer/trainer.py

@@ -1281,15 +1281,6 @@ def _pre_training_routine(self):
         # register signals
         self._signal_connector.register_signal_handlers()
 
-        # --------------------------
-        # Pre-train
-        # --------------------------
-        self._call_callback_hooks("on_pretrain_routine_start")
-        self._call_lightning_module_hook("on_pretrain_routine_start")
-
-        self._call_callback_hooks("on_pretrain_routine_end")
-        self._call_lightning_module_hook("on_pretrain_routine_end")
-
     def _run_train(self) -> None:
         self._pre_training_routine()