Rename TextRecog directories

.dev_scripts/covignore.cfg

@@ -3,17 +3,17 @@
 # For example:
 # mmocr/models/textdet/postprocess/utils.py
 # .*/utils.py
-mmocr/models/textrecog/recognizer/base.py
+mmocr/models/textrecog/recognizers/base.py
 .*/__init__.py
 # It will be removed after all transforms have been refactored into processing.py
 mmocr/datasets/pipelines/transforms.py
 mmocr/datasets/pipelines/dbnet_transforms.py
 
 # will be deleted
-mmocr/models/textdet/dense_heads/head_mixin.py
+mmocr/models/textdet/heads/head_mixin.py
 
 # Will be covered by det head tests
-mmocr/models/textdet/dense_heads/base_textdet_head.py
+mmocr/models/textdet/heads/base_textdet_head.py
 
 # They will be removed later all det models have been refactored
 mmocr/models/common/detectors/single_stage.py

mmocr/core/deployment/deploy_utils.py

@@ -10,7 +10,7 @@ from mmocr.models.textdet.detectors.single_stage_text_detector import \
     SingleStageTextDetector
 from mmocr.models.textdet.detectors.text_detector_mixin import \
     TextDetectorMixin
-from mmocr.models.textrecog.recognizer.encode_decode_recognizer import \
+from mmocr.models.textrecog.recognizers.encode_decode_recognizer import \
     EncodeDecodeRecognizer
 from mmocr.registry import MODELS
 

mmocr/models/ner/classifiers/ner_classifier.py

@@ -1,5 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmocr.models.textrecog.recognizer.base import BaseRecognizer
+from mmocr.models.textrecog.recognizers.base import BaseRecognizer
 from mmocr.registry import MODELS
 
 

mmocr/models/textrecog/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from . import (backbones, convertors, decoders, dictionary, encoders, fusers,
-               heads, losses, necks, plugins, postprocessor, preprocessor,
-               recognizer)
+               heads, losses, necks, plugins, postprocessors, preprocessors,
+               recognizers)
 from .backbones import *  # NOQA
 from .convertors import *  # NOQA
 from .decoders import *  # NOQA
@@ -12,12 +12,12 @@ from .heads import *  # NOQA
 from .losses import *  # NOQA
 from .necks import *  # NOQA
 from .plugins import *  # NOQA
-from .postprocessor import *  # NOQA
-from .preprocessor import *  # NOQA
-from .recognizer import *  # NOQA
+from .postprocessors import *  # NOQA
+from .preprocessors import *  # NOQA
+from .recognizers import *  # NOQA
 
 __all__ = (
     backbones.__all__ + convertors.__all__ + decoders.__all__ +
     encoders.__all__ + heads.__all__ + losses.__all__ + necks.__all__ +
-    preprocessor.__all__ + recognizer.__all__ + fusers.__all__ +
-    plugins.__all__ + dictionary.__all__ + postprocessor.__all__)
+    preprocessors.__all__ + recognizers.__all__ + fusers.__all__ +
+    plugins.__all__ + dictionary.__all__ + postprocessors.__all__)

mmocr/utils/ocr.py

@@ -25,7 +25,7 @@ from mmocr.core.visualize import det_recog_show_result
 from mmocr.datasets.kie_dataset import KIEDataset
 from mmocr.datasets.pipelines.crop import crop_img
 from mmocr.models.textdet.detectors import TextDetectorMixin
-from mmocr.models.textrecog.recognizer import BaseRecognizer
+from mmocr.models.textrecog.recognizers import BaseRecognizer
 from mmocr.registry import MODELS
 from mmocr.utils import is_type_list
 from mmocr.utils.box_util import stitch_boxes_into_lines

old_tests/test_models/test_ocr_preprocessor.py

@@ -2,8 +2,8 @@
 import pytest
 import torch
 
-from mmocr.models.textrecog.preprocessor import (BasePreprocessor,
-                                                 TPSPreprocessor)
+from mmocr.models.textrecog.preprocessors import (BasePreprocessor,
+                                                  TPSPreprocessor)
 
 
 def test_tps_preprocessor():

old_tests/test_models/test_recognizer.py

@@ -8,8 +8,8 @@ import pytest
 import torch
 from mmdet.core import BitmapMasks
 
-from mmocr.models.textrecog.recognizer import (EncodeDecodeRecognizer,
-                                               SegRecognizer)
+from mmocr.models.textrecog.recognizers import (EncodeDecodeRecognizer,
+                                                SegRecognizer)
 
 
 def _create_dummy_dict_file(dict_file):

tests/test_models/test_textrecog/test_postprocessor/test_attn_postprocessor.py

@@ -9,7 +9,7 @@ from mmengine.data import LabelData
 
 from mmocr.core.data_structures import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
-from mmocr.models.textrecog.postprocessor.attn_postprocessor import \
+from mmocr.models.textrecog.postprocessors.attn_postprocessor import \
     AttentionPostprocessor
 
 

tests/test_models/test_textrecog/test_postprocessor/test_base_textrecog_postprocessor.py

@@ -8,8 +8,7 @@ from mmengine.data import LabelData
 
 from mmocr.core.data_structures import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
-from mmocr.models.textrecog.postprocessor.base_textrecog_postprocessor import \
-    BaseTextRecogPostprocessor
+from mmocr.models.textrecog.postprocessors import BaseTextRecogPostprocessor
 
 
 class TestBaseTextRecogPostprocessor(TestCase):

tests/test_models/test_textrecog/test_postprocessor/test_ctc_postprocessor.py

@@ -9,7 +9,7 @@ from mmengine.data import LabelData
 
 from mmocr.core.data_structures import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
-from mmocr.models.textrecog.postprocessor.ctc_postprocessor import \
+from mmocr.models.textrecog.postprocessors.ctc_postprocessor import \
     CTCPostProcessor