[fix] mse error for other inferences

Author: jianwensong

compressai_vision/evaluators/evaluators.py

@@ -176,7 +176,10 @@ def results(self, save_path: str = None):
 
         self.write_results(out)
 
-        overall_mse = None
+        # summary = {}
+        # for key, item_dict in out.items():
+        #     summary[f"{key}"] = item_dict["AP"]
+
         if self._mse_results:
             mse_results_dict = {"per_frame_mse": self._mse_results}
             overall_mse = 0.0
@@ -205,11 +208,9 @@ def results(self, save_path: str = None):
             ) as f:
                 json.dump(mse_results_dict, f, ensure_ascii=False, indent=4)
 
-        # summary = {}
-        # for key, item_dict in out.items():
-        #     summary[f"{key}"] = item_dict["AP"]
-
-        return out, overall_mse
+            return out, overall_mse
+        else:
+            return out
 
 
 @register_evaluator("OIC-EVAL")
@@ -474,7 +475,11 @@ def results(self, save_path: str = None):
 
         self.write_results(out)
 
-        overall_mse = None
+        summary = {}
+        for key, value in out.items():
+            name = "-".join(key.split("/")[1:])
+            summary[name] = value
+
         if self._mse_results:
             mse_results_dict = {"per_frame_mse": self._mse_results}
             overall_mse = 0.0
@@ -503,12 +508,9 @@ def results(self, save_path: str = None):
             ) as f:
                 json.dump(mse_results_dict, f, ensure_ascii=False, indent=4)
 
-        summary = {}
-        for key, value in out.items():
-            name = "-".join(key.split("/")[1:])
-            summary[name] = value
-
-        return summary, overall_mse
+            return summary, overall_mse
+        else:
+            return summary
 
 
 @register_evaluator("SEMANTICSEG-EVAL")
@@ -607,7 +609,6 @@ def results(self, save_path: str = None):
 
         self.write_results(class_mIoU)
 
-        overall_mse = None
         if self._mse_results:
             mse_results_dict = {"per_frame_mse": self._mse_results}
             overall_mse = 0.0
@@ -636,7 +637,9 @@ def results(self, save_path: str = None):
             ) as f:
                 json.dump(mse_results_dict, f, ensure_ascii=False, indent=4)
 
-        return class_mIoU, overall_mse
+            return class_mIoU, overall_mse
+        else:
+            return class_mIoU
 
 
 @register_evaluator("MOT-JDE-EVAL")
@@ -788,7 +791,6 @@ def results(self, save_path: str = None):
 
         self.write_results(out)
 
-        overall_mse = None
         if self._mse_results:
             mse_results_dict = {"per_frame_mse": self._mse_results}
             overall_mse = 0.0
@@ -817,7 +819,9 @@ def results(self, save_path: str = None):
             ) as f:
                 json.dump(mse_results_dict, f, ensure_ascii=False, indent=4)
 
-        return out, overall_mse
+            return out, overall_mse
+        else:
+            return out
 
     @staticmethod
     def digest_summary(summary):
@@ -1126,7 +1130,10 @@ def results(self, save_path: str = None):
 
         self.write_results(eval_results)
 
-        overall_mse = None
+        *listed_items, summary = eval_results
+
+        self._logger.info("\n" + summary)
+
         if self._mse_results:
             mse_results_dict = {"per_frame_mse": self._mse_results}
             overall_mse = 0.0
@@ -1155,11 +1162,12 @@ def results(self, save_path: str = None):
             ) as f:
                 json.dump(mse_results_dict, f, ensure_ascii=False, indent=4)
 
-        *listed_items, summary = eval_results
-
-        self._logger.info("\n" + summary)
-
-        return {"AP": listed_items[0] * 100, "AP50": listed_items[1] * 100}, overall_mse
+            return {
+                "AP": listed_items[0] * 100,
+                "AP50": listed_items[1] * 100,
+            }, overall_mse
+        else:
+            return {"AP": listed_items[0] * 100, "AP50": listed_items[1] * 100}
 
     def _convert_to_coco_format(self, outputs, info_imgs, ids):
         # reference : yolox > evaluators > coco_evaluator > convert_to_coco_format
@@ -1363,7 +1371,11 @@ def results(self, save_path: str = None):
 
         self.write_results(eval_results)
 
-        overall_mse = None
+        # item_keys = list(eval_results.keys())
+        item_vals = list(eval_results.values())
+
+        # self._logger.info("\n" + summary)
+
         if self._mse_results:
             mse_results_dict = {"per_frame_mse": self._mse_results}
             overall_mse = 0.0
@@ -1392,12 +1404,9 @@ def results(self, save_path: str = None):
             ) as f:
                 json.dump(mse_results_dict, f, ensure_ascii=False, indent=4)
 
-        # item_keys = list(eval_results.keys())
-        item_vals = list(eval_results.values())
-
-        # self._logger.info("\n" + summary)
-
-        return {"AP": item_vals[0] * 100, "AP50": item_vals[1] * 100}, overall_mse
+            return {"AP": item_vals[0] * 100, "AP50": item_vals[1] * 100}, overall_mse
+        else:
+            return {"AP": item_vals[0] * 100, "AP50": item_vals[1] * 100}
 
 
 @register_evaluator("VISUAL-QUALITY-EVAL")

compressai_vision/run/eval_split_inference.py

@@ -267,7 +267,9 @@ def main(conf: DictConfig):
                 "avg_bpp": avg_bpp,
                 "end_accuracy": performance,
                 **elap_times,
-                "inv_mse": None if mse is None else 1.0 / mse,
+                **(
+                    {"inv_mse": 0 if mse == 0 else 1.0 / mse} if mse is not None else {}
+                ),
             }
         )
         print(tabulate(result_df, headers="keys", tablefmt="psql"))
@@ -283,7 +285,9 @@ def main(conf: DictConfig):
                 "bitrate (kbps)": bitrate,
                 "end_accuracy": performance,
                 **elap_times,
-                "inv_mse": None if mse is None else 1.0 / mse,
+                **(
+                    {"inv_mse": 0 if mse == 0 else 1.0 / mse} if mse is not None else {}
+                ),
             }
         )
         print(tabulate(result_df, headers="keys", tablefmt="psql"))