Revert unneeded updates to the solver

Author: stes

cebra/solver/__init__.py

@@ -36,7 +36,6 @@
 
 # pylint: disable=wrong-import-position
 from cebra.solver.base import *
-from cebra.solver.metrics import *
 from cebra.solver.multi_session import *
 from cebra.solver.multiobjective import *
 from cebra.solver.regularized import *

cebra/solver/metrics.py

@@ -21,7 +21,6 @@
 #
 """Utility functions for solvers and their training loops."""
 
-import logging
 from collections.abc import Iterable
 from typing import Dict
 
@@ -30,7 +29,7 @@
 
 
 def _description(stats: Dict[str, float]):
-    stats_str = [f"{key}: {value:.3f}" for key, value in stats.items()]
+    stats_str = [f"{key}: {value: .4f}" for key, value in stats.items()]
     return " ".join(stats_str)
 
 
@@ -74,9 +73,7 @@ class ProgressBar:
     "Log and display values during training."
 
     loader: Iterable
-    logger: logging.Logger = None
-    log_format: str = None
-    log_frequency: int = None
+    log_format: str
 
     _valid_formats = ["tqdm", "off"]
 
@@ -90,23 +87,13 @@ def __post_init__(self):
             raise ValueError(
                 f"log_format must be one of {self._valid_formats}, "
                 f"but got {self.log_formats}")
-        self._stats = None
 
     def __iter__(self):
         self.iterator = self.loader
         if self.use_tqdm:
             self.iterator = tqdm.tqdm(self.iterator)
         for num_batch, batch in enumerate(self.iterator):
             yield num_batch, batch
-            self._log_message(num_batch, self._stats)
-        self._log_message(num_batch, self._stats)
-
-    def _log_message(self, num_steps, stats):
-        if self.logger is None:
-            return
-        if num_steps % self.log_frequency != 0:
-            return
-        self.logger.info(f"Train: Step {num_steps} {_description(stats)}")
 
     def set_description(self, stats: Dict[str, float]):
         """Update the progress bar description.
@@ -119,5 +106,3 @@ def set_description(self, stats: Dict[str, float]):
         """
         if self.use_tqdm:
             self.iterator.set_description(_description(stats))
-
-        self._stats = stats