[FIX][RELEASE1.0] Remove cfg dump in ckpt (#1895)

* Remove cfg dump in ckpt

Signed-off-by: Songki Choi <[email protected]>

* Fix pre-commit

Signed-off-by: Songki Choi <[email protected]>

---------

Signed-off-by: Songki Choi <[email protected]>

Author: Songki Choi

otx/algorithms/common/tasks/nncf_base.py

@@ -18,7 +18,6 @@
 import io
 import json
 import os
-from collections.abc import Mapping
 from copy import deepcopy
 from typing import Dict, List, Optional
 
@@ -338,30 +337,16 @@ def save_model(self, output_model: ModelEntity):
         hyperparams_str = ids_to_strings(cfg_helper.convert(self._hyperparams, dict, enum_to_str=True))
         labels = {label.name: label.color.rgb_tuple for label in self._labels}
 
-        config = deepcopy(self._recipe_cfg)
-        config.merge_from_dict(self._model_cfg)
-
-        def update(d, u):  # pylint: disable=invalid-name
-            for k, v in u.items():  # pylint: disable=invalid-name
-                if isinstance(v, Mapping):
-                    d[k] = update(d.get(k, {}), v)
-                else:
-                    d[k] = v
-            return d
-
-        modelinfo = torch.load(self._model_ckpt, map_location=torch.device("cpu"))
-        modelinfo = update(
-            dict(model=modelinfo),
-            {
-                "meta": {
-                    "nncf_enable_compression": True,
-                    "config": config,
-                },
-                "config": hyperparams_str,
-                "labels": labels,
-                "VERSION": 1,
+        model_ckpt = torch.load(self._model_ckpt, map_location=torch.device("cpu"))
+        modelinfo = {
+            "model": model_ckpt,
+            "config": hyperparams_str,
+            "labels": labels,
+            "VERSION": 1,
+            "meta": {
+                "nncf_enable_compression": True,
             },
-        )
+        }
         self._save_model_post_hook(modelinfo)
 
         torch.save(modelinfo, buffer)

otx/algorithms/detection/tasks/nncf.py

@@ -22,6 +22,9 @@
 from otx.algorithms.common.adapters.mmcv.utils import remove_from_config
 from otx.algorithms.common.tasks.nncf_base import NNCFBaseTask
 from otx.algorithms.detection.adapters.mmdet.nncf import build_nncf_detector
+from otx.algorithms.detection.adapters.mmdet.utils.config_utils import (
+    should_cluster_anchors,
+)
 from otx.api.entities.datasets import DatasetEntity
 from otx.api.entities.inference_parameters import InferenceParameters
 from otx.api.entities.model import ModelEntity
@@ -111,17 +114,8 @@ def _optimize_post_hook(
         output_model.performance = performance
 
     def _save_model_post_hook(self, modelinfo):
-        config = modelinfo["meta"]["config"]
-        if hasattr(config.model, "bbox_head") and hasattr(config.model.bbox_head, "anchor_generator"):
-            if getattr(
-                config.model.bbox_head.anchor_generator,
-                "reclustering_anchors",
-                False,
-            ):
-                generator = config.model.bbox_head.anchor_generator
-                modelinfo["anchors"] = {
-                    "heights": generator.heights,
-                    "widths": generator.widths,
-                }
+        if self._model_cfg is not None and should_cluster_anchors(self._model_cfg):
+            modelinfo["anchors"] = {}
+            self._update_anchors(modelinfo["anchors"], self._model_cfg.model.bbox_head.anchor_generator)
 
         modelinfo["confidence_threshold"] = self.confidence_threshold