Move otx.mpa.modules.ov -> otx.core.ov (#1929)

* First Refactoring

* Refactor mpa.modules.ov -> otx.core.ov

* Remove otx.mpa.modules.ov

* Fix docs & unit test paths

* Fix some import

* Add TODO comments

docs/source/guide/index.rst

@@ -30,7 +30,7 @@ Guide
 
   reference/api/index
   reference/algorithm/index
-  reference/core/data
+  reference/core/index
   reference/hpo/hpo
   reference/mpa/index
 

docs/source/guide/reference/core/index.rst

@@ -0,0 +1,8 @@
+Core
+====
+
+.. toctree::
+   :maxdepth: 1
+
+   data
+   ov/index

docs/source/guide/reference/mpa/modules/ov/graph.rst → docs/source/guide/reference/core/ov/graph.rst

@@ -5,18 +5,18 @@ Graph
    :maxdepth: 3
    :caption: Contents:
 
-.. automodule:: otx.mpa.modules.ov.graph
+.. automodule:: otx.core.ov.graph
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.graph.graph
+.. automodule:: otx.core.ov.graph.graph
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.graph.utils
+.. automodule:: otx.core.ov.graph.utils
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.graph.parsers
+.. automodule:: otx.core.ov.graph.parsers
    :members:
    :undoc-members:

docs/source/guide/reference/mpa/modules/ov/index.rst → docs/source/guide/reference/core/ov/index.rst

@@ -8,18 +8,18 @@ OpenVINO
    models
    ops
 
-.. automodule:: otx.mpa.modules.ov
+.. automodule:: otx.core.ov
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.omz_wrapper
+.. automodule:: otx.core.ov.omz_wrapper
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.registry
+.. automodule:: otx.core.ov.registry
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.utils
+.. automodule:: otx.core.ov.utils
    :members:
    :undoc-members:

docs/source/guide/reference/mpa/modules/ov/models.rst → docs/source/guide/reference/core/ov/models.rst

@@ -5,18 +5,18 @@ Models
    :maxdepth: 3
    :caption: Contents:
 
-.. automodule:: otx.mpa.modules.ov.models
+.. automodule:: otx.core.ov.models
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.models.mmov_model
+.. automodule:: otx.core.ov.models.mmov_model
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.models.ov_model
+.. automodule:: otx.core.ov.models.ov_model
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.modules.ov.models.parser_mixin
+.. automodule:: otx.core.ov.models.parser_mixin
    :members:
    :undoc-members:

docs/source/guide/reference/core/ov/ops.rst

@@ -0,0 +1,82 @@
+OPS
+^^^
+
+.. toctree::
+   :maxdepth: 3
+   :caption: Contents:
+
+.. automodule:: otx.core.ov.ops
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.activations
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.arithmetics
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.builder
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.convolutions
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.generation
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.image_processings
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.infrastructures
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.matmuls
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.movements
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.normalizations
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.object_detections
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.op
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.poolings
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.reductions
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.shape_manipulations
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.sorting_maximization
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.type_conversions
+   :members:
+   :undoc-members:
+
+.. automodule:: otx.core.ov.ops.utils
+   :members:
+   :undoc-members:

docs/source/guide/reference/mpa/modules/index.rst

@@ -6,5 +6,4 @@ Modules
 
    models/index
    datasets
-   ov/index
    utils

docs/source/guide/reference/mpa/utils.rst

@@ -21,9 +21,6 @@ Utils
    :members:
    :undoc-members:
 
-.. automodule:: otx.mpa.utils.file
-   :members:
-   :undoc-members:
 
 .. automodule:: otx.mpa.utils.mo_wrapper
    :members:

otx/algorithms/classification/adapters/mmcls/models/backbones/mmov_backbone.py

@@ -1,11 +1,11 @@
 """Module for the MMOVBackbone class."""
 
-from typing import Dict, List
+from typing import Dict, List, Union
 
 from mmcls.models.builder import BACKBONES
 
-from otx.mpa.modules.ov.graph.parsers.cls.cls_base_parser import cls_base_parser
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.graph.parsers.cls import cls_base_parser
+from otx.core.ov.models.mmov_model import MMOVModel
 
 
 @BACKBONES.register_module()
@@ -18,7 +18,7 @@ class MMOVBackbone(MMOVModel):
     """
 
     @staticmethod
-    def parser(graph, **kwargs) -> Dict[str, List[str]]:
+    def parser(graph, **kwargs) -> Dict[str, Union[List[str], Dict[str, List[str]]]]:
         """Parses the input and output of the model.
 
         Args:

otx/algorithms/classification/adapters/mmcls/models/heads/mmov_cls_head.py

@@ -10,8 +10,8 @@
 from mmcls.models.builder import HEADS
 from mmcls.models.heads import ClsHead
 
-from otx.mpa.modules.ov.graph.parsers.cls.cls_base_parser import cls_base_parser
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.graph.parsers.cls import cls_base_parser
+from otx.core.ov.models.mmov_model import MMOVModel
 
 
 @HEADS.register_module()

otx/algorithms/classification/adapters/mmcls/models/necks/mmov_neck.py

@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from typing import Dict, List
+from typing import Dict, List, Union
 
 from mmcls.models.builder import NECKS
 
-from otx.mpa.modules.ov.graph.parsers.cls.cls_base_parser import cls_base_parser
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.graph.parsers.cls import cls_base_parser
+from otx.core.ov.models.mmov_model import MMOVModel
 
 
 @NECKS.register_module()
@@ -19,7 +19,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     @staticmethod
-    def parser(graph, **kwargs) -> Dict[str, List[str]]:
+    def parser(graph, **kwargs) -> Dict[str, Union[List[str], Dict[str, List[str]]]]:
         """Parser function returns base_parser for given graph."""
         output = cls_base_parser(graph, "neck")
         if output is None:

otx/algorithms/detection/adapters/mmdet/models/backbones/mmov_backbone.py

@@ -5,7 +5,7 @@
 
 from mmdet.models.builder import BACKBONES
 
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.models.mmov_model import MMOVModel
 
 
 @BACKBONES.register_module()

otx/algorithms/detection/adapters/mmdet/models/dense_heads/mmov_rpn_head.py

@@ -12,7 +12,7 @@
 from mmdet.models.dense_heads.rpn_head import RPNHead
 
 from otx.algorithms.common.utils.logger import get_logger
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.models.mmov_model import MMOVModel
 
 logger = get_logger()
 

otx/algorithms/detection/adapters/mmdet/models/dense_heads/mmov_ssd_head.py

@@ -12,7 +12,7 @@
 from mmdet.models.builder import HEADS
 from mmdet.models.dense_heads.ssd_head import SSDHead
 
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.models.mmov_model import MMOVModel
 
 # TODO: Need to fix pylint issues
 # pylint: disable=redefined-argument-from-local, too-many-instance-attributes

otx/algorithms/detection/adapters/mmdet/models/dense_heads/mmov_yolov3_head.py

@@ -11,7 +11,7 @@
 from mmdet.models.builder import HEADS
 from mmdet.models.dense_heads.yolo_head import YOLOV3Head
 
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.models.mmov_model import MMOVModel
 
 # TODO: Need to fix pylint issues
 # pylint: disable=too-many-instance-attributes, keyword-arg-before-vararg

otx/algorithms/detection/adapters/mmdet/models/necks/mmov_fpn.py

@@ -10,7 +10,7 @@
 from mmdet.models.necks.fpn import FPN
 from torch import nn
 
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.models.mmov_model import MMOVModel
 
 # TODO: Need to fix pylint issues
 # pylint: disable=keyword-arg-before-vararg, too-many-locals

otx/algorithms/detection/adapters/mmdet/models/necks/mmov_ssd_neck.py

@@ -12,7 +12,7 @@
 from mmdet.models.builder import NECKS
 from torch import nn
 
-from otx.mpa.modules.ov.models.mmov_model import MMOVModel
+from otx.core.ov.models.mmov_model import MMOVModel
 
 # pylint: disable=too-many-arguments, too-many-locals