[Content] refactor vis content

.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

mmocr/core/__init__.py

@@ -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'
-]

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

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')

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.
 

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():

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():

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):

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):