Skip to content

Commit 462988b

Browse files
authored
[ENHANCE] Move detection-related modules from mpa to adapter (#1894)
* Fix initial mpa modules * Revert reclustering_anchors * Reflect review comments
1 parent 376ee8e commit 462988b

File tree

102 files changed

+964
-703
lines changed

Some content is hidden

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

102 files changed

+964
-703
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ Datasets
1313
:members:
1414
:undoc-members:
1515

16-
.. automodule:: otx.mpa.modules.datasets.task_adapt_dataset
17-
:members:
18-
:undoc-members:
1916

2017
.. automodule:: otx.mpa.modules.datasets.pipelines
2118
:members:

docs/source/guide/reference/mpa/modules/models/backbones.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ Backbones
99
:members:
1010
:undoc-members:
1111

12-
.. automodule:: otx.mpa.modules.models.backbones.imgclsmob
13-
:members:
14-
:undoc-members:
15-
1612
.. automodule:: otx.mpa.modules.models.backbones.litehrnet
1713
:members:
1814
:undoc-members:

docs/source/guide/reference/mpa/modules/models/detectors.rst

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

docs/source/guide/reference/mpa/modules/models/heads.rst

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ Heads
1313
:members:
1414
:undoc-members:
1515

16-
.. automodule:: otx.mpa.modules.models.heads.cross_dataset_detector_head
17-
:members:
18-
:undoc-members:
19-
20-
.. automodule:: otx.mpa.modules.models.heads.custom_anchor_generator
21-
:members:
22-
:undoc-members:
23-
24-
.. automodule:: otx.mpa.modules.models.heads.custom_atss_head
25-
:members:
26-
:undoc-members:
2716

2817
.. automodule:: otx.mpa.modules.models.heads.custom_cls_head
2918
:members:
@@ -49,26 +38,6 @@ Heads
4938
:members:
5039
:undoc-members:
5140

52-
.. automodule:: otx.mpa.modules.models.heads.custom_retina_head
53-
:members:
54-
:undoc-members:
55-
56-
.. automodule:: otx.mpa.modules.models.heads.custom_roi_head
57-
:members:
58-
:undoc-members:
59-
60-
.. automodule:: otx.mpa.modules.models.heads.custom_ssd_head
61-
:members:
62-
:undoc-members:
63-
64-
.. automodule:: otx.mpa.modules.models.heads.custom_vfnet_head
65-
:members:
66-
:undoc-members:
67-
68-
.. automodule:: otx.mpa.modules.models.heads.custom_yolox_head
69-
:members:
70-
:undoc-members:
71-
7241
.. automodule:: otx.mpa.modules.models.heads.mix_loss_mixin
7342
:members:
7443
:undoc-members:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Models
66

77
backbones
88
classifiers
9-
detectors
109
heads
1110
losses
1211
scalar_schedulers

docs/source/guide/reference/mpa/modules/models/losses.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,10 @@ Losses
3737
:members:
3838
:undoc-members:
3939

40-
.. automodule:: otx.mpa.modules.models.losses.cross_focal_loss
41-
:members:
42-
:undoc-members:
43-
4440
.. automodule:: otx.mpa.modules.models.losses.ib_loss
4541
:members:
4642
:undoc-members:
4743

48-
.. automodule:: otx.mpa.modules.models.losses.l2sp_loss
49-
:members:
50-
:undoc-members:
5144

5245
.. automodule:: otx.mpa.modules.models.losses.mpa_pixel_base
5346
:members:

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ Models
2525
:members:
2626
:undoc-members:
2727

28-
.. automodule:: otx.mpa.modules.ov.models.mmdet
29-
:members:
30-
:undoc-members:
31-
3228
.. automodule:: otx.mpa.modules.ov.models.mmseg
3329
:members:
3430
:undoc-members:

otx/algorithms/detection/adapters/mmdet/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: Apache-2.0
55

66

7-
from .data import OTXDetDataset
7+
from .datasets.dataset import OTXDetDataset
88

99
# fmt: off
1010
# isort: off

otx/algorithms/detection/adapters/mmdet/data/__init__.py renamed to otx/algorithms/detection/adapters/mmdet/datasets/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
# See the License for the specific language governing permissions
1515
# and limitations under the License.
1616

17+
from . import pipelines
1718
from .dataset import ImageTilingDataset, OTXDetDataset
18-
from .pipelines import LoadAnnotationFromOTXDataset, LoadImageFromOTXDataset
19+
from .task_adapt_dataset import TaskAdaptEvalDataset
1920

20-
__all__ = ["OTXDetDataset", "LoadAnnotationFromOTXDataset", "LoadImageFromOTXDataset", "ImageTilingDataset"]
21+
__all__ = ["OTXDetDataset", "pipelines", "ImageTilingDataset", "TaskAdaptEvalDataset"]

0 commit comments

Comments
 (0)