From 3c02ab96b182b71263bf058fa67004defdaf0578 Mon Sep 17 00:00:00 2001
From: rohitgr7 <rohitgr1998@gmail.com>
Date: Wed, 29 Sep 2021 13:38:28 +0530
Subject: [PATCH 01/13] enable_chekpointing

---
 docs/source/common/hyperparameters.rst        |  2 +-
 docs/source/common/trainer.rst                | 68 +++++++++----------
 .../trainer/connectors/callback_connector.py  | 29 +++++---
 pytorch_lightning/trainer/trainer.py          | 10 ++-
 tests/deprecated_api/test_remove_1-7.py       |  5 ++
 5 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/docs/source/common/hyperparameters.rst b/docs/source/common/hyperparameters.rst
index 1781a26a9189f..41a99e022ae95 100644
--- a/docs/source/common/hyperparameters.rst
+++ b/docs/source/common/hyperparameters.rst
@@ -201,7 +201,7 @@ To recap, add ALL possible trainer flags to the argparser and init the ``Trainer
     trainer = Trainer.from_argparse_args(hparams)
 
     # or if you need to pass in callbacks
-    trainer = Trainer.from_argparse_args(hparams, checkpoint_callback=..., callbacks=[...])
+    trainer = Trainer.from_argparse_args(hparams, enable_checkpointing=..., callbacks=[...])
 
 ----------
 
diff --git a/docs/source/common/trainer.rst b/docs/source/common/trainer.rst
index 9e7de8f928730..10668b2939fc1 100644
--- a/docs/source/common/trainer.rst
+++ b/docs/source/common/trainer.rst
@@ -528,6 +528,38 @@ Example::
 checkpoint_callback
 ^^^^^^^^^^^^^^^^^^^
 
+Deprecated: This has been renamed ``enable_checkpointing``.
+
+default_root_dir
+^^^^^^^^^^^^^^^^
+
+.. raw:: html
+
+    <video width="50%" max-width="400px" controls
+    poster="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/pl_docs/trainer_flags/thumb/default%E2%80%A8_root_dir.jpg"
+    src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/pl_docs/trainer_flags/default_root_dir.mp4"></video>
+
+|
+
+Default path for logs and weights when no logger or
+:class:`pytorch_lightning.callbacks.ModelCheckpoint` callback passed.  On
+certain clusters you might want to separate where logs and checkpoints are
+stored. If you don't then use this argument for convenience. Paths can be local
+paths or remote paths such as `s3://bucket/path` or 'hdfs://path/'. Credentials
+will need to be set up to use remote filepaths.
+
+.. testcode::
+
+    # default used by the Trainer
+    trainer = Trainer(default_root_dir=os.getcwd())
+
+distributed_backend
+^^^^^^^^^^^^^^^^^^^
+Deprecated: This has been renamed ``accelerator``.
+
+enable_checkpointing
+^^^^^^^^^^^^^^^^^^^^
+
 .. raw:: html
 
     <video width="50%" max-width="400px" controls
@@ -543,10 +575,10 @@ To disable automatic checkpointing, set this to `False`.
 .. code-block:: python
 
     # default used by Trainer
-    trainer = Trainer(checkpoint_callback=True)
+    trainer = Trainer(enable_checkpointing=True)
 
     # turn off automatic checkpointing
-    trainer = Trainer(checkpoint_callback=False)
+    trainer = Trainer(enable_checkpointing=False)
 
 
 You can override the default behavior by initializing the :class:`~pytorch_lightning.callbacks.ModelCheckpoint`
@@ -563,38 +595,6 @@ See :doc:`Saving and Loading Weights <../common/weights_loading>` for how to cus
     # Add your callback to the callbacks list
     trainer = Trainer(callbacks=[checkpoint_callback])
 
-
-.. warning:: Passing a ModelCheckpoint instance to this argument is deprecated since
-    v1.1 and will be unsupported from v1.3. Use `callbacks` argument instead.
-
-
-default_root_dir
-^^^^^^^^^^^^^^^^
-
-.. raw:: html
-
-    <video width="50%" max-width="400px" controls
-    poster="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/pl_docs/trainer_flags/thumb/default%E2%80%A8_root_dir.jpg"
-    src="https://pl-bolts-doc-images.s3.us-east-2.amazonaws.com/pl_docs/trainer_flags/default_root_dir.mp4"></video>
-
-|
-
-Default path for logs and weights when no logger or
-:class:`pytorch_lightning.callbacks.ModelCheckpoint` callback passed.  On
-certain clusters you might want to separate where logs and checkpoints are
-stored. If you don't then use this argument for convenience. Paths can be local
-paths or remote paths such as `s3://bucket/path` or 'hdfs://path/'. Credentials
-will need to be set up to use remote filepaths.
-
-.. testcode::
-
-    # default used by the Trainer
-    trainer = Trainer(default_root_dir=os.getcwd())
-
-distributed_backend
-^^^^^^^^^^^^^^^^^^^
-Deprecated: This has been renamed ``accelerator``.
-
 fast_dev_run
 ^^^^^^^^^^^^
 
diff --git a/pytorch_lightning/trainer/connectors/callback_connector.py b/pytorch_lightning/trainer/connectors/callback_connector.py
index 4b6fe7feac4d7..a7ebf243afe5c 100644
--- a/pytorch_lightning/trainer/connectors/callback_connector.py
+++ b/pytorch_lightning/trainer/connectors/callback_connector.py
@@ -38,7 +38,8 @@ def __init__(self, trainer):
     def on_trainer_init(
         self,
         callbacks: Optional[Union[List[Callback], Callback]],
-        checkpoint_callback: bool,
+        checkpoint_callback: Optional[bool],
+        enable_checkpointing: bool,
         enable_progress_bar: bool,
         progress_bar_refresh_rate: Optional[int],
         process_position: int,
@@ -67,7 +68,7 @@ def on_trainer_init(
 
         # configure checkpoint callback
         # pass through the required args to figure out defaults
-        self._configure_checkpoint_callbacks(checkpoint_callback)
+        self._configure_checkpoint_callbacks(checkpoint_callback, enable_checkpointing)
 
         # configure swa callback
         self._configure_swa_callbacks()
@@ -140,22 +141,30 @@ def _configure_accumulated_gradients(
         self.trainer.accumulate_grad_batches = grad_accum_callback.get_accumulate_grad_batches(0)
         self.trainer.accumulation_scheduler = grad_accum_callback
 
-    def _configure_checkpoint_callbacks(self, checkpoint_callback: bool) -> None:
+    def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], enable_checkpointing: bool) -> None:
+        if checkpoint_callback is not None:
+            rank_zero_deprecation(
+                f"Setting `Trainer(checkpoint_callback={checkpoint_callback})` is deprecated in v1.5 and will "
+                f"be removed in v1.7. Please consider using `Trainer(enable_checkpointing={checkpoint_callback})`."
+            )
+            # if both are set, look whether anyone is True
+            enable_checkpointing = checkpoint_callback or enable_checkpointing
+
         # TODO: Remove this error in v1.5 so we rely purely on the type signature
-        if not isinstance(checkpoint_callback, bool):
+        if not isinstance(enable_checkpointing, bool):
             error_msg = (
-                "Invalid type provided for checkpoint_callback:"
-                f" Expected bool but received {type(checkpoint_callback)}."
+                "Invalid type provided for enable_checkpointing: "
+                f"Expected bool but received {type(enable_checkpointing)}."
             )
-            if isinstance(checkpoint_callback, Callback):
+            if isinstance(enable_checkpointing, Callback):
                 error_msg += " Pass callback instances to the `callbacks` argument in the Trainer constructor instead."
             raise MisconfigurationException(error_msg)
-        if self._trainer_has_checkpoint_callbacks() and checkpoint_callback is False:
+        if self._trainer_has_checkpoint_callbacks() and enable_checkpointing is False:
             raise MisconfigurationException(
-                "Trainer was configured with checkpoint_callback=False but found ModelCheckpoint in callbacks list."
+                "Trainer was configured with enable_checkpointing=False but found ModelCheckpoint in callbacks list."
             )
 
-        if not self._trainer_has_checkpoint_callbacks() and checkpoint_callback is True:
+        if not self._trainer_has_checkpoint_callbacks() and enable_checkpointing is True:
             self.trainer.callbacks.append(ModelCheckpoint())
 
     def _configure_model_summary_callback(self, weights_summary: Optional[str] = None) -> None:
diff --git a/pytorch_lightning/trainer/trainer.py b/pytorch_lightning/trainer/trainer.py
index f49c892e37191..a78ce94b4185f 100644
--- a/pytorch_lightning/trainer/trainer.py
+++ b/pytorch_lightning/trainer/trainer.py
@@ -120,7 +120,8 @@ class Trainer(
     def __init__(
         self,
         logger: Union[LightningLoggerBase, Iterable[LightningLoggerBase], bool] = True,
-        checkpoint_callback: bool = True,
+        checkpoint_callback: Optional[bool] = None,
+        enable_checkpointing: bool = True,
         callbacks: Optional[Union[List[Callback], Callback]] = None,
         default_root_dir: Optional[str] = None,
         gradient_clip_val: Union[int, float] = 0.0,
@@ -213,6 +214,12 @@ def __init__(
             callbacks: Add a callback or list of callbacks.
 
             checkpoint_callback: If ``True``, enable checkpointing.
+
+                .. deprecated:: v1.5
+                    ``checkpoint_callback`` has been deprecated in v1.5 and will be removed in v1.7.
+                    Please consider using ``enable_checkpointing`` instead.
+
+            enable_checkpointing: If ``True``, enable checkpointing.
                 It will configure a default ModelCheckpoint callback if there is no user-defined ModelCheckpoint in
                 :paramref:`~pytorch_lightning.trainer.trainer.Trainer.callbacks`.
 
@@ -454,6 +461,7 @@ def __init__(
         self.callback_connector.on_trainer_init(
             callbacks,
             checkpoint_callback,
+            enable_checkpointing,
             enable_progress_bar,
             progress_bar_refresh_rate,
             process_position,
diff --git a/tests/deprecated_api/test_remove_1-7.py b/tests/deprecated_api/test_remove_1-7.py
index 17facc032994d..d167ce144b1b9 100644
--- a/tests/deprecated_api/test_remove_1-7.py
+++ b/tests/deprecated_api/test_remove_1-7.py
@@ -255,3 +255,8 @@ def test_v1_7_0_deprecate_lightning_distributed(tmpdir):
         from pytorch_lightning.distributed.dist import LightningDistributed
 
         _ = LightningDistributed()
+
+
+def test_v1_7_0_checkpoint_callback_trainer_constructor(tmpdir):
+    with pytest.deprecated_call(match=r"Setting `Trainer\(checkpoint_callback\)` is deprecated in v1.5"):
+        _ = Trainer(checkpoint_callback=True)

From 96bf7a1b2fc5b4a9eb19562d4bf03b041d914adf Mon Sep 17 00:00:00 2001
From: rohitgr7 <rohitgr1998@gmail.com>
Date: Wed, 29 Sep 2021 15:43:23 +0530
Subject: [PATCH 02/13] update codebase

---
 .../trainer/connectors/callback_connector.py     |  2 +-
 tests/accelerators/test_tpu_backend.py           |  8 ++++----
 tests/callbacks/test_callbacks.py                |  4 ++--
 tests/callbacks/test_early_stopping.py           |  2 +-
 tests/callbacks/test_lr_monitor.py               |  2 +-
 tests/callbacks/test_progress_bar.py             |  8 ++++----
 tests/callbacks/test_pruning.py                  |  6 +++---
 tests/callbacks/test_quantization.py             |  2 +-
 .../test_checkpoint_callback_frequency.py        |  4 ++--
 tests/checkpointing/test_legacy_checkpoints.py   |  2 +-
 tests/checkpointing/test_model_checkpoint.py     | 16 ++++++++--------
 tests/deprecated_api/test_remove_1-6.py          |  2 +-
 tests/loggers/test_all.py                        |  2 +-
 tests/loggers/test_base.py                       |  6 +++---
 tests/loops/batch/test_truncated_bptt.py         |  6 +++---
 tests/loops/optimization/test_optimizer_loop.py  |  6 +++---
 tests/loops/test_loops.py                        |  4 ++--
 tests/loops/test_training_loop_flow_scalar.py    |  4 ++--
 tests/models/test_tpu.py                         |  4 ++--
 .../connectors/test_callback_connector.py        |  4 ++--
 tests/trainer/logging_/test_logger_connector.py  |  2 +-
 .../trainer/logging_/test_train_loop_logging.py  |  2 +-
 tests/trainer/properties/test_log_dir.py         |  4 ++--
 tests/trainer/test_dataloaders.py                |  8 ++++----
 tests/trainer/test_trainer.py                    |  4 ++--
 tests/trainer/test_trainer_cli.py                |  2 +-
 tests/utilities/test_cli.py                      |  2 +-
 27 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/pytorch_lightning/trainer/connectors/callback_connector.py b/pytorch_lightning/trainer/connectors/callback_connector.py
index a7ebf243afe5c..ac12e44c45089 100644
--- a/pytorch_lightning/trainer/connectors/callback_connector.py
+++ b/pytorch_lightning/trainer/connectors/callback_connector.py
@@ -143,7 +143,7 @@ def _configure_accumulated_gradients(
 
     def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], enable_checkpointing: bool) -> None:
         if checkpoint_callback is not None:
-            rank_zero_deprecation(
+            raise MisconfigurationException(
                 f"Setting `Trainer(checkpoint_callback={checkpoint_callback})` is deprecated in v1.5 and will "
                 f"be removed in v1.7. Please consider using `Trainer(enable_checkpointing={checkpoint_callback})`."
             )
diff --git a/tests/accelerators/test_tpu_backend.py b/tests/accelerators/test_tpu_backend.py
index 7f7bad327f515..7cc9c4cc910d4 100644
--- a/tests/accelerators/test_tpu_backend.py
+++ b/tests/accelerators/test_tpu_backend.py
@@ -50,7 +50,7 @@ def test_resume_training_on_cpu(tmpdir):
     """Checks if training can be resumed from a saved checkpoint on CPU."""
     # Train a model on TPU
     model = BoringModel()
-    trainer = Trainer(checkpoint_callback=True, max_epochs=1, tpu_cores=8)
+    trainer = Trainer(enable_checkpointing=True, max_epochs=1, tpu_cores=8)
     trainer.fit(model)
 
     model_path = trainer.checkpoint_callback.best_model_path
@@ -62,7 +62,7 @@ def test_resume_training_on_cpu(tmpdir):
 
     # Verify that training is resumed on CPU
     trainer = Trainer(
-        resume_from_checkpoint=model_path, checkpoint_callback=True, max_epochs=1, default_root_dir=tmpdir
+        resume_from_checkpoint=model_path, enable_checkpointing=True, max_epochs=1, default_root_dir=tmpdir
     )
     trainer.fit(model)
     assert trainer.state.finished, f"Training failed with {trainer.state}"
@@ -86,7 +86,7 @@ def test_weight_tying_warning(tmpdir, capsys=None):
     """Ensure a warning is thrown if model parameter lengths do not match post moving to device."""
 
     model = WeightSharingModule()
-    trainer = Trainer(checkpoint_callback=True, max_epochs=1, tpu_cores=1)
+    trainer = Trainer(enable_checkpointing=True, max_epochs=1, tpu_cores=1)
 
     with pytest.warns(UserWarning, match=r"The model layers do not match after moving to the target device."):
         trainer.fit(model)
@@ -105,7 +105,7 @@ def on_post_move_to_device(self):
             self.layer_3.weight = self.layer_1.weight
 
     model = Model()
-    trainer = Trainer(checkpoint_callback=True, max_epochs=1, tpu_cores=1)
+    trainer = Trainer(enable_checkpointing=True, max_epochs=1, tpu_cores=1)
 
     with pytest.warns(UserWarning, match="The model layers do not match"):
         trainer.fit(model)
diff --git a/tests/callbacks/test_callbacks.py b/tests/callbacks/test_callbacks.py
index 78e21d821b810..34beca2021933 100644
--- a/tests/callbacks/test_callbacks.py
+++ b/tests/callbacks/test_callbacks.py
@@ -35,7 +35,7 @@ def configure_callbacks(self):
 
     model = TestModel()
     trainer_options = dict(
-        default_root_dir=tmpdir, checkpoint_callback=False, fast_dev_run=True, enable_progress_bar=False
+        default_root_dir=tmpdir, enable_checkpointing=False, fast_dev_run=True, enable_progress_bar=False
     )
 
     def assert_expected_calls(_trainer, model_callback, trainer_callback):
@@ -86,7 +86,7 @@ def configure_callbacks(self):
             return [model_callback_mock]
 
     model = TestModel()
-    trainer = Trainer(default_root_dir=tmpdir, fast_dev_run=True, checkpoint_callback=False)
+    trainer = Trainer(default_root_dir=tmpdir, fast_dev_run=True, enable_checkpointing=False)
 
     callbacks_before_fit = trainer.callbacks.copy()
     assert callbacks_before_fit
diff --git a/tests/callbacks/test_early_stopping.py b/tests/callbacks/test_early_stopping.py
index fe6873c8f43bf..b44dee9abb0b6 100644
--- a/tests/callbacks/test_early_stopping.py
+++ b/tests/callbacks/test_early_stopping.py
@@ -111,7 +111,7 @@ def test_early_stopping_no_extraneous_invocations(tmpdir):
         limit_train_batches=4,
         limit_val_batches=4,
         max_epochs=expected_count,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model, datamodule=dm)
 
diff --git a/tests/callbacks/test_lr_monitor.py b/tests/callbacks/test_lr_monitor.py
index df84a1b186231..ff92c83871162 100644
--- a/tests/callbacks/test_lr_monitor.py
+++ b/tests/callbacks/test_lr_monitor.py
@@ -390,7 +390,7 @@ def finetune_function(self, pl_module, epoch: int, optimizer, opt_idx: int):
         callbacks=[TestFinetuning(), lr_monitor, Check()],
         enable_progress_bar=False,
         weights_summary=None,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     model = TestModel()
     model.training_epoch_end = None
diff --git a/tests/callbacks/test_progress_bar.py b/tests/callbacks/test_progress_bar.py
index fe40150f92680..eddefd1baad2b 100644
--- a/tests/callbacks/test_progress_bar.py
+++ b/tests/callbacks/test_progress_bar.py
@@ -263,7 +263,7 @@ def on_validation_epoch_end(self, *args):
         limit_val_batches=limit_val_batches,
         callbacks=[progress_bar],
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model)
 
@@ -342,7 +342,7 @@ def test_main_progress_bar_update_amount(
         limit_val_batches=val_batches,
         callbacks=[progress_bar],
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model)
     if train_batches > 0:
@@ -362,7 +362,7 @@ def test_test_progress_bar_update_amount(tmpdir, test_batches: int, refresh_rate
         limit_test_batches=test_batches,
         callbacks=[progress_bar],
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.test(model)
     progress_bar.test_progress_bar.update.assert_has_calls([call(delta) for delta in test_deltas])
@@ -379,7 +379,7 @@ def training_step(self, batch, batch_idx):
             return super().training_step(batch, batch_idx)
 
     trainer = Trainer(
-        default_root_dir=tmpdir, max_epochs=1, limit_train_batches=2, logger=False, checkpoint_callback=False
+        default_root_dir=tmpdir, max_epochs=1, limit_train_batches=2, logger=False, enable_checkpointing=False
     )
     trainer.fit(TestModel())
 
diff --git a/tests/callbacks/test_pruning.py b/tests/callbacks/test_pruning.py
index 5c2f2d4d7b3de..0f79132f9748b 100644
--- a/tests/callbacks/test_pruning.py
+++ b/tests/callbacks/test_pruning.py
@@ -109,7 +109,7 @@ def train_with_pruning_callback(
         default_root_dir=tmpdir,
         enable_progress_bar=False,
         weights_summary=None,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         logger=False,
         limit_train_batches=10,
         limit_val_batches=2,
@@ -227,7 +227,7 @@ def apply_lottery_ticket_hypothesis(self):
         default_root_dir=tmpdir,
         enable_progress_bar=False,
         weights_summary=None,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         logger=False,
         limit_train_batches=10,
         limit_val_batches=2,
@@ -254,7 +254,7 @@ def test_multiple_pruning_callbacks(tmpdir, caplog, make_pruning_permanent: bool
         default_root_dir=tmpdir,
         enable_progress_bar=False,
         weights_summary=None,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         logger=False,
         limit_train_batches=10,
         limit_val_batches=2,
diff --git a/tests/callbacks/test_quantization.py b/tests/callbacks/test_quantization.py
index 73d1a458b52ed..f548d4d98adcc 100644
--- a/tests/callbacks/test_quantization.py
+++ b/tests/callbacks/test_quantization.py
@@ -56,7 +56,7 @@ def test_quantization(tmpdir, observe: str, fuse: bool, convert: bool):
     assert torch.allclose(org_score, quant_score, atol=0.45)
     model_path = trainer.checkpoint_callback.best_model_path
 
-    trainer_args.update(dict(max_epochs=1, checkpoint_callback=False))
+    trainer_args.update(dict(max_epochs=1, enable_checkpointing=False))
     if not convert:
         trainer = Trainer(callbacks=[QuantizationAwareTraining()], **trainer_args)
         trainer.fit(qmodel, datamodule=dm)
diff --git a/tests/checkpointing/test_checkpoint_callback_frequency.py b/tests/checkpointing/test_checkpoint_callback_frequency.py
index cb38ae8f0573f..46551df660b8d 100644
--- a/tests/checkpointing/test_checkpoint_callback_frequency.py
+++ b/tests/checkpointing/test_checkpoint_callback_frequency.py
@@ -22,9 +22,9 @@
 from tests.helpers.runif import RunIf
 
 
-def test_checkpoint_callback_disabled(tmpdir):
+def test_disabled_checkpointing(tmpdir):
     # no callback
-    trainer = Trainer(max_epochs=3, checkpoint_callback=False)
+    trainer = Trainer(max_epochs=3, enable_checkpointing=False)
     assert not trainer.checkpoint_callbacks
     trainer.fit(BoringModel())
     assert not trainer.checkpoint_callbacks
diff --git a/tests/checkpointing/test_legacy_checkpoints.py b/tests/checkpointing/test_legacy_checkpoints.py
index 040cd642556cf..186d57f45c2d3 100644
--- a/tests/checkpointing/test_legacy_checkpoints.py
+++ b/tests/checkpointing/test_legacy_checkpoints.py
@@ -79,7 +79,7 @@ def test_resume_legacy_checkpoints(tmpdir, pl_version: str):
             default_root_dir=str(tmpdir),
             gpus=int(torch.cuda.is_available()),
             precision=(16 if torch.cuda.is_available() else 32),
-            checkpoint_callback=True,
+            enable_checkpointing=True,
             callbacks=[es, stop],
             max_epochs=21,
             accumulate_grad_batches=2,
diff --git a/tests/checkpointing/test_model_checkpoint.py b/tests/checkpointing/test_model_checkpoint.py
index 1bb8d6b63ec9b..a311b1c98dbb6 100644
--- a/tests/checkpointing/test_model_checkpoint.py
+++ b/tests/checkpointing/test_model_checkpoint.py
@@ -1008,17 +1008,17 @@ def test_configure_model_checkpoint(tmpdir):
     callback2 = ModelCheckpoint()
 
     # no callbacks
-    trainer = Trainer(checkpoint_callback=False, callbacks=[], **kwargs)
+    trainer = Trainer(enable_checkpointing=False, callbacks=[], **kwargs)
     assert not any(isinstance(c, ModelCheckpoint) for c in trainer.callbacks)
     assert trainer.checkpoint_callback is None
 
     # default configuration
-    trainer = Trainer(checkpoint_callback=True, callbacks=[], **kwargs)
+    trainer = Trainer(enable_checkpointing=True, callbacks=[], **kwargs)
     assert sum(1 for c in trainer.callbacks if isinstance(c, ModelCheckpoint)) == 1
     assert isinstance(trainer.checkpoint_callback, ModelCheckpoint)
 
-    # custom callback passed to callbacks list, checkpoint_callback=True is ignored
-    trainer = Trainer(checkpoint_callback=True, callbacks=[callback1], **kwargs)
+    # custom callback passed to callbacks list, enable_checkpointing=True is ignored
+    trainer = Trainer(enable_checkpointing=True, callbacks=[callback1], **kwargs)
     assert [c for c in trainer.callbacks if isinstance(c, ModelCheckpoint)] == [callback1]
     assert trainer.checkpoint_callback == callback1
 
@@ -1027,8 +1027,8 @@ def test_configure_model_checkpoint(tmpdir):
     assert trainer.checkpoint_callback == callback1
     assert trainer.checkpoint_callbacks == [callback1, callback2]
 
-    with pytest.raises(MisconfigurationException, match="checkpoint_callback=False but found ModelCheckpoint"):
-        Trainer(checkpoint_callback=False, callbacks=[callback1], **kwargs)
+    with pytest.raises(MisconfigurationException, match="enable_checkpointing=False but found ModelCheckpoint"):
+        Trainer(enable_checkpointing=False, callbacks=[callback1], **kwargs)
 
 
 def test_val_check_interval_checkpoint_files(tmpdir):
@@ -1199,8 +1199,8 @@ def test_model_checkpoint_mode_options():
 
 def test_trainer_checkpoint_callback_bool(tmpdir):
     mc = ModelCheckpoint(dirpath=tmpdir)
-    with pytest.raises(MisconfigurationException, match="Invalid type provided for checkpoint_callback"):
-        Trainer(checkpoint_callback=mc)
+    with pytest.raises(MisconfigurationException, match="Invalid type provided for enable_checkpointing"):
+        Trainer(enable_checkpointing=mc)
 
 
 def test_check_val_every_n_epochs_top_k_integration(tmpdir):
diff --git a/tests/deprecated_api/test_remove_1-6.py b/tests/deprecated_api/test_remove_1-6.py
index f580d9b89f7f8..40326eebc1d08 100644
--- a/tests/deprecated_api/test_remove_1-6.py
+++ b/tests/deprecated_api/test_remove_1-6.py
@@ -30,7 +30,7 @@
 
 def test_v1_6_0_trainer_model_hook_mixin(tmpdir):
     model = BoringModel()
-    trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, checkpoint_callback=False, logger=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, enable_checkpointing=False, logger=False)
     trainer.fit(model)
     with pytest.deprecated_call(match="is deprecated in v1.4 and will be removed in v1.6"):
         trainer.is_function_implemented("training_step", model)
diff --git a/tests/loggers/test_all.py b/tests/loggers/test_all.py
index 885e6625d85ef..76541b97494dc 100644
--- a/tests/loggers/test_all.py
+++ b/tests/loggers/test_all.py
@@ -338,7 +338,7 @@ def _test_logger_created_on_rank_zero_only(tmpdir, logger_class):
         accelerator="ddp_cpu",
         num_processes=2,
         max_steps=1,
-        checkpoint_callback=True,
+        enable_checkpointing=True,
         callbacks=[RankZeroLoggerCheck()],
     )
     trainer.fit(model)
diff --git a/tests/loggers/test_base.py b/tests/loggers/test_base.py
index 878ea1362b9ed..d535905930dd2 100644
--- a/tests/loggers/test_base.py
+++ b/tests/loggers/test_base.py
@@ -318,7 +318,7 @@ class _Test:
         limit_train_batches=0.1,
         limit_val_batches=0.1,
         num_sanity_val_steps=0,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         enable_progress_bar=False,
         weights_summary=None,
     )
@@ -342,7 +342,7 @@ class _Test:
         limit_train_batches=0.1,
         limit_val_batches=0.1,
         num_sanity_val_steps=0,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         enable_progress_bar=False,
         weights_summary=None,
     )
@@ -359,7 +359,7 @@ class _Test:
         limit_train_batches=0.1,
         limit_val_batches=0.1,
         num_sanity_val_steps=0,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         enable_progress_bar=False,
         weights_summary=None,
     )
diff --git a/tests/loops/batch/test_truncated_bptt.py b/tests/loops/batch/test_truncated_bptt.py
index 874a621f8a485..de38800917398 100644
--- a/tests/loops/batch/test_truncated_bptt.py
+++ b/tests/loops/batch/test_truncated_bptt.py
@@ -101,7 +101,7 @@ def on_train_batch_start(self, *_, **__) -> None:
         max_epochs=2,
         weights_summary=None,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model)
 
@@ -142,7 +142,7 @@ def training_epoch_end(self, training_step_outputs):
         max_epochs=1,
         weights_summary=None,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model, train_dataloaders=train_dataloader)
 
@@ -166,7 +166,7 @@ def training_step(self, *args, **kwargs):
         max_epochs=2,
         log_every_n_steps=2,
         weights_summary=None,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model)
     assert set(trainer.logged_metrics) == {"loss_step", "loss_epoch", "epoch"}
diff --git a/tests/loops/optimization/test_optimizer_loop.py b/tests/loops/optimization/test_optimizer_loop.py
index 4f7f8ac7d48ce..66a58524a399b 100644
--- a/tests/loops/optimization/test_optimizer_loop.py
+++ b/tests/loops/optimization/test_optimizer_loop.py
@@ -194,7 +194,7 @@ def configure_optimizers(self):
         limit_val_batches=0,
         num_sanity_val_steps=0,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model)
     weights_complete = model.parameters()
@@ -213,7 +213,7 @@ def configure_optimizers(self):
         limit_val_batches=0,
         num_sanity_val_steps=0,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     with pytest.raises(CustomException):
         trainer.fit(model)
@@ -234,7 +234,7 @@ def configure_optimizers(self):
         limit_val_batches=0,
         num_sanity_val_steps=0,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
     trainer.fit(model)
     weights_resumed = model.parameters()
diff --git a/tests/loops/test_loops.py b/tests/loops/test_loops.py
index 0d5421549ccca..9ae3b0e647359 100644
--- a/tests/loops/test_loops.py
+++ b/tests/loops/test_loops.py
@@ -366,7 +366,7 @@ def configure_optimizers_multiple(self):
         accumulate_grad_batches=accumulate_grad_batches,
         enable_progress_bar=False,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
 
     # simulate a failure
@@ -565,7 +565,7 @@ def train_dataloader(self):
         accumulate_grad_batches=accumulate_grad_batches,
         enable_progress_bar=False,
         logger=False,
-        checkpoint_callback=True,
+        enable_checkpointing=True,
     )
     trainer.fit(model)
 
diff --git a/tests/loops/test_training_loop_flow_scalar.py b/tests/loops/test_training_loop_flow_scalar.py
index 4f64a906646ba..d7dbecc82eaaf 100644
--- a/tests/loops/test_training_loop_flow_scalar.py
+++ b/tests/loops/test_training_loop_flow_scalar.py
@@ -297,7 +297,7 @@ def training_step(self, batch, batch_idx):
         max_epochs=4,
         weights_summary=None,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
 
     Closure.warning_cache.clear()
@@ -343,7 +343,7 @@ def train_dataloader(self):
         max_epochs=4,
         weights_summary=None,
         logger=False,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
 
     with pytest.warns(UserWarning, match=r".*train_dataloader yielded None.*"):
diff --git a/tests/models/test_tpu.py b/tests/models/test_tpu.py
index dd4707fb324d3..f39a378631f0c 100644
--- a/tests/models/test_tpu.py
+++ b/tests/models/test_tpu.py
@@ -399,11 +399,11 @@ def test_tpu_precision_16_clip_gradients(mock_clip_grad_norm, clip_val, tmpdir):
 @RunIf(tpu=True)
 @pl_multi_process_test
 def test_if_test_works_with_checkpoint_false(tmpdir):
-    """Ensure that model trains properly when `checkpoint_callback` is set to False."""
+    """Ensure that model trains properly when `enable_checkpointing` is set to False."""
 
     # Train a model on TPU
     model = BoringModel()
-    trainer = Trainer(max_epochs=1, tpu_cores=8, default_root_dir=tmpdir, fast_dev_run=True, checkpoint_callback=False)
+    trainer = Trainer(max_epochs=1, tpu_cores=8, default_root_dir=tmpdir, fast_dev_run=True, enable_checkpointing=False)
     trainer.fit(model)
     assert trainer.state.finished, f"Training failed with {trainer.state}"
 
diff --git a/tests/trainer/connectors/test_callback_connector.py b/tests/trainer/connectors/test_callback_connector.py
index 41b3faa82f70d..34d5b8fa97afa 100644
--- a/tests/trainer/connectors/test_callback_connector.py
+++ b/tests/trainer/connectors/test_callback_connector.py
@@ -144,7 +144,7 @@ def _attach_callbacks(trainer_callbacks, model_callbacks):
         model = LightningModule()
         model.configure_callbacks = lambda: model_callbacks
         trainer = Trainer(
-            checkpoint_callback=False, enable_progress_bar=False, weights_summary=None, callbacks=trainer_callbacks
+            enable_checkpointing=False, enable_progress_bar=False, weights_summary=None, callbacks=trainer_callbacks
         )
         trainer.model = model
         cb_connector = CallbackConnector(trainer)
@@ -196,7 +196,7 @@ def test_attach_model_callbacks_override_info(caplog):
     """Test that the logs contain the info about overriding callbacks returned by configure_callbacks."""
     model = LightningModule()
     model.configure_callbacks = lambda: [LearningRateMonitor(), EarlyStopping()]
-    trainer = Trainer(checkpoint_callback=False, callbacks=[EarlyStopping(), LearningRateMonitor(), ProgressBar()])
+    trainer = Trainer(enable_checkpointing=False, callbacks=[EarlyStopping(), LearningRateMonitor(), ProgressBar()])
     trainer.model = model
     cb_connector = CallbackConnector(trainer)
     with caplog.at_level(logging.INFO):
diff --git a/tests/trainer/logging_/test_logger_connector.py b/tests/trainer/logging_/test_logger_connector.py
index b20cc4812e0d3..6798f6b61005d 100644
--- a/tests/trainer/logging_/test_logger_connector.py
+++ b/tests/trainer/logging_/test_logger_connector.py
@@ -512,7 +512,7 @@ def _assert_called(model, fn, stage):
         max_epochs=1,
         enable_progress_bar=False,
         num_sanity_val_steps=2,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
     )
 
     trainer.fit(model)
diff --git a/tests/trainer/logging_/test_train_loop_logging.py b/tests/trainer/logging_/test_train_loop_logging.py
index 3c72a78331720..8f66e2de55ab8 100644
--- a/tests/trainer/logging_/test_train_loop_logging.py
+++ b/tests/trainer/logging_/test_train_loop_logging.py
@@ -481,7 +481,7 @@ def on_epoch_end(self, trainer: Trainer, model: LightningModule):
         max_epochs=2,
         limit_train_batches=1,
         limit_val_batches=0,
-        checkpoint_callback=False,
+        enable_checkpointing=False,
         logger=False,
         weights_summary=None,
     )
diff --git a/tests/trainer/properties/test_log_dir.py b/tests/trainer/properties/test_log_dir.py
index 0623cf0097280..277a2f105efd6 100644
--- a/tests/trainer/properties/test_log_dir.py
+++ b/tests/trainer/properties/test_log_dir.py
@@ -47,7 +47,7 @@ def test_logdir_no_checkpoint_cb(tmpdir):
     expected = os.path.join(tmpdir, "lightning_logs", "version_0")
     model = TestModel(expected)
 
-    trainer = Trainer(default_root_dir=tmpdir, max_steps=2, checkpoint_callback=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_steps=2, enable_checkpointing=False)
 
     assert trainer.log_dir == expected
     trainer.fit(model)
@@ -71,7 +71,7 @@ def test_logdir_no_logger_no_checkpoint(tmpdir):
     expected = os.path.join(tmpdir)
     model = TestModel(expected)
 
-    trainer = Trainer(default_root_dir=tmpdir, max_steps=2, logger=False, checkpoint_callback=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_steps=2, logger=False, enable_checkpointing=False)
 
     assert trainer.log_dir == expected
     trainer.fit(model)
diff --git a/tests/trainer/test_dataloaders.py b/tests/trainer/test_dataloaders.py
index 859554a168d11..cf81fd5488bc8 100644
--- a/tests/trainer/test_dataloaders.py
+++ b/tests/trainer/test_dataloaders.py
@@ -333,11 +333,11 @@ def test_dataloaders_with_limit_val_batches(tmpdir, dataset, limit_val_batches):
 
     epoch_cb = Counter()
     callbacks = [epoch_cb]
-    checkpoint_callback = True
+    enable_checkpointing = False
     if limit_val_batches > 0:
         callbacks.append(ModelCheckpoint(monitor="val_log", save_top_k=1, mode="max", verbose=False))
-    else:
-        checkpoint_callback = False
+        enable_checkpointing = True
+
     epochs = 2
     trainer = Trainer(
         default_root_dir=tmpdir,
@@ -345,7 +345,7 @@ def test_dataloaders_with_limit_val_batches(tmpdir, dataset, limit_val_batches):
         max_epochs=epochs,
         callbacks=callbacks,
         limit_val_batches=limit_val_batches,
-        checkpoint_callback=checkpoint_callback,
+        enable_checkpointing=enable_checkpointing,
     )
     model = DummyModel()
 
