Merge branch 'master' into rewrite-engine-terminate-and-co

Author: vfdev-5

examples/contrib/cifar10/main.py

@@ -260,7 +260,7 @@ def initialize(config):
 
 def log_metrics(logger, epoch, elapsed, tag, metrics):
     metrics_output = "\n".join([f"\t{k}: {v}" for k, v in metrics.items()])
-    logger.info(f"\nEpoch {epoch} - Evaluation time (seconds): {elapsed:.2f} - {tag} metrics:\n {metrics_output}")
+    logger.info(f"Epoch[{epoch}] - Evaluation time (seconds): {elapsed:.3f}\n - {tag} metrics:\n {metrics_output}")
 
 
 def log_basic_info(logger, config):
@@ -380,9 +380,6 @@ def evaluate_step(engine: Engine, batch):
     for name, metric in metrics.items():
         metric.attach(evaluator, name)
 
-    if idist.get_rank() == 0 and (not config["with_clearml"]):
-        common.ProgressBar(desc=f"Evaluation ({tag})", persist=False).attach(evaluator)
-
     return evaluator
 
 

ignite/engine/engine.py

@@ -776,7 +776,7 @@ def _internal_run(self) -> State:
 
                     hours, mins, secs = _to_hours_mins_secs(epoch_time_taken)
                     self.logger.info(
-                        f"Epoch[{self.state.epoch}] Complete. Time taken: {hours:02d}:{mins:02d}:{secs:02d}"
+                        f"Epoch[{self.state.epoch}] Complete. Time taken: {hours:02d}:{mins:02d}:{secs:06.3f}"
                     )
 
             except _EngineTerminateException:
@@ -791,7 +791,7 @@ def _internal_run(self) -> State:
             # update time wrt handlers
             self.state.times[Events.COMPLETED.name] = time_taken
             hours, mins, secs = _to_hours_mins_secs(time_taken)
-            self.logger.info(f"Engine run complete. Time taken: {hours:02d}:{mins:02d}:{secs:02d}")
+            self.logger.info(f"Engine run complete. Time taken: {hours:02d}:{mins:02d}:{secs:06.3f}")
 
         except BaseException as e:
             self._dataloader_iter = None

ignite/engine/utils.py

@@ -21,8 +21,8 @@ def _check_signature(fn: Callable, fn_description: str, *args: Any, **kwargs: An
         )
 
 
-def _to_hours_mins_secs(time_taken: Union[float, int]) -> Tuple[int, int, int]:
-    """Convert seconds to hours, mins, and seconds."""
+def _to_hours_mins_secs(time_taken: Union[float, int]) -> Tuple[int, int, float]:
+    """Convert seconds to hours, mins, seconds and milliseconds."""
     mins, secs = divmod(time_taken, 60)
     hours, mins = divmod(mins, 60)
-    return round(hours), round(mins), round(secs)
+    return round(hours), round(mins), secs