Merge branch 'master' into ci/horovod

Author: teddykoker

docs/source/trainer.rst

@@ -612,10 +612,10 @@ 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.
 
-Example::
+.. testcode::
 
     # default used by the Trainer
-    trainer = Trainer(default_root_path=os.getcwd())
+    trainer = Trainer(default_root_dir=os.getcwd())
 
 distributed_backend
 ^^^^^^^^^^^^^^^^^^^

notebooks/05-trainer-flags-overview.ipynb

@@ -2152,7 +2152,7 @@
    "outputs": [],
    "source": [
     "# default used by the Trainer\n",
-    "trainer = pl.Trainer(default_root_path=os.getcwd())\n",
+    "trainer = pl.Trainer(default_root_dir=os.getcwd())\n",
     "\n",
     "trainer.fit(model, train_loader, val_loader)"
    ]

pytorch_lightning/trainer/properties.py

@@ -48,7 +48,6 @@ class TrainerProperties(ABC):
     limit_val_batches: int
     _default_root_dir: str
     _weights_save_path: str
-    default_root_path: str
     accelerator_backend: Accelerator
     logger: LightningLoggerBase
     model_connector: ModelConnector