diff --git a/tests/trainer/test_trainer.py b/tests/trainer/test_trainer.py
index 46080aa8c394c..1924ee7f85ee0 100644
--- a/tests/trainer/test_trainer.py
+++ b/tests/trainer/test_trainer.py
@@ -1307,7 +1307,7 @@ def setup(self, trainer, model, stage):
 
     model = CurrentModel()
     callback = CurrentCallback()
-    trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, checkpoint_callback=False, callbacks=[callback])
+    trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, enable_checkpointing=False, callbacks=[callback])
 
     if stage == "fit":
         trainer.fit(model)
@@ -1884,7 +1884,7 @@ def test_on_load_checkpoint_missing_callbacks(tmpdir):
 def test_module_current_fx_attributes_reset(tmpdir):
     """Ensure that lightning module's attributes related to current fx are reset at the end of execution."""
     model = BoringModel()
-    trainer = Trainer(default_root_dir=tmpdir, fast_dev_run=1, checkpoint_callback=False, logger=False)
+    trainer = Trainer(default_root_dir=tmpdir, fast_dev_run=1, enable_checkpointing=False, logger=False)
 
     trainer.fit(model)
     assert model._current_fx_name is None
diff --git a/tests/trainer/test_trainer_cli.py b/tests/trainer/test_trainer_cli.py
index b2bdd7f46d9a4..a97a07f2ee98f 100644
--- a/tests/trainer/test_trainer_cli.py
+++ b/tests/trainer/test_trainer_cli.py
@@ -198,7 +198,7 @@ def test_argparse_args_parsing_gpus(cli_args, expected_parsed, expected_device_i
         pytest.param({}, {}),
         pytest.param({"logger": False}, {}),
         pytest.param({"logger": False}, {"logger": True}),
-        pytest.param({"logger": False}, {"checkpoint_callback": True}),
+        pytest.param({"logger": False}, {"enable_checkpointing": True}),
     ],
 )
 def test_init_from_argparse_args(cli_args, extra_args):
diff --git a/tests/utilities/test_cli.py b/tests/utilities/test_cli.py
index ace76bd9374c8..0e8e0dba768eb 100644
--- a/tests/utilities/test_cli.py
+++ b/tests/utilities/test_cli.py
@@ -202,7 +202,7 @@ def test_parse_args_parsing_gpus(monkeypatch, cli_args, expected_gpu):
         ({}, {}),
         (dict(logger=False), {}),
         (dict(logger=False), dict(logger=True)),
-        (dict(logger=False), dict(checkpoint_callback=True)),
+        (dict(logger=False), dict(enable_checkpointing=True)),
     ],
 )
 def test_init_from_argparse_args(cli_args, extra_args):

From 88e96e2a5731dfb78fe4b29b884b3565ff4f766e Mon Sep 17 00:00:00 2001
From: rohitgr7 <rohitgr1998@gmail.com>
Date: Wed, 29 Sep 2021 15:47:45 +0530
Subject: [PATCH 03/13] chlog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6d22efccdf73..98ddb2037a133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -292,6 +292,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Deprecated Accelerator collective API `barrier`, `broadcast`, and `all_gather`, call `TrainingTypePlugin` collective API directly ([#9677](https://github.com/PyTorchLightning/pytorch-lightning/pull/9677))
 
 
+- Deprecated `checkpoint_callback` from the `Trainer` constructor in favour of `enable_checkpointing` ([#9754](https://github.com/PyTorchLightning/pytorch-lightning/pull/9754))
+
+
 ### Removed
 
 - Removed deprecated `metrics` ([#8586](https://github.com/PyTorchLightning/pytorch-lightning/pull/8586/))

From 0cfd8a7d534d0d51971d1f0a6594f8070fc8e746 Mon Sep 17 00:00:00 2001
From: rohitgr7 <rohitgr1998@gmail.com>
Date: Wed, 29 Sep 2021 16:31:08 +0530
Subject: [PATCH 04/13] update tests

---
 .../trainer/connectors/callback_connector.py              | 2 +-
 tests/trainer/connectors/test_checkpoint_connector.py     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pytorch_lightning/trainer/connectors/callback_connector.py b/pytorch_lightning/trainer/connectors/callback_connector.py
index ac12e44c45089..a7ebf243afe5c 100644
--- a/pytorch_lightning/trainer/connectors/callback_connector.py
+++ b/pytorch_lightning/trainer/connectors/callback_connector.py
@@ -143,7 +143,7 @@ def _configure_accumulated_gradients(
 
     def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], enable_checkpointing: bool) -> None:
         if checkpoint_callback is not None:
-            raise MisconfigurationException(
+            rank_zero_deprecation(
                 f"Setting `Trainer(checkpoint_callback={checkpoint_callback})` is deprecated in v1.5 and will "
                 f"be removed in v1.7. Please consider using `Trainer(enable_checkpointing={checkpoint_callback})`."
             )
diff --git a/tests/trainer/connectors/test_checkpoint_connector.py b/tests/trainer/connectors/test_checkpoint_connector.py
index 83a45f02224d5..a418da79f31d8 100644
--- a/tests/trainer/connectors/test_checkpoint_connector.py
+++ b/tests/trainer/connectors/test_checkpoint_connector.py
@@ -37,7 +37,7 @@ def on_hpc_load(self, checkpoint):
 
 def test_hpc_hook_calls(tmpdir):
     model = HPCHookdedModel()
-    trainer = Trainer(default_root_dir=tmpdir, max_steps=1, checkpoint_callback=False, logger=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_steps=1, enable_checkpointing=False, logger=False)
     trainer.fit(model)
     connector = trainer.checkpoint_connector
     connector.hpc_save(tmpdir, logger=Mock())
@@ -46,7 +46,7 @@ def test_hpc_hook_calls(tmpdir):
 
     # new training run, restore from hpc checkpoint file automatically
     assert set(os.listdir(tmpdir)) == {"hpc_ckpt_1.ckpt"}
-    trainer = Trainer(default_root_dir=tmpdir, max_steps=1, checkpoint_callback=False, logger=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_steps=1, enable_checkpointing=False, logger=False)
     trainer.fit(model)
     assert model.hpc_save_called == 1
     assert model.hpc_load_called == 1
@@ -86,7 +86,7 @@ def test_preloaded_checkpoint_lifecycle(tmpdir):
 def test_hpc_restore_attempt(tmpdir):
     """Test that restore() attempts to restore the hpc_ckpt with highest priority."""
     model = BoringModel()
-    trainer = Trainer(default_root_dir=tmpdir, max_steps=1, checkpoint_callback=False, logger=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_steps=1, enable_checkpointing=False, logger=False)
     trainer.fit(model)
 
     hpc_ckpt_path = tmpdir / "hpc_ckpt_3.ckpt"
@@ -98,7 +98,7 @@ def test_hpc_restore_attempt(tmpdir):
         torch.nn.init.constant_(param, 0)
 
     # case 1: restore hpc first, no explicit resume path provided
-    trainer = Trainer(default_root_dir=tmpdir, max_steps=2, checkpoint_callback=False, logger=False)
+    trainer = Trainer(default_root_dir=tmpdir, max_steps=2, enable_checkpointing=False, logger=False)
     trainer.fit(model)
 
     for param in model.parameters():

From 363a941e2d990cc31615d642db2a940359f357dc Mon Sep 17 00:00:00 2001
From: rohitgr7 <rohitgr1998@gmail.com>
Date: Wed, 29 Sep 2021 20:20:24 +0530
Subject: [PATCH 05/13] fix warning

---
 tests/deprecated_api/test_remove_1-7.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/deprecated_api/test_remove_1-7.py b/tests/deprecated_api/test_remove_1-7.py
index d167ce144b1b9..dcf9554da1e52 100644
--- a/tests/deprecated_api/test_remove_1-7.py
+++ b/tests/deprecated_api/test_remove_1-7.py
@@ -258,5 +258,5 @@ def test_v1_7_0_deprecate_lightning_distributed(tmpdir):
 
 
 def test_v1_7_0_checkpoint_callback_trainer_constructor(tmpdir):
-    with pytest.deprecated_call(match=r"Setting `Trainer\(checkpoint_callback\)` is deprecated in v1.5"):
+    with pytest.deprecated_call(match=r"Setting `Trainer\(checkpoint_callback=True\)` is deprecated in v1.5"):
         _ = Trainer(checkpoint_callback=True)

From 4f35a9b0492a48167243e0796ff2f38bea095a1c Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohitgr1998@gmail.com>
Date: Fri, 1 Oct 2021 00:48:56 +0530
Subject: [PATCH 06/13] Apply suggestions from code review

Co-authored-by: ananthsub <ananth.subramaniam@gmail.com>
---
 tests/accelerators/test_tpu_backend.py         | 8 ++++----
 tests/checkpointing/test_legacy_checkpoints.py | 1 -
 tests/checkpointing/test_model_checkpoint.py   | 2 +-
 tests/loggers/test_all.py                      | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/accelerators/test_tpu_backend.py b/tests/accelerators/test_tpu_backend.py
index 7cc9c4cc910d4..31649e507390b 100644
--- a/tests/accelerators/test_tpu_backend.py
+++ b/tests/accelerators/test_tpu_backend.py
@@ -50,7 +50,7 @@ def test_resume_training_on_cpu(tmpdir):
     """Checks if training can be resumed from a saved checkpoint on CPU."""
     # Train a model on TPU
     model = BoringModel()
-    trainer = Trainer(enable_checkpointing=True, max_epochs=1, tpu_cores=8)
+    trainer = Trainer(max_epochs=1, tpu_cores=8)
     trainer.fit(model)
 
     model_path = trainer.checkpoint_callback.best_model_path
@@ -62,7 +62,7 @@ def test_resume_training_on_cpu(tmpdir):
 
     # Verify that training is resumed on CPU
     trainer = Trainer(
-        resume_from_checkpoint=model_path, enable_checkpointing=True, max_epochs=1, default_root_dir=tmpdir
+        resume_from_checkpoint=model_path, max_epochs=1, default_root_dir=tmpdir
     )
     trainer.fit(model)
     assert trainer.state.finished, f"Training failed with {trainer.state}"
@@ -86,7 +86,7 @@ def test_weight_tying_warning(tmpdir, capsys=None):
     """Ensure a warning is thrown if model parameter lengths do not match post moving to device."""
 
     model = WeightSharingModule()
-    trainer = Trainer(enable_checkpointing=True, max_epochs=1, tpu_cores=1)
+    trainer = Trainer(max_epochs=1, tpu_cores=1)
 
     with pytest.warns(UserWarning, match=r"The model layers do not match after moving to the target device."):
         trainer.fit(model)
@@ -105,7 +105,7 @@ def on_post_move_to_device(self):
             self.layer_3.weight = self.layer_1.weight
 
     model = Model()
-    trainer = Trainer(enable_checkpointing=True, max_epochs=1, tpu_cores=1)
+    trainer = Trainer(max_epochs=1, tpu_cores=1)
 
     with pytest.warns(UserWarning, match="The model layers do not match"):
         trainer.fit(model)
diff --git a/tests/checkpointing/test_legacy_checkpoints.py b/tests/checkpointing/test_legacy_checkpoints.py
index 3fcc4a822e8b6..af7836590c2eb 100644
--- a/tests/checkpointing/test_legacy_checkpoints.py
+++ b/tests/checkpointing/test_legacy_checkpoints.py
@@ -79,7 +79,6 @@ def test_resume_legacy_checkpoints(tmpdir, pl_version: str):
             default_root_dir=str(tmpdir),
             gpus=int(torch.cuda.is_available()),
             precision=(16 if torch.cuda.is_available() else 32),
-            enable_checkpointing=True,
             callbacks=[es, stop],
             max_epochs=21,
             accumulate_grad_batches=2,
diff --git a/tests/checkpointing/test_model_checkpoint.py b/tests/checkpointing/test_model_checkpoint.py
index a311b1c98dbb6..29d521ab8c48f 100644
--- a/tests/checkpointing/test_model_checkpoint.py
+++ b/tests/checkpointing/test_model_checkpoint.py
@@ -1013,7 +1013,7 @@ def test_configure_model_checkpoint(tmpdir):
     assert trainer.checkpoint_callback is None
 
     # default configuration
-    trainer = Trainer(enable_checkpointing=True, callbacks=[], **kwargs)
+    trainer = Trainer(callbacks=[], **kwargs)
     assert sum(1 for c in trainer.callbacks if isinstance(c, ModelCheckpoint)) == 1
     assert isinstance(trainer.checkpoint_callback, ModelCheckpoint)
 
diff --git a/tests/loggers/test_all.py b/tests/loggers/test_all.py
index 76541b97494dc..e0a5ad01b6b41 100644
--- a/tests/loggers/test_all.py
+++ b/tests/loggers/test_all.py
@@ -338,7 +338,6 @@ def _test_logger_created_on_rank_zero_only(tmpdir, logger_class):
         accelerator="ddp_cpu",
         num_processes=2,
         max_steps=1,
-        enable_checkpointing=True,
         callbacks=[RankZeroLoggerCheck()],
     )
     trainer.fit(model)

From 317a4c3c5ca4e468037dafcf7f92766d834db18b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 30 Sep 2021 19:20:34 +0000
Subject: [PATCH 07/13] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/accelerators/test_tpu_backend.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/accelerators/test_tpu_backend.py b/tests/accelerators/test_tpu_backend.py
index 31649e507390b..7dea65e34e453 100644
--- a/tests/accelerators/test_tpu_backend.py
+++ b/tests/accelerators/test_tpu_backend.py
@@ -61,9 +61,7 @@ def test_resume_training_on_cpu(tmpdir):
     assert weight_tensor.device == torch.device("cpu")
 
     # Verify that training is resumed on CPU
-    trainer = Trainer(
-        resume_from_checkpoint=model_path, max_epochs=1, default_root_dir=tmpdir
-    )
+    trainer = Trainer(resume_from_checkpoint=model_path, max_epochs=1, default_root_dir=tmpdir)
     trainer.fit(model)
     assert trainer.state.finished, f"Training failed with {trainer.state}"
 

From a9f55b73d4698b1a95e10ba5c9e6b2a284f35b9f Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohitgr1998@gmail.com>
Date: Fri, 1 Oct 2021 00:53:18 +0530
Subject: [PATCH 08/13] Apply suggestions from code review

Co-authored-by: ananthsub <ananth.subramaniam@gmail.com>
---
 tests/loops/test_loops.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/loops/test_loops.py b/tests/loops/test_loops.py
index 9ae3b0e647359..3f52ced784ac0 100644
--- a/tests/loops/test_loops.py
+++ b/tests/loops/test_loops.py
@@ -565,7 +565,6 @@ def train_dataloader(self):
         accumulate_grad_batches=accumulate_grad_batches,
         enable_progress_bar=False,
         logger=False,
-        enable_checkpointing=True,
     )
     trainer.fit(model)
 

From c05430e7c316b79b6347cc79c666527703eb8a3f Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohitgr1998@gmail.com>
Date: Mon, 11 Oct 2021 13:01:30 +0530
Subject: [PATCH 09/13] Apply suggestions from code review

---
 pytorch_lightning/trainer/connectors/callback_connector.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pytorch_lightning/trainer/connectors/callback_connector.py b/pytorch_lightning/trainer/connectors/callback_connector.py
index a7ebf243afe5c..d7f259b0e5792 100644
--- a/pytorch_lightning/trainer/connectors/callback_connector.py
+++ b/pytorch_lightning/trainer/connectors/callback_connector.py
@@ -147,8 +147,8 @@ def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], e
                 f"Setting `Trainer(checkpoint_callback={checkpoint_callback})` is deprecated in v1.5 and will "
                 f"be removed in v1.7. Please consider using `Trainer(enable_checkpointing={checkpoint_callback})`."
             )
-            # if both are set, look whether anyone is True
-            enable_checkpointing = checkpoint_callback or enable_checkpointing
+            # if both are set then checkpoint only if both are True
+            enable_checkpointing = checkpoint_callback and enable_checkpointing
 
         # TODO: Remove this error in v1.5 so we rely purely on the type signature
         if not isinstance(enable_checkpointing, bool):

From 889d9b6c014021e2f4085eeb9ac95af483dcbb52 Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohitgr1998@gmail.com>
Date: Mon, 11 Oct 2021 14:35:49 +0530
Subject: [PATCH 10/13] Apply suggestions from code review

---
 docs/source/common/trainer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/common/trainer.rst b/docs/source/common/trainer.rst
index dbccade6b8cab..a401cd4d0ca4c 100644
--- a/docs/source/common/trainer.rst
+++ b/docs/source/common/trainer.rst
@@ -528,7 +528,7 @@ Example::
 checkpoint_callback
 ^^^^^^^^^^^^^^^^^^^
 
-Deprecated: This has been renamed ``enable_checkpointing``.
+Deprecated: This has been deprecated in v1.5 and will be removed in v.17. Please use ``enable_checkpointing`` instead.
 
 default_root_dir
 ^^^^^^^^^^^^^^^^

From c6a298c4c89af99111227cfecd8a127f71371d79 Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohitgr1998@gmail.com>
Date: Mon, 11 Oct 2021 17:17:14 +0530
Subject: [PATCH 11/13] Apply suggestions from code review

Co-authored-by: Nicki Skafte Detlefsen <skaftenicki@gmail.com>
---
 docs/source/common/trainer.rst                             | 2 +-
 pytorch_lightning/trainer/connectors/callback_connector.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/common/trainer.rst b/docs/source/common/trainer.rst
index a401cd4d0ca4c..42615383b5c1f 100644
--- a/docs/source/common/trainer.rst
+++ b/docs/source/common/trainer.rst
@@ -574,7 +574,7 @@ To disable automatic checkpointing, set this to `False`.
 
 .. code-block:: python
 
-    # default used by Trainer
+    # default used by Trainer, saves the most recent model to a single checkpoint after each epoch
     trainer = Trainer(enable_checkpointing=True)
 
     # turn off automatic checkpointing
diff --git a/pytorch_lightning/trainer/connectors/callback_connector.py b/pytorch_lightning/trainer/connectors/callback_connector.py
index d7f259b0e5792..03e5b9bffb6a6 100644
--- a/pytorch_lightning/trainer/connectors/callback_connector.py
+++ b/pytorch_lightning/trainer/connectors/callback_connector.py
@@ -153,7 +153,7 @@ def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], e
         # TODO: Remove this error in v1.5 so we rely purely on the type signature
         if not isinstance(enable_checkpointing, bool):
             error_msg = (
-                "Invalid type provided for enable_checkpointing: "
+                "Invalid type provided for `enable_checkpointing`: "
                 f"Expected bool but received {type(enable_checkpointing)}."
             )
             if isinstance(enable_checkpointing, Callback):
@@ -161,7 +161,7 @@ def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], e
             raise MisconfigurationException(error_msg)
         if self._trainer_has_checkpoint_callbacks() and enable_checkpointing is False:
             raise MisconfigurationException(
-                "Trainer was configured with enable_checkpointing=False but found ModelCheckpoint in callbacks list."
+                "Trainer was configured with `enable_checkpointing=False` but found `ModelCheckpoint` in callbacks list."
             )
 
         if not self._trainer_has_checkpoint_callbacks() and enable_checkpointing is True:

From e421fa27d91e17228288543ef56ab1572f5268bd Mon Sep 17 00:00:00 2001
From: rohitgr7 <rohitgr1998@gmail.com>
Date: Mon, 11 Oct 2021 17:36:51 +0530
Subject: [PATCH 12/13] update tests

---
 tests/checkpointing/test_model_checkpoint.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/checkpointing/test_model_checkpoint.py b/tests/checkpointing/test_model_checkpoint.py
index d5cd56103a7d2..5363766b5969d 100644
--- a/tests/checkpointing/test_model_checkpoint.py
+++ b/tests/checkpointing/test_model_checkpoint.py
@@ -1026,7 +1026,7 @@ def test_configure_model_checkpoint(tmpdir):
     assert trainer.checkpoint_callback == callback1
     assert trainer.checkpoint_callbacks == [callback1, callback2]
 
-    with pytest.raises(MisconfigurationException, match="enable_checkpointing=False but found ModelCheckpoint"):
+    with pytest.raises(MisconfigurationException, match="`enable_checkpointing=False` but found `ModelCheckpoint`"):
         Trainer(enable_checkpointing=False, callbacks=[callback1], **kwargs)
 
 
@@ -1198,7 +1198,7 @@ def test_model_checkpoint_mode_options():
 
 def test_trainer_checkpoint_callback_bool(tmpdir):
     mc = ModelCheckpoint(dirpath=tmpdir)
-    with pytest.raises(MisconfigurationException, match="Invalid type provided for enable_checkpointing"):
+    with pytest.raises(MisconfigurationException, match="Invalid type provided for `enable_checkpointing`"):
         Trainer(enable_checkpointing=mc)
 
 

From d8a347f32a07c9be6401829fffc5a4ccfe1d9db4 Mon Sep 17 00:00:00 2001
From: Nicki Skafte Detlefsen <skaftenicki@gmail.com>
Date: Mon, 11 Oct 2021 15:35:54 +0200
Subject: [PATCH 13/13] Update
 pytorch_lightning/trainer/connectors/callback_connector.py

---
 pytorch_lightning/trainer/connectors/callback_connector.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pytorch_lightning/trainer/connectors/callback_connector.py b/pytorch_lightning/trainer/connectors/callback_connector.py
index 03e5b9bffb6a6..0e5ba3170064a 100644
--- a/pytorch_lightning/trainer/connectors/callback_connector.py
+++ b/pytorch_lightning/trainer/connectors/callback_connector.py
@@ -161,7 +161,8 @@ def _configure_checkpoint_callbacks(self, checkpoint_callback: Optional[bool], e
             raise MisconfigurationException(error_msg)
         if self._trainer_has_checkpoint_callbacks() and enable_checkpointing is False:
             raise MisconfigurationException(
-                "Trainer was configured with `enable_checkpointing=False` but found `ModelCheckpoint` in callbacks list."
+                "Trainer was configured with `enable_checkpointing=False`"
+                " but found `ModelCheckpoint` in callbacks list."
             )
 
         if not self._trainer_has_checkpoint_callbacks() and enable_checkpointing is True: