fix xai test and remove InstanceData

openvinotoolkit · May 10, 2024 · 1826882 · 1826882
1 parent 0fc7de9
commit 1826882
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/src/otx/algo/detection/heads/dynamic_soft_label_assigner.py b/src/otx/algo/detection/heads/dynamic_soft_label_assigner.py
@@ -21,7 +21,7 @@
 GPU_MEM_LIMIT = 1024**3  # 1 GB memory limit
 
 if TYPE_CHECKING:
-    from mmengine.structures import InstanceData
+    from otx.algo.utils.mmengine_utils import InstanceData
 
 
 def center_of_mass(masks: Tensor, eps: float = 1e-7) -> Tensor:
@@ -113,13 +113,13 @@ def assign(
         Returns:
             obj:`AssignResult`: The assigned result.
         """
-        gt_bboxes = gt_instances.bboxes
-        gt_labels = gt_instances.labels
+        gt_bboxes = gt_instances.bboxes  # type: ignore[attr-defined]
+        gt_labels = gt_instances.labels  # type: ignore[attr-defined]
         num_gt = gt_bboxes.size(0)
 
-        decoded_bboxes = pred_instances.bboxes
-        pred_scores = pred_instances.scores
-        priors = pred_instances.priors
+        decoded_bboxes = pred_instances.bboxes  # type: ignore[attr-defined]
+        pred_scores = pred_instances.scores  # type: ignore[attr-defined]
+        priors = pred_instances.priors  # type: ignore[attr-defined]
         num_bboxes = decoded_bboxes.size(0)
 
         # assign 0 by default

diff --git a/src/otx/algo/instance_segmentation/mmdet/models/dense_heads/rtmdet_ins_head.py b/src/otx/algo/instance_segmentation/mmdet/models/dense_heads/rtmdet_ins_head.py
@@ -12,7 +12,6 @@
 import torch
 import torch.nn.functional
 from datumaro import Polygon
-from mmengine.structures import InstanceData
 from torch import Tensor, nn
 
 from otx.algo.detection.ops.nms import batched_nms, multiclass_nms
@@ -30,6 +29,7 @@
 from otx.algo.modules.base_module import BaseModule
 from otx.algo.modules.conv_module import ConvModule
 from otx.algo.modules.norm import is_norm
+from otx.algo.utils.mmengine_utils import InstanceData
 from otx.algo.utils.weight_init import bias_init_with_prob, constant_init, normal_init
 from otx.core.data.entity.instance_segmentation import InstanceSegBatchDataEntity
 from otx.core.utils.mask_util import polygon_to_bitmap

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -6,7 +6,7 @@
 import torch
 from datumaro import Polygon
 from mmdet.structures import DetDataSample
-from mmengine.structures import InstanceData
+from otx.algo.utils.mmengine_utils import InstanceData
 from otx.core.data.entity.base import ImageInfo
 from otx.core.data.entity.classification import (
     HlabelClsBatchDataEntity,

diff --git a/tests/integration/api/test_xai.py b/tests/integration/api/test_xai.py
@@ -47,11 +47,6 @@ def test_forward_explain(
     if "dino" in model_name:
         pytest.skip("DINO is not supported.")
 
-    # TODO(someone): fix xai for RTMDet
-    # https://github.com/openvinotoolkit/training_extensions/pull/3433
-    if "rtmdet_inst_tiny" in model_name:
-        pytest.skip("DINO is not supported.")
-
     engine = Engine.from_config(
         config_path=recipe,
         data_root=fxt_target_dataset_per_task[task],

diff --git a/tests/unit/algo/detection/heads/test_sim_ota_assigner.py b/tests/unit/algo/detection/heads/test_sim_ota_assigner.py
@@ -7,8 +7,8 @@
 """
 
 import torch
-from mmengine.structures import InstanceData  # TODO (sungchul): remove
 from otx.algo.detection.heads.sim_ota_assigner import SimOTAAssigner
+from otx.algo.utils.mmengine_utils import InstanceData
 
 
 class TestSimOTAAssigner:

diff --git a/tests/unit/algo/detection/heads/test_yolox_head.py b/tests/unit/algo/detection/heads/test_yolox_head.py
@@ -8,10 +8,10 @@
 
 import torch
 from mmengine.config import Config
-from mmengine.structures import InstanceData
 from otx.algo.detection.heads.yolox_head import YOLOXHead
 from otx.algo.modules.conv_module import ConvModule
-from otx.algo.modules.depthwise_separable_conv_module import DepthwiseSeparableConvModule  # TODO (sungchul): remove
+from otx.algo.modules.depthwise_separable_conv_module import DepthwiseSeparableConvModule
+from otx.algo.utils.mmengine_utils import InstanceData
 
 
 class TestYOLOXHead: