Merge branch 'master' into pytorch-profiler

Author: nicolas-chaulet

torch_points3d/metrics/segmentation_tracker.py

@@ -44,7 +44,7 @@ def reset(self, stage="train"):
         self._acc = 0
         self._macc = 0
         self._miou = 0
-        self._miou_per_class = {}
+        self._iou_per_class = {}
 
     @staticmethod
     def detach_tensor(tensor):
@@ -85,7 +85,7 @@ def _compute_metrics(self, outputs, labels):
         self._acc = 100 * self._confusion_matrix.get_overall_accuracy()
         self._macc = 100 * self._confusion_matrix.get_mean_class_accuracy()
         self._miou = 100 * self._confusion_matrix.get_average_intersection_union()
-        self._miou_per_class = {
+        self._iou_per_class = {
             i: "{:.2f}".format(100 * v)
             for i, v in enumerate(self._confusion_matrix.get_intersection_union_per_class()[0])
         }
@@ -100,7 +100,7 @@ def get_metrics(self, verbose=False) -> Dict[str, Any]:
         metrics["{}_miou".format(self._stage)] = self._miou
 
         if verbose:
-            metrics["{}_miou_per_class".format(self._stage)] = self._miou_per_class
+            metrics["{}_iou_per_class".format(self._stage)] = self._iou_per_class
         return metrics
 
     @property

torch_points3d/trainer.py

@@ -314,7 +314,7 @@ def has_visualization(self):
 
     @property
     def has_tensorboard(self):
-        return getattr(self._cfg, "tensorboard", False)
+        return getattr(self._cfg.training, "tensorboard", False)
 
     @property
     def has_training(self):
@@ -326,15 +326,15 @@ def precompute_multi_scale(self):
 
     @property
     def wandb_log(self):
-        if getattr(self._cfg, "wandb", False):
+        if getattr(self._cfg.training, "wandb", False):
             return getattr(self._cfg.wandb, "log", False)
         else:
             return False
 
     @property
     def tensorboard_log(self):
         if self.has_tensorboard:
-            return getattr(self._cfg.tensorboard, "log", False)
+            return getattr(self._cfg.training.tensorboard, "log", False)
         else:
             return False