[Content] data_structure content

.gitignore

@@ -107,7 +107,7 @@ venv.bak/
 
 # cython generated cpp
 !data/dict
-data
+/data
 .vscode
 .idea
 

mmocr/core/__init__.py

@@ -1,5 +1,4 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from .data_structures import *  # NOQA
 from .visualization import TextDetLocalVisualizer, TextRecogLocalVisualizer
 from .visualize import (det_recog_show_result, imshow_edge, imshow_node,
                         imshow_pred_boundary, imshow_text_char_boundary,

mmocr/core/visualization/textdet_visualizer.py

@@ -5,7 +5,7 @@ import mmcv
 import numpy as np
 from mmengine import Visualizer
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import VISUALIZERS
 
 

mmocr/core/visualization/textrecog_visualizer.py

@@ -6,7 +6,7 @@ import mmcv
 import numpy as np
 from mmengine import Visualizer
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.registry import VISUALIZERS
 
 

mmocr/data/kie_data_sample.py

@@ -15,7 +15,7 @@ class KIEDataSample(BaseDataElement):
          >>> import torch
          >>> import numpy as np
          >>> from mmengine.data import InstanceData
-         >>> from mmocr.core import KIEDataSample
+         >>> from mmocr.data import KIEDataSample
          >>> # gt_instances
          >>> data_sample = KIEDataSample()
          >>> img_meta = dict(img_shape=(800, 1196, 3),

mmocr/data/textdet_data_sample.py

@@ -15,7 +15,7 @@ class TextDetDataSample(BaseDataElement):
          >>> import torch
          >>> import numpy as np
          >>> from mmengine.data import InstanceData
-         >>> from mmocr.core import TextDetDataSample
+         >>> from mmocr.data import TextDetDataSample
          >>> # gt_instances
          >>> data_sample = TextDetDataSample()
          >>> img_meta = dict(img_shape=(800, 1196, 3),

mmocr/data/textrecog_data_element.py

@@ -15,7 +15,7 @@ class TextRecogDataSample(BaseDataElement):
          >>> import torch
          >>> import numpy as np
          >>> from mmengine.data import LabelData
-         >>> from mmocr.core import TextRecogDataSample
+         >>> from mmocr.data import TextRecogDataSample
          >>> # gt_text
          >>> data_sample = TextRecogDataSample()
          >>> img_meta = dict(img_shape=(800, 1196, 3),

mmocr/datasets/pipelines/formatting.py

@@ -5,7 +5,7 @@ from mmcv.transforms import to_tensor
 from mmcv.transforms.base import BaseTransform
 from mmengine.data import InstanceData, LabelData
 
-from mmocr.core import KIEDataSample, TextDetDataSample, TextRecogDataSample
+from mmocr.data import KIEDataSample, TextDetDataSample, TextRecogDataSample
 from mmocr.registry import TRANSFORMS
 
 

mmocr/models/kie/extractors/sdmgr.py

@@ -7,7 +7,7 @@ from mmdet.core import bbox2roi
 from mmengine.model import BaseModel
 from torch import nn
 
-from mmocr.core import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.registry import MODELS, TASK_UTILS
 
 

mmocr/models/kie/heads/sdmgr_head.py

@@ -6,7 +6,7 @@ from mmcv.runner import BaseModule
 from torch import Tensor, nn
 from torch.nn import functional as F
 
-from mmocr.core.data_structures.kie_data_sample import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS, TASK_UTILS
 

mmocr/models/kie/module_losses/sdmgr_module_loss.py

@@ -5,7 +5,7 @@ import torch
 from mmdet.models.losses import accuracy
 from torch import Tensor, nn
 
-from mmocr.core.data_structures.kie_data_sample import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.registry import MODELS
 
 

mmocr/models/kie/postprocessors/sdmgr_postprocessor.py

@@ -6,7 +6,7 @@ import torch
 from mmengine import InstanceData
 from torch import Tensor, nn
 
-from mmocr.core import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.registry import MODELS
 
 

mmocr/models/textdet/detectors/single_stage_text_detector.py

@@ -4,7 +4,7 @@ from typing import Dict, Optional, Sequence
 import torch
 from mmdet.models.detectors.base import BaseDetector as MMDET_BaseDetector
 
-from mmocr.core.data_structures import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 
 

mmocr/models/textdet/heads/base_textdet_head.py

@@ -5,7 +5,7 @@ import torch
 from mmcv.runner import BaseModule
 from torch import Tensor
 
-from mmocr.core.data_structures import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 
 SampleList = List[TextDetDataSample]

mmocr/models/textdet/heads/db_head.py

@@ -5,7 +5,7 @@ import torch
 import torch.nn as nn
 from mmcv.runner import Sequential
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.heads import BaseTextDetHead
 from mmocr.registry import MODELS
 

mmocr/models/textdet/heads/drrg_head.py

@@ -13,7 +13,7 @@ from numpy import ndarray
 from torch import Tensor
 from torch.nn import init
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.heads import BaseTextDetHead
 from mmocr.registry import MODELS
 from mmocr.utils.postprocessor_utils import fill_hole

mmocr/models/textdet/heads/fce_head.py

@@ -5,7 +5,7 @@ import torch
 import torch.nn as nn
 from mmdet.core import multi_apply
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.heads import BaseTextDetHead
 from mmocr.registry import MODELS
 

mmocr/models/textdet/heads/pan_head.py

@@ -4,7 +4,7 @@ from typing import List, Optional
 import torch
 import torch.nn as nn
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from mmocr.utils import check_argument
 from .base_textdet_head import BaseTextDetHead

mmocr/models/textdet/heads/textsnake_head.py

@@ -4,7 +4,7 @@ from typing import Dict, List, Optional, Union
 import torch
 import torch.nn as nn
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.heads import BaseTextDetHead
 from mmocr.registry import MODELS
 

mmocr/models/textdet/losses/db_loss.py

@@ -9,7 +9,7 @@ from numpy.typing import ArrayLike
 from shapely.geometry import Polygon
 from torch import nn
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from mmocr.utils import offset_polygon
 from .text_kernel_mixin import TextKernelMixin

mmocr/models/textdet/losses/drrg_loss.py

@@ -11,7 +11,7 @@ from numpy import ndarray
 from numpy.linalg import norm
 from torch import Tensor
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from mmocr.utils import check_argument
 from .textsnake_loss import TextSnakeLoss

mmocr/models/textdet/losses/fce_loss.py

@@ -9,7 +9,7 @@ from numpy.fft import fft
 from numpy.linalg import norm
 from numpy.typing import ArrayLike
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from .textsnake_loss import TextSnakeLoss
 

mmocr/models/textdet/losses/pan_loss.py

@@ -8,7 +8,7 @@ import torch.nn.functional as F
 from mmdet.core import multi_apply
 from torch import nn
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from .text_kernel_mixin import TextKernelMixin
 

mmocr/models/textdet/losses/pse_loss.py

@@ -4,7 +4,7 @@ from typing import Dict, Sequence, Tuple, Union
 import torch
 import torch.nn.functional as F
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from . import PANLoss
 

mmocr/models/textdet/losses/textsnake_loss.py

@@ -10,7 +10,7 @@ from numpy import ndarray
 from numpy.linalg import norm
 from torch import Tensor, nn
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from .text_kernel_mixin import TextKernelMixin
 

mmocr/models/textdet/postprocessors/base_postprocessor.py

@@ -4,7 +4,7 @@ from typing import Dict, List, Optional, Sequence, Tuple
 
 import numpy as np
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.utils import boundary_iou, is_type_list, rescale_polygons
 
 

mmocr/models/textdet/postprocessors/db_postprocessor.py

@@ -7,7 +7,7 @@ import torch
 from mmengine import InstanceData
 from shapely.geometry import Polygon
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from mmocr.utils import offset_polygon
 from .base_postprocessor import BaseTextDetPostProcessor

mmocr/models/textdet/postprocessors/drrg_postprocessor.py

@@ -9,7 +9,7 @@ import torch
 from mmengine import InstanceData
 from numpy import ndarray
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from .base_postprocessor import BaseTextDetPostProcessor
 

mmocr/models/textdet/postprocessors/fce_postprocessor.py

@@ -7,7 +7,7 @@ import torch
 from mmengine import InstanceData
 from numpy.fft import ifft
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from mmocr.utils import fill_hole
 from .base_postprocessor import BaseTextDetPostProcessor

mmocr/models/textdet/postprocessors/pan_postprocessor.py

@@ -7,7 +7,7 @@ import torch
 from mmcv.ops import pixel_group
 from mmengine.data import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from .base_postprocessor import BaseTextDetPostProcessor
 

mmocr/models/textdet/postprocessors/pse_postprocessor.py

@@ -8,7 +8,7 @@ import torch
 from mmcv.ops import contour_expand
 from mmengine.data import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from .pan_postprocessor import PANPostprocessor
 

mmocr/models/textdet/postprocessors/textsnake_postprocessor.py

@@ -9,7 +9,7 @@ from mmengine.data import InstanceData
 from numpy.linalg import norm
 from skimage.morphology import skeletonize
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.registry import MODELS
 from mmocr.utils import fill_hole
 from .base_postprocessor import BaseTextDetPostProcessor

mmocr/models/textrecog/decoders/abi_fuser.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Sequence, Union
 import torch
 import torch.nn as nn
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS
 from .base_decoder import BaseDecoder

mmocr/models/textrecog/decoders/abi_language_decoder.py

@@ -7,7 +7,7 @@ import torch.nn as nn
 from mmcv.cnn.bricks.transformer import BaseTransformerLayer
 from mmcv.runner import ModuleList
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.common.modules import PositionalEncoding
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS

mmocr/models/textrecog/decoders/abi_vision_decoder.py

@@ -5,7 +5,7 @@ import torch
 import torch.nn as nn
 from mmcv.cnn import ConvModule
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.common.modules import PositionalEncoding
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS

mmocr/models/textrecog/decoders/base_decoder.py

@@ -4,7 +4,7 @@ from typing import Dict, List, Optional, Sequence, Union
 import torch
 from mmcv.runner import BaseModule
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS, TASK_UTILS
 

mmocr/models/textrecog/decoders/crnn_decoder.py

@@ -5,7 +5,7 @@ import torch
 import torch.nn as nn
 from mmcv.runner import Sequential
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.models.textrecog.layers import BidirectionalLSTM
 from mmocr.registry import MODELS

mmocr/models/textrecog/decoders/master_decoder.py

@@ -9,7 +9,7 @@ import torch.nn.functional as F
 from mmcv.cnn.bricks.transformer import BaseTransformerLayer
 from mmcv.runner import ModuleList
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.common.modules import PositionalEncoding
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS

mmocr/models/textrecog/decoders/nrtr_decoder.py

@@ -7,7 +7,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 from mmcv.runner import ModuleList
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.common import PositionalEncoding, TFDecoderLayer
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS

mmocr/models/textrecog/decoders/position_attention_decoder.py

@@ -5,7 +5,7 @@ from typing import Dict, Optional, Sequence, Union
 import torch
 import torch.nn as nn
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.models.textrecog.layers import (DotProductAttentionLayer,
                                            PositionAwareLayer)

mmocr/models/textrecog/decoders/robust_scanner_fuser.py

@@ -6,7 +6,7 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS
 from .base_decoder import BaseDecoder

mmocr/models/textrecog/decoders/sar_decoder.py

@@ -6,7 +6,7 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import MODELS
 from .base_decoder import BaseDecoder

mmocr/models/textrecog/decoders/sequence_attention_decoder.py

@@ -6,7 +6,7 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.models.textrecog.layers import DotProductAttentionLayer
 from mmocr.registry import MODELS

mmocr/models/textrecog/encoders/abi_encoder.py

@@ -6,7 +6,7 @@ import torch
 from mmcv.cnn.bricks.transformer import BaseTransformerLayer
 from mmcv.runner import BaseModule, ModuleList
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.common.modules import PositionalEncoding
 from mmocr.registry import MODELS
 

mmocr/models/textrecog/encoders/channel_reduction_encoder.py

@@ -4,7 +4,7 @@ from typing import Dict, Optional, Sequence
 import torch
 import torch.nn as nn
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.registry import MODELS
 from .base_encoder import BaseEncoder
 

mmocr/models/textrecog/encoders/nrtr_encoder.py

@@ -6,7 +6,7 @@ import torch
 import torch.nn as nn
 from mmcv.runner import ModuleList
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.common import TFEncoderLayer
 from mmocr.registry import MODELS
 from .base_encoder import BaseEncoder

mmocr/models/textrecog/encoders/sar_encoder.py

@@ -6,7 +6,7 @@ import torch
 import torch.nn as nn
 import torch.nn.functional as F
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.registry import MODELS
 from .base_encoder import BaseEncoder
 

mmocr/models/textrecog/encoders/satrn_encoder.py

@@ -6,7 +6,7 @@ import torch.nn as nn
 from mmcv.runner import ModuleList
 from torch import Tensor
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.layers import (Adaptive2DPositionalEncoding,
                                            SATRNEncoderLayer)
 from mmocr.registry import MODELS

mmocr/models/textrecog/losses/base_recog_loss.py

@@ -5,7 +5,7 @@ from typing import Dict, Sequence, Union
 import torch
 import torch.nn as nn
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import TASK_UTILS
 

mmocr/models/textrecog/losses/ce_loss.py

@@ -4,7 +4,7 @@ from typing import Dict, Sequence, Union
 import torch
 import torch.nn as nn
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary.dictionary import Dictionary
 from mmocr.registry import MODELS
 from .base_recog_loss import BaseRecogLoss

mmocr/models/textrecog/losses/ctc_loss.py

@@ -5,7 +5,7 @@ from typing import Dict, Sequence, Union
 import torch
 import torch.nn as nn
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary.dictionary import Dictionary
 from mmocr.registry import MODELS
 from .base_recog_loss import BaseRecogLoss

mmocr/models/textrecog/postprocessors/attn_postprocessor.py

@@ -3,7 +3,7 @@ from typing import Optional, Sequence, Tuple
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.registry import MODELS
 from .base_textrecog_postprocessor import BaseTextRecogPostprocessor
 

mmocr/models/textrecog/postprocessors/base_textrecog_postprocessor.py

@@ -6,7 +6,7 @@ import mmcv
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.registry import TASK_UTILS
 

mmocr/models/textrecog/postprocessors/ctc_postprocessor.py

@@ -5,7 +5,7 @@ from typing import Sequence, Tuple
 import torch
 import torch.nn.functional as F
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.registry import MODELS
 from .base_textrecog_postprocessor import BaseTextRecogPostprocessor
 

mmocr/models/textrecog/recognizers/base.py

@@ -6,7 +6,7 @@ import torch
 from mmengine.config import ConfigDict
 from mmengine.model.base_model import BaseModel
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 
 # Type hint of config data
 ConfigType = Union[ConfigDict, dict]

mmocr/models/textrecog/recognizers/encode_decode_recognizer.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Sequence, Tuple, Union
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.registry import MODELS, TASK_UTILS
 from .base import BaseRecognizer
 

mmocr/utils/setup_env.py

@@ -17,6 +17,7 @@ def register_all_modules(init_default_scope: bool = True) -> None:
             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

tests/test_core/test_visualization/test_textdet_visualizer.py

@@ -8,8 +8,8 @@ import numpy as np
 import torch
 from mmengine.data import InstanceData
 
-from mmocr.core import TextDetDataSample
 from mmocr.core.visualization import TextDetLocalVisualizer
+from mmocr.data import TextDetDataSample
 from mmocr.utils import bbox2poly
 
 

tests/test_core/test_visualization/test_textrecog_visualizer.py

@@ -7,8 +7,8 @@ import cv2
 import numpy as np
 from mmengine.data import LabelData
 
-from mmocr.core import TextRecogDataSample
 from mmocr.core.visualization import TextRecogLocalVisualizer
+from mmocr.data import TextRecogDataSample
 
 
 class TestTextDetLocalVisualizer(unittest.TestCase):

tests/test_data/test_kie_data_sample.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine.data import InstanceData
 
-from mmocr.core import KIEDataSample
+from mmocr.data import KIEDataSample
 
 
 class TestTextDetDataSample(TestCase):

tests/test_data/test_textdet_data_sample.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine.data import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 
 
 class TestTextDetDataSample(TestCase):

tests/test_data/test_textrecog_data_sample.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 
 
 class TestTextRecogDataSample(TestCase):

tests/test_evaluation/test_metrics/test_f_metric.py

@@ -4,7 +4,7 @@ import unittest
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.evaluation import F1Metric
 
 

tests/test_evaluation/test_metrics/test_hmean_iou.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.evaluation import HmeanIOUMetric
 
 

tests/test_evaluation/test_metrics/test_recog_metric.py

@@ -4,7 +4,7 @@ import unittest
 
 from mmengine.data import LabelData
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.evaluation import CharMetric, OneMinusNEDMetric, WordMetric
 
 

tests/test_models/test_kie/test_extractors/test_sdmgr.py

@@ -6,7 +6,7 @@ from os.path import dirname, exists, join
 import torch
 from mmengine import Config, ConfigDict, InstanceData
 
-from mmocr.core.data_structures.kie_data_sample import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.registry import MODELS
 
 

tests/test_models/test_kie/test_heads/test_sdmgr_head.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.models.kie.heads import SDMGRHead
 from mmocr.models.textrecog.dictionary import Dictionary
 

tests/test_models/test_kie/test_module_losses/test_sdmgr_module_loss.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import torch
 from mmengine import InstanceData
 
-from mmocr.core.data_structures.kie_data_sample import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.models.kie.module_losses import SDMGRModuleLoss
 
 

tests/test_models/test_kie/test_postprocessors/test_sdmgr_postprocessor.py

@@ -5,7 +5,7 @@ from unittest import TestCase
 import torch
 from mmengine import InstanceData
 
-from mmocr.core.data_structures.kie_data_sample import KIEDataSample
+from mmocr.data import KIEDataSample
 from mmocr.models.kie.postprocessors import SDMGRPostProcessor
 
 

tests/test_models/test_textdet/test_data_preprocessors/test_textdet_data_preprocessor.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import torch
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.data_preprocessors import TextDetDataPreprocessor
 from mmocr.registry import MODELS
 

tests/test_models/test_textdet/test_detectors/base.py

@@ -6,7 +6,7 @@ import numpy as np
 import torch
 from mmengine import Config, ConfigDict, InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 
 
 class BaseTestUtils:

tests/test_models/test_textdet/test_losses/test_db_loss.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.losses import DBLoss
 
 

tests/test_models/test_textdet/test_losses/test_drrg_loss.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.losses import DRRGLoss
 
 

tests/test_models/test_textdet/test_losses/test_fceloss.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.losses import FCELoss
 
 

tests/test_models/test_textdet/test_losses/test_panloss.py

@@ -6,7 +6,7 @@ import torch
 import torch.nn as nn
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.losses import PANLoss
 from mmocr.models.textdet.losses.pan_loss import PANEmbLossV1
 

tests/test_models/test_textdet/test_losses/test_pseloss.py

@@ -7,7 +7,7 @@ import torch.nn as nn
 from mmengine import InstanceData
 from parameterized import parameterized
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.losses import PSELoss
 
 

tests/test_models/test_textdet/test_losses/test_textsnake_loss.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.losses import TextSnakeLoss
 
 

tests/test_models/test_textdet/test_postprocessors/test_base_postprocessor.py

@@ -5,7 +5,7 @@ from unittest import mock
 import numpy as np
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import BaseTextDetPostProcessor
 
 

tests/test_models/test_textdet/test_postprocessors/test_db_postprocessor.py

@@ -6,7 +6,7 @@ import torch
 from mmengine import InstanceData
 from parameterized import parameterized
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import DBPostprocessor
 
 

tests/test_models/test_textdet/test_postprocessors/test_drrg_postprocessor.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from mmengine import InstanceData
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import DRRGPostprocessor
 
 

tests/test_models/test_textdet/test_postprocessors/test_fce_postprocessor.py

@@ -6,7 +6,7 @@ import torch
 from mmengine import InstanceData
 from parameterized import parameterized
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import FCEPostprocessor
 
 

tests/test_models/test_textdet/test_postprocessors/test_pan_postprocessor.py

@@ -5,7 +5,7 @@ import numpy as np
 import torch
 from parameterized import parameterized
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import PANPostprocessor
 from mmocr.utils import poly2shapely, poly_iou
 

tests/test_models/test_textdet/test_postprocessors/test_pse_postprocessor.py

@@ -4,7 +4,7 @@ import unittest
 import torch
 from parameterized import parameterized
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import PSEPostprocessor
 
 

tests/test_models/test_textdet/test_postprocessors/test_textsnake_postprocessor.py

@@ -7,7 +7,7 @@ import torch
 from mmengine import InstanceData
 from parameterized import parameterized
 
-from mmocr.core import TextDetDataSample
+from mmocr.data import TextDetDataSample
 from mmocr.models.textdet.postprocessors import TextSnakePostprocessor
 
 

tests/test_models/test_textrecog/test_data_preprocessors/test_data_preprocessor.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import torch
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.data_preprocessors import TextRecogDataPreprocessor
 from mmocr.registry import MODELS
 

tests/test_models/test_textrecog/test_decoders/test_master_decoder.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.decoders import MasterDecoder
 
 

tests/test_models/test_textrecog/test_decoders/test_nrtr_decoder.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.decoders import NRTRDecoder
 
 

tests/test_models/test_textrecog/test_decoders/test_position_attention_decoder.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.decoders import PositionAttentionDecoder
 
 

tests/test_models/test_textrecog/test_decoders/test_robust_scanner_fuser.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.decoders import (PositionAttentionDecoder,
                                              RobustScannerFuser,
                                              SequenceAttentionDecoder)

tests/test_models/test_textrecog/test_decoders/test_sar_decoder.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.decoders import (ParallelSARDecoder,
                                              SequentialSARDecoder)
 

tests/test_models/test_textrecog/test_decoders/test_sequence_attention_decoder.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.decoders import SequenceAttentionDecoder
 
 

tests/test_models/test_textrecog/test_encoders/test_channel_reduction_encoder.py

@@ -3,7 +3,7 @@ import unittest
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.encoders import ChannelReductionEncoder
 
 

tests/test_models/test_textrecog/test_encoders/test_nrtr_encoder.py

@@ -3,7 +3,7 @@ import unittest
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.encoders import NRTREncoder
 
 

tests/test_models/test_textrecog/test_encoders/test_sar_encoder.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.encoders import SAREncoder
 
 

tests/test_models/test_textrecog/test_encoders/test_satrn_decoder.py

@@ -3,7 +3,7 @@ import unittest
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.encoders import SATRNEncoder
 
 

tests/test_models/test_textrecog/test_losses/test_base_recog_loss.py

@@ -7,7 +7,7 @@ import numpy as np
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.models.textrecog.losses import BaseRecogLoss
 

tests/test_models/test_textrecog/test_losses/test_ce_loss.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.losses import CELoss
 
 

tests/test_models/test_textrecog/test_losses/test_ctc_loss.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 import torch
 from mmengine.data import LabelData
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.models.textrecog.losses import CTCLoss
 

tests/test_models/test_textrecog/test_postprocessors/test_attn_postprocessor.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 
 import torch
 
-from mmocr.core.data_structures import TextRecogDataSample
+from mmocr.data import TextRecogDataSample
 from mmocr.models.textrecog.dictionary import Dictionary
 from mmocr.models.textrecog.postprocessors.attn_postprocessor import \
     AttentionPostprocessor