Skip to content

Commit e1eea67

Browse files
authored
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
1 parent 28b9341 commit e1eea67

File tree

108 files changed

+1903
-1258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1903
-1258
lines changed

docs/source/guide/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Guide
3030

3131
reference/api/index
3232
reference/algorithm/index
33-
reference/core/data
33+
reference/core/index
3434
reference/hpo/hpo
3535
reference/mpa/index
3636

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Core
2+
====
3+
4+
.. toctree::
5+
:maxdepth: 1
6+
7+
data
8+
ov/index

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Graph
55
:maxdepth: 3
66
:caption: Contents:
77

8-
.. automodule:: otx.mpa.modules.ov.graph
8+
.. automodule:: otx.core.ov.graph
99
:members:
1010
:undoc-members:
1111

12-
.. automodule:: otx.mpa.modules.ov.graph.graph
12+
.. automodule:: otx.core.ov.graph.graph
1313
:members:
1414
:undoc-members:
1515

16-
.. automodule:: otx.mpa.modules.ov.graph.utils
16+
.. automodule:: otx.core.ov.graph.utils
1717
:members:
1818
:undoc-members:
1919

20-
.. automodule:: otx.mpa.modules.ov.graph.parsers
20+
.. automodule:: otx.core.ov.graph.parsers
2121
:members:
2222
:undoc-members:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ OpenVINO
88
models
99
ops
1010

11-
.. automodule:: otx.mpa.modules.ov
11+
.. automodule:: otx.core.ov
1212
:members:
1313
:undoc-members:
1414

15-
.. automodule:: otx.mpa.modules.ov.omz_wrapper
15+
.. automodule:: otx.core.ov.omz_wrapper
1616
:members:
1717
:undoc-members:
1818

19-
.. automodule:: otx.mpa.modules.ov.registry
19+
.. automodule:: otx.core.ov.registry
2020
:members:
2121
:undoc-members:
2222

23-
.. automodule:: otx.mpa.modules.ov.utils
23+
.. automodule:: otx.core.ov.utils
2424
:members:
2525
:undoc-members:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Models
55
:maxdepth: 3
66
:caption: Contents:
77

8-
.. automodule:: otx.mpa.modules.ov.models
8+
.. automodule:: otx.core.ov.models
99
:members:
1010
:undoc-members:
1111

12-
.. automodule:: otx.mpa.modules.ov.models.mmov_model
12+
.. automodule:: otx.core.ov.models.mmov_model
1313
:members:
1414
:undoc-members:
1515

16-
.. automodule:: otx.mpa.modules.ov.models.ov_model
16+
.. automodule:: otx.core.ov.models.ov_model
1717
:members:
1818
:undoc-members:
1919

20-
.. automodule:: otx.mpa.modules.ov.models.parser_mixin
20+
.. automodule:: otx.core.ov.models.parser_mixin
2121
:members:
2222
:undoc-members:
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
OPS
2+
^^^
3+
4+
.. toctree::
5+
:maxdepth: 3
6+
:caption: Contents:
7+
8+
.. automodule:: otx.core.ov.ops
9+
:members:
10+
:undoc-members:
11+
12+
.. automodule:: otx.core.ov.ops.activations
13+
:members:
14+
:undoc-members:
15+
16+
.. automodule:: otx.core.ov.ops.arithmetics
17+
:members:
18+
:undoc-members:
19+
20+
.. automodule:: otx.core.ov.ops.builder
21+
:members:
22+
:undoc-members:
23+
24+
.. automodule:: otx.core.ov.ops.convolutions
25+
:members:
26+
:undoc-members:
27+
28+
.. automodule:: otx.core.ov.ops.generation
29+
:members:
30+
:undoc-members:
31+
32+
.. automodule:: otx.core.ov.ops.image_processings
33+
:members:
34+
:undoc-members:
35+
36+
.. automodule:: otx.core.ov.ops.infrastructures
37+
:members:
38+
:undoc-members:
39+
40+
.. automodule:: otx.core.ov.ops.matmuls
41+
:members:
42+
:undoc-members:
43+
44+
.. automodule:: otx.core.ov.ops.movements
45+
:members:
46+
:undoc-members:
47+
48+
.. automodule:: otx.core.ov.ops.normalizations
49+
:members:
50+
:undoc-members:
51+
52+
.. automodule:: otx.core.ov.ops.object_detections
53+
:members:
54+
:undoc-members:
55+
56+
.. automodule:: otx.core.ov.ops.op
57+
:members:
58+
:undoc-members:
59+
60+
.. automodule:: otx.core.ov.ops.poolings
61+
:members:
62+
:undoc-members:
63+
64+
.. automodule:: otx.core.ov.ops.reductions
65+
:members:
66+
:undoc-members:
67+
68+
.. automodule:: otx.core.ov.ops.shape_manipulations
69+
:members:
70+
:undoc-members:
71+
72+
.. automodule:: otx.core.ov.ops.sorting_maximization
73+
:members:
74+
:undoc-members:
75+
76+
.. automodule:: otx.core.ov.ops.type_conversions
77+
:members:
78+
:undoc-members:
79+
80+
.. automodule:: otx.core.ov.ops.utils
81+
:members:
82+
:undoc-members:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ Modules
66

77
models/index
88
datasets
9-
ov/index
109
utils

docs/source/guide/reference/mpa/modules/ov/ops.rst

Lines changed: 0 additions & 82 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ Utils
2121
:members:
2222
:undoc-members:
2323

24-
.. automodule:: otx.mpa.utils.file
25-
:members:
26-
:undoc-members:
2724

2825
.. automodule:: otx.mpa.utils.mo_wrapper
2926
:members:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"""Module for the MMOVBackbone class."""
22

3-
from typing import Dict, List
3+
from typing import Dict, List, Union
44

55
from mmcls.models.builder import BACKBONES
66

7-
from otx.mpa.modules.ov.graph.parsers.cls.cls_base_parser import cls_base_parser
8-
from otx.mpa.modules.ov.models.mmov_model import MMOVModel
7+
from otx.core.ov.graph.parsers.cls import cls_base_parser
8+
from otx.core.ov.models.mmov_model import MMOVModel
99

1010

1111
@BACKBONES.register_module()
@@ -18,7 +18,7 @@ class MMOVBackbone(MMOVModel):
1818
"""
1919

2020
@staticmethod
21-
def parser(graph, **kwargs) -> Dict[str, List[str]]:
21+
def parser(graph, **kwargs) -> Dict[str, Union[List[str], Dict[str, List[str]]]]:
2222
"""Parses the input and output of the model.
2323
2424
Args:

0 commit comments

Comments
 (0)