Possible fixes for todos

Author: akashkw

pytorch_lightning/callbacks/model_checkpoint.py

@@ -584,15 +584,21 @@ def __resolve_ckpt_dir(self, trainer: "pl.Trainer") -> None:
                 # the user has changed weights_save_path, it overrides anything
                 save_dir = trainer.weights_save_path
             else:
-                save_dir = trainer.logger.save_dir if len(trainer.loggers) == 1 else trainer.default_root_dir
-
-            version = (
-                trainer.logger.version
-                if isinstance(trainer.logger.version, str)
-                else f"version_{trainer.logger.version}"
-            )
-            # TODO: Find out what ckpt_path should be with multiple loggers
-            ckpt_path = os.path.join(save_dir, str(trainer.logger.name), version, "checkpoints")
+                if len(trainer.loggers) == 1:
+                    save_dir = trainer.logger.save_dir or trainer.default_root_dir
+                else:
+                    save_dir = trainer.default_root_dir
+
+            if len(trainer.loggers) == 1:
+                version = (
+                    trainer.logger.version
+                    if isinstance(trainer.logger.version, str)
+                    else f"version_{trainer.logger.version}"
+                )
+                # TODO: Find out what ckpt_path should be with multiple loggers
+                ckpt_path = os.path.join(save_dir, str(trainer.logger.name), version, "checkpoints")
+            else:
+                ckpt_path = os.path.join(save_dir, "checkpoints")
         else:
             ckpt_path = os.path.join(trainer.weights_save_path, "checkpoints")
 

pytorch_lightning/callbacks/progress/base.py

@@ -213,9 +213,9 @@ def get_standard_metrics(trainer: "pl.Trainer", pl_module: "pl.LightningModule")
     if pl_module.truncated_bptt_steps > 0:
         items_dict["split_idx"] = trainer.fit_loop.split_idx
 
-    # TODO: Adapt for trainer.loggers
-    if trainer.logger is not None and trainer.logger.version is not None:
-        version = trainer.logger.version
+    # TODO: Find out if this is the correct approach
+    if len(trainer.loggers) == 1 and trainer.loggers[0].version is not None:
+        version = trainer.loggers[0].version
         if isinstance(version, str):
             # show last 4 places of long version strings
             version = version[-4:]