diff --git a/.dev_scripts/covignore.cfg b/.dev_scripts/covignore.cfg index ead86f17..032cde34 100644 --- a/.dev_scripts/covignore.cfg +++ b/.dev_scripts/covignore.cfg @@ -46,3 +46,6 @@ mmocr/models/textdet/postprocessors/drrg_postprocessor.py # It will be removed after HmeanIc13Metric mmocr/evaluation/functional/hmean_ic13.py + +# It will be removed after KieVisualizer and TextSpotterVisualizer +mmocr/visualization/visualize.py diff --git a/mmocr/core/__init__.py b/mmocr/core/__init__.py deleted file mode 100644 index 64e8d662..00000000 --- a/mmocr/core/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) OpenMMLab. All rights reserved. -from .visualization import TextDetLocalVisualizer, TextRecogLocalVisualizer -from .visualize import (det_recog_show_result, imshow_edge, imshow_node, - imshow_pred_boundary, imshow_text_char_boundary, - imshow_text_label, overlay_mask_img, show_feature, - show_img_boundary, show_pred_gt) - -__all__ = [ - 'overlay_mask_img', 'show_feature', 'show_img_boundary', 'show_pred_gt', - 'imshow_pred_boundary', 'imshow_text_char_boundary', 'imshow_text_label', - 'imshow_node', 'det_recog_show_result', 'imshow_edge', - 'TextDetLocalVisualizer', 'TextRecogLocalVisualizer' -] diff --git a/mmocr/utils/ocr.py b/mmocr/utils/ocr.py index 6d16e601..ea266336 100755 --- a/mmocr/utils/ocr.py +++ b/mmocr/utils/ocr.py @@ -21,7 +21,6 @@ except ImportError: from mmocr.apis import init_detector from mmocr.apis.inference import model_inference -from mmocr.core.visualize import det_recog_show_result from mmocr.datasets import WildReceiptDataset from mmocr.models.textdet.detectors import TextDetectorMixin from mmocr.models.textrecog.recognizers import BaseRecognizer @@ -30,6 +29,7 @@ from mmocr.utils import is_type_list, stitch_boxes_into_lines from mmocr.utils.fileio import list_from_file from mmocr.utils.img_utils import crop_img from mmocr.utils.model import revert_sync_batchnorm +from mmocr.visualization.visualize import det_recog_show_result # Parse CLI arguments diff --git a/mmocr/utils/setup_env.py b/mmocr/utils/setup_env.py index a1397017..3f991d4a 100644 --- a/mmocr/utils/setup_env.py +++ b/mmocr/utils/setup_env.py @@ -16,13 +16,12 @@ def register_all_modules(init_default_scope: bool = True) -> None: to https://github.com/open-mmlab/mmengine/blob/main/docs/en/tutorials/registry.md Defaults to True. """ # noqa - import mmocr.core # noqa: F401,F403 import mmocr.data # noqa: F401,F403 import mmocr.datasets # noqa: F401,F403 import mmocr.engine # noqa: F401,F403 import mmocr.evaluation # noqa: F401,F403 import mmocr.models # noqa: F401,F403 - + import mmocr.visualization # noqa: F401,F403 if init_default_scope: never_created = DefaultScope.get_current_instance() is None \ or not DefaultScope.check_instance_created('mmocr') diff --git a/mmocr/core/visualization/__init__.py b/mmocr/visualization/__init__.py similarity index 100% rename from mmocr/core/visualization/__init__.py rename to mmocr/visualization/__init__.py diff --git a/mmocr/core/visualization/textdet_visualizer.py b/mmocr/visualization/textdet_visualizer.py similarity index 100% rename from mmocr/core/visualization/textdet_visualizer.py rename to mmocr/visualization/textdet_visualizer.py diff --git a/mmocr/core/visualization/textrecog_visualizer.py b/mmocr/visualization/textrecog_visualizer.py similarity index 100% rename from mmocr/core/visualization/textrecog_visualizer.py rename to mmocr/visualization/textrecog_visualizer.py diff --git a/mmocr/core/visualize.py b/mmocr/visualization/visualize.py similarity index 99% rename from mmocr/core/visualize.py rename to mmocr/visualization/visualize.py index 0fd8e421..8b451d9d 100644 --- a/mmocr/core/visualize.py +++ b/mmocr/visualization/visualize.py @@ -15,6 +15,7 @@ from PIL import Image, ImageDraw, ImageFont import mmocr.utils as utils +# TODO remove after KieVisualizer and TextSpotterVisualizer def overlay_mask_img(img, mask): """Draw mask boundaries on image for visualization. diff --git a/old_tests/test_utils/test_mask/test_mask_utils.py b/old_tests/test_utils/test_mask/test_mask_utils.py index 84a90f59..f2a3262c 100644 --- a/old_tests/test_utils/test_mask/test_mask_utils.py +++ b/old_tests/test_utils/test_mask/test_mask_utils.py @@ -8,7 +8,7 @@ import pytest import mmocr.core.evaluation.utils as eval_utils import mmocr.core.mask as mask_utils -import mmocr.core.visualize as visualize_utils +import mmocr.visualization.visualize as visualize_utils def test_seg2boundary(): diff --git a/old_tests/test_utils/test_text/test_text_utils.py b/old_tests/test_utils/test_text/test_text_utils.py index aa3b2d24..5a775522 100644 --- a/old_tests/test_utils/test_text/test_text_utils.py +++ b/old_tests/test_utils/test_text/test_text_utils.py @@ -8,7 +8,7 @@ from unittest import mock import numpy as np import pytest -import mmocr.core.visualize as visualize_utils +import mmocr.visualization.visualize as visualize_utils def test_tile_image(): diff --git a/tests/test_core/test_visualization/test_textdet_visualizer.py b/tests/test_visualization/test_textdet_visualizer.py similarity index 98% rename from tests/test_core/test_visualization/test_textdet_visualizer.py rename to tests/test_visualization/test_textdet_visualizer.py index eccd34ae..daa16c22 100644 --- a/tests/test_core/test_visualization/test_textdet_visualizer.py +++ b/tests/test_visualization/test_textdet_visualizer.py @@ -8,9 +8,9 @@ import numpy as np import torch from mmengine.data import InstanceData -from mmocr.core.visualization import TextDetLocalVisualizer from mmocr.data import TextDetDataSample from mmocr.utils import bbox2poly +from mmocr.visualization import TextDetLocalVisualizer class TestTextDetLocalVisualizer(unittest.TestCase): diff --git a/tests/test_core/test_visualization/test_textrecog_visualizer.py b/tests/test_visualization/test_textrecog_visualizer.py similarity index 97% rename from tests/test_core/test_visualization/test_textrecog_visualizer.py rename to tests/test_visualization/test_textrecog_visualizer.py index 82301476..e000bc30 100644 --- a/tests/test_core/test_visualization/test_textrecog_visualizer.py +++ b/tests/test_visualization/test_textrecog_visualizer.py @@ -7,8 +7,8 @@ import cv2 import numpy as np from mmengine.data import LabelData -from mmocr.core.visualization import TextRecogLocalVisualizer from mmocr.data import TextRecogDataSample +from mmocr.visualization import TextRecogLocalVisualizer class TestTextDetLocalVisualizer(unittest.TestCase):