diff --git a/.gitignore b/.gitignore index 4585485b..64efec76 100644 --- a/.gitignore +++ b/.gitignore @@ -107,7 +107,7 @@ venv.bak/ # cython generated cpp !data/dict -data +/data .vscode .idea diff --git a/mmocr/core/__init__.py b/mmocr/core/__init__.py index 14a275f7..64e8d662 100644 --- a/mmocr/core/__init__.py +++ b/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, diff --git a/mmocr/core/visualization/textdet_visualizer.py b/mmocr/core/visualization/textdet_visualizer.py index d0cc3e33..960748ef 100644 --- a/mmocr/core/visualization/textdet_visualizer.py +++ b/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 diff --git a/mmocr/core/visualization/textrecog_visualizer.py b/mmocr/core/visualization/textrecog_visualizer.py index c09e7714..caf08813 100644 --- a/mmocr/core/visualization/textrecog_visualizer.py +++ b/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 diff --git a/mmocr/core/data_structures/__init__.py b/mmocr/data/__init__.py similarity index 100% rename from mmocr/core/data_structures/__init__.py rename to mmocr/data/__init__.py diff --git a/mmocr/core/data_structures/kie_data_sample.py b/mmocr/data/kie_data_sample.py similarity index 98% rename from mmocr/core/data_structures/kie_data_sample.py rename to mmocr/data/kie_data_sample.py index 276f3b4e..55918dd0 100644 --- a/mmocr/core/data_structures/kie_data_sample.py +++ b/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), diff --git a/mmocr/core/data_structures/textdet_data_sample.py b/mmocr/data/textdet_data_sample.py similarity index 98% rename from mmocr/core/data_structures/textdet_data_sample.py rename to mmocr/data/textdet_data_sample.py index b99a8330..6e9f592e 100644 --- a/mmocr/core/data_structures/textdet_data_sample.py +++ b/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), diff --git a/mmocr/core/data_structures/textrecog_data_element.py b/mmocr/data/textrecog_data_element.py similarity index 97% rename from mmocr/core/data_structures/textrecog_data_element.py rename to mmocr/data/textrecog_data_element.py index 88958124..c1cc4813 100644 --- a/mmocr/core/data_structures/textrecog_data_element.py +++ b/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), diff --git a/mmocr/datasets/pipelines/formatting.py b/mmocr/datasets/pipelines/formatting.py index 787f2201..b1bc084e 100644 --- a/mmocr/datasets/pipelines/formatting.py +++ b/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 diff --git a/mmocr/models/kie/extractors/sdmgr.py b/mmocr/models/kie/extractors/sdmgr.py index 9b23c997..f8e52fdc 100644 --- a/mmocr/models/kie/extractors/sdmgr.py +++ b/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 diff --git a/mmocr/models/kie/heads/sdmgr_head.py b/mmocr/models/kie/heads/sdmgr_head.py index 839b29e2..2bb4112e 100644 --- a/mmocr/models/kie/heads/sdmgr_head.py +++ b/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 diff --git a/mmocr/models/kie/module_losses/sdmgr_module_loss.py b/mmocr/models/kie/module_losses/sdmgr_module_loss.py index 3b0e30c5..bb87f753 100644 --- a/mmocr/models/kie/module_losses/sdmgr_module_loss.py +++ b/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 diff --git a/mmocr/models/kie/postprocessors/sdmgr_postprocessor.py b/mmocr/models/kie/postprocessors/sdmgr_postprocessor.py index c50fc4e3..aa277461 100644 --- a/mmocr/models/kie/postprocessors/sdmgr_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/detectors/single_stage_text_detector.py b/mmocr/models/textdet/detectors/single_stage_text_detector.py index 584deae3..ddeec9fa 100644 --- a/mmocr/models/textdet/detectors/single_stage_text_detector.py +++ b/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 diff --git a/mmocr/models/textdet/heads/base_textdet_head.py b/mmocr/models/textdet/heads/base_textdet_head.py index cc24a575..248b1de4 100644 --- a/mmocr/models/textdet/heads/base_textdet_head.py +++ b/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] diff --git a/mmocr/models/textdet/heads/db_head.py b/mmocr/models/textdet/heads/db_head.py index 859c10b8..12588607 100644 --- a/mmocr/models/textdet/heads/db_head.py +++ b/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 diff --git a/mmocr/models/textdet/heads/drrg_head.py b/mmocr/models/textdet/heads/drrg_head.py index 93d3a27a..d6297a19 100644 --- a/mmocr/models/textdet/heads/drrg_head.py +++ b/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 diff --git a/mmocr/models/textdet/heads/fce_head.py b/mmocr/models/textdet/heads/fce_head.py index cdc9bd83..f7b08768 100644 --- a/mmocr/models/textdet/heads/fce_head.py +++ b/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 diff --git a/mmocr/models/textdet/heads/pan_head.py b/mmocr/models/textdet/heads/pan_head.py index 5c403e38..802735b3 100644 --- a/mmocr/models/textdet/heads/pan_head.py +++ b/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 diff --git a/mmocr/models/textdet/heads/textsnake_head.py b/mmocr/models/textdet/heads/textsnake_head.py index 177faa6e..86baf20d 100644 --- a/mmocr/models/textdet/heads/textsnake_head.py +++ b/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 diff --git a/mmocr/models/textdet/losses/db_loss.py b/mmocr/models/textdet/losses/db_loss.py index fada0188..df0dec23 100644 --- a/mmocr/models/textdet/losses/db_loss.py +++ b/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 diff --git a/mmocr/models/textdet/losses/drrg_loss.py b/mmocr/models/textdet/losses/drrg_loss.py index 5c785fd3..19f84779 100644 --- a/mmocr/models/textdet/losses/drrg_loss.py +++ b/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 diff --git a/mmocr/models/textdet/losses/fce_loss.py b/mmocr/models/textdet/losses/fce_loss.py index e3ca57d4..dabbd781 100644 --- a/mmocr/models/textdet/losses/fce_loss.py +++ b/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 diff --git a/mmocr/models/textdet/losses/pan_loss.py b/mmocr/models/textdet/losses/pan_loss.py index a7881863..45ca03fb 100644 --- a/mmocr/models/textdet/losses/pan_loss.py +++ b/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 diff --git a/mmocr/models/textdet/losses/pse_loss.py b/mmocr/models/textdet/losses/pse_loss.py index 2b500dbe..08afc9a0 100644 --- a/mmocr/models/textdet/losses/pse_loss.py +++ b/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 diff --git a/mmocr/models/textdet/losses/textsnake_loss.py b/mmocr/models/textdet/losses/textsnake_loss.py index e618f28b..c18f8aa6 100644 --- a/mmocr/models/textdet/losses/textsnake_loss.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/base_postprocessor.py b/mmocr/models/textdet/postprocessors/base_postprocessor.py index 55de0982..d86feaba 100644 --- a/mmocr/models/textdet/postprocessors/base_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/db_postprocessor.py b/mmocr/models/textdet/postprocessors/db_postprocessor.py index 33b9560d..148ff556 100644 --- a/mmocr/models/textdet/postprocessors/db_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/drrg_postprocessor.py b/mmocr/models/textdet/postprocessors/drrg_postprocessor.py index 0e5938c4..f5897bec 100644 --- a/mmocr/models/textdet/postprocessors/drrg_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/fce_postprocessor.py b/mmocr/models/textdet/postprocessors/fce_postprocessor.py index 063905cb..6625b881 100644 --- a/mmocr/models/textdet/postprocessors/fce_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/pan_postprocessor.py b/mmocr/models/textdet/postprocessors/pan_postprocessor.py index 4fa0fa39..ba4a250e 100644 --- a/mmocr/models/textdet/postprocessors/pan_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/pse_postprocessor.py b/mmocr/models/textdet/postprocessors/pse_postprocessor.py index b758261b..7dd7449c 100644 --- a/mmocr/models/textdet/postprocessors/pse_postprocessor.py +++ b/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 diff --git a/mmocr/models/textdet/postprocessors/textsnake_postprocessor.py b/mmocr/models/textdet/postprocessors/textsnake_postprocessor.py index 1dbc53db..f0aafb0c 100644 --- a/mmocr/models/textdet/postprocessors/textsnake_postprocessor.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/abi_fuser.py b/mmocr/models/textrecog/decoders/abi_fuser.py index 4800eec8..a42c7188 100644 --- a/mmocr/models/textrecog/decoders/abi_fuser.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/abi_language_decoder.py b/mmocr/models/textrecog/decoders/abi_language_decoder.py index 3aef1d09..2888a748 100644 --- a/mmocr/models/textrecog/decoders/abi_language_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/abi_vision_decoder.py b/mmocr/models/textrecog/decoders/abi_vision_decoder.py index 49a8e4e5..21034b97 100644 --- a/mmocr/models/textrecog/decoders/abi_vision_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/base_decoder.py b/mmocr/models/textrecog/decoders/base_decoder.py index bf94f6b8..6f7be7d7 100644 --- a/mmocr/models/textrecog/decoders/base_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/crnn_decoder.py b/mmocr/models/textrecog/decoders/crnn_decoder.py index 6d143ece..ee6ff1aa 100644 --- a/mmocr/models/textrecog/decoders/crnn_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/master_decoder.py b/mmocr/models/textrecog/decoders/master_decoder.py index 5f23c8c0..7e3c47a7 100644 --- a/mmocr/models/textrecog/decoders/master_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/nrtr_decoder.py b/mmocr/models/textrecog/decoders/nrtr_decoder.py index 59fe8217..5a5c0e11 100644 --- a/mmocr/models/textrecog/decoders/nrtr_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/position_attention_decoder.py b/mmocr/models/textrecog/decoders/position_attention_decoder.py index 93ecb6f3..1039e98b 100644 --- a/mmocr/models/textrecog/decoders/position_attention_decoder.py +++ b/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) diff --git a/mmocr/models/textrecog/decoders/robust_scanner_fuser.py b/mmocr/models/textrecog/decoders/robust_scanner_fuser.py index 99ac854a..f95cdef5 100644 --- a/mmocr/models/textrecog/decoders/robust_scanner_fuser.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/sar_decoder.py b/mmocr/models/textrecog/decoders/sar_decoder.py index 10dd46f9..357304a8 100755 --- a/mmocr/models/textrecog/decoders/sar_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/decoders/sequence_attention_decoder.py b/mmocr/models/textrecog/decoders/sequence_attention_decoder.py index 395a627b..791c1fbd 100644 --- a/mmocr/models/textrecog/decoders/sequence_attention_decoder.py +++ b/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 diff --git a/mmocr/models/textrecog/encoders/abi_encoder.py b/mmocr/models/textrecog/encoders/abi_encoder.py index 478ec680..28d6fbe6 100644 --- a/mmocr/models/textrecog/encoders/abi_encoder.py +++ b/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 diff --git a/mmocr/models/textrecog/encoders/channel_reduction_encoder.py b/mmocr/models/textrecog/encoders/channel_reduction_encoder.py index 0f6797d1..c7a45b17 100644 --- a/mmocr/models/textrecog/encoders/channel_reduction_encoder.py +++ b/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 diff --git a/mmocr/models/textrecog/encoders/nrtr_encoder.py b/mmocr/models/textrecog/encoders/nrtr_encoder.py index 88566e26..4dea9217 100644 --- a/mmocr/models/textrecog/encoders/nrtr_encoder.py +++ b/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 diff --git a/mmocr/models/textrecog/encoders/sar_encoder.py b/mmocr/models/textrecog/encoders/sar_encoder.py index 23c578fd..1a62cabc 100644 --- a/mmocr/models/textrecog/encoders/sar_encoder.py +++ b/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 diff --git a/mmocr/models/textrecog/encoders/satrn_encoder.py b/mmocr/models/textrecog/encoders/satrn_encoder.py index 0de53ba4..f9944b64 100644 --- a/mmocr/models/textrecog/encoders/satrn_encoder.py +++ b/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 diff --git a/mmocr/models/textrecog/losses/base_recog_loss.py b/mmocr/models/textrecog/losses/base_recog_loss.py index ab2730c6..201a3586 100644 --- a/mmocr/models/textrecog/losses/base_recog_loss.py +++ b/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 diff --git a/mmocr/models/textrecog/losses/ce_loss.py b/mmocr/models/textrecog/losses/ce_loss.py index e9b4525f..eff4545a 100644 --- a/mmocr/models/textrecog/losses/ce_loss.py +++ b/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 diff --git a/mmocr/models/textrecog/losses/ctc_loss.py b/mmocr/models/textrecog/losses/ctc_loss.py index 31bc9b79..bf0f9ec8 100644 --- a/mmocr/models/textrecog/losses/ctc_loss.py +++ b/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 diff --git a/mmocr/models/textrecog/postprocessors/attn_postprocessor.py b/mmocr/models/textrecog/postprocessors/attn_postprocessor.py index c5d96b5c..e2ad97b4 100644 --- a/mmocr/models/textrecog/postprocessors/attn_postprocessor.py +++ b/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 diff --git a/mmocr/models/textrecog/postprocessors/base_textrecog_postprocessor.py b/mmocr/models/textrecog/postprocessors/base_textrecog_postprocessor.py index d1ba2851..d8034fbc 100644 --- a/mmocr/models/textrecog/postprocessors/base_textrecog_postprocessor.py +++ b/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 diff --git a/mmocr/models/textrecog/postprocessors/ctc_postprocessor.py b/mmocr/models/textrecog/postprocessors/ctc_postprocessor.py index e68c8d79..640669f1 100644 --- a/mmocr/models/textrecog/postprocessors/ctc_postprocessor.py +++ b/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 diff --git a/mmocr/models/textrecog/recognizers/base.py b/mmocr/models/textrecog/recognizers/base.py index 44b60227..16d8779f 100644 --- a/mmocr/models/textrecog/recognizers/base.py +++ b/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] diff --git a/mmocr/models/textrecog/recognizers/encode_decode_recognizer.py b/mmocr/models/textrecog/recognizers/encode_decode_recognizer.py index 5c95f76e..6f3ab243 100644 --- a/mmocr/models/textrecog/recognizers/encode_decode_recognizer.py +++ b/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 diff --git a/mmocr/utils/setup_env.py b/mmocr/utils/setup_env.py index b012f26a..a1397017 100644 --- a/mmocr/utils/setup_env.py +++ b/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 diff --git a/tests/test_core/test_visualization/test_textdet_visualizer.py b/tests/test_core/test_visualization/test_textdet_visualizer.py index 671de6bc..eccd34ae 100644 --- a/tests/test_core/test_visualization/test_textdet_visualizer.py +++ b/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 diff --git a/tests/test_core/test_visualization/test_textrecog_visualizer.py b/tests/test_core/test_visualization/test_textrecog_visualizer.py index e62020f6..82301476 100644 --- a/tests/test_core/test_visualization/test_textrecog_visualizer.py +++ b/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): diff --git a/tests/test_core/test_data_structures/test_kie_data_sample.py b/tests/test_data/test_kie_data_sample.py similarity index 99% rename from tests/test_core/test_data_structures/test_kie_data_sample.py rename to tests/test_data/test_kie_data_sample.py index d8c04871..266c9a5b 100644 --- a/tests/test_core/test_data_structures/test_kie_data_sample.py +++ b/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): diff --git a/tests/test_core/test_data_structures/test_textdet_data_sample.py b/tests/test_data/test_textdet_data_sample.py similarity index 98% rename from tests/test_core/test_data_structures/test_textdet_data_sample.py rename to tests/test_data/test_textdet_data_sample.py index 22fe0393..fff03f2c 100644 --- a/tests/test_core/test_data_structures/test_textdet_data_sample.py +++ b/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): diff --git a/tests/test_core/test_data_structures/test_textrecog_data_sample.py b/tests/test_data/test_textrecog_data_sample.py similarity index 97% rename from tests/test_core/test_data_structures/test_textrecog_data_sample.py rename to tests/test_data/test_textrecog_data_sample.py index 8692d533..eff303de 100644 --- a/tests/test_core/test_data_structures/test_textrecog_data_sample.py +++ b/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): diff --git a/tests/test_evaluation/test_metrics/test_f_metric.py b/tests/test_evaluation/test_metrics/test_f_metric.py index 1b7e2743..13837190 100644 --- a/tests/test_evaluation/test_metrics/test_f_metric.py +++ b/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 diff --git a/tests/test_evaluation/test_metrics/test_hmean_iou.py b/tests/test_evaluation/test_metrics/test_hmean_iou.py index 6c11c55a..90bdcfe9 100644 --- a/tests/test_evaluation/test_metrics/test_hmean_iou.py +++ b/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 diff --git a/tests/test_evaluation/test_metrics/test_recog_metric.py b/tests/test_evaluation/test_metrics/test_recog_metric.py index 5fe8c035..b2c8d52e 100644 --- a/tests/test_evaluation/test_metrics/test_recog_metric.py +++ b/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 diff --git a/tests/test_models/test_kie/test_extractors/test_sdmgr.py b/tests/test_models/test_kie/test_extractors/test_sdmgr.py index 0c1c1bf4..bce8d8bb 100644 --- a/tests/test_models/test_kie/test_extractors/test_sdmgr.py +++ b/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 diff --git a/tests/test_models/test_kie/test_heads/test_sdmgr_head.py b/tests/test_models/test_kie/test_heads/test_sdmgr_head.py index f57ec9f3..76a61e13 100644 --- a/tests/test_models/test_kie/test_heads/test_sdmgr_head.py +++ b/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 diff --git a/tests/test_models/test_kie/test_module_losses/test_sdmgr_module_loss.py b/tests/test_models/test_kie/test_module_losses/test_sdmgr_module_loss.py index 7d2f249c..feb1bd15 100644 --- a/tests/test_models/test_kie/test_module_losses/test_sdmgr_module_loss.py +++ b/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 diff --git a/tests/test_models/test_kie/test_postprocessors/test_sdmgr_postprocessor.py b/tests/test_models/test_kie/test_postprocessors/test_sdmgr_postprocessor.py index 619c95a7..467b4738 100644 --- a/tests/test_models/test_kie/test_postprocessors/test_sdmgr_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_data_preprocessors/test_textdet_data_preprocessor.py b/tests/test_models/test_textdet/test_data_preprocessors/test_textdet_data_preprocessor.py index ba269976..ab6631b8 100644 --- a/tests/test_models/test_textdet/test_data_preprocessors/test_textdet_data_preprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_detectors/base.py b/tests/test_models/test_textdet/test_detectors/base.py index 1a06a679..b1edd102 100644 --- a/tests/test_models/test_textdet/test_detectors/base.py +++ b/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: diff --git a/tests/test_models/test_textdet/test_losses/test_db_loss.py b/tests/test_models/test_textdet/test_losses/test_db_loss.py index 3e77f2f9..4e91bab8 100644 --- a/tests/test_models/test_textdet/test_losses/test_db_loss.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_losses/test_drrg_loss.py b/tests/test_models/test_textdet/test_losses/test_drrg_loss.py index 5555b253..dd0fee87 100644 --- a/tests/test_models/test_textdet/test_losses/test_drrg_loss.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_losses/test_fceloss.py b/tests/test_models/test_textdet/test_losses/test_fceloss.py index 7cd17ab6..c82ff82e 100644 --- a/tests/test_models/test_textdet/test_losses/test_fceloss.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_losses/test_panloss.py b/tests/test_models/test_textdet/test_losses/test_panloss.py index c5cbbda2..ad0fd45e 100644 --- a/tests/test_models/test_textdet/test_losses/test_panloss.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_losses/test_pseloss.py b/tests/test_models/test_textdet/test_losses/test_pseloss.py index 57dbaa3e..b9117471 100644 --- a/tests/test_models/test_textdet/test_losses/test_pseloss.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_losses/test_textsnake_loss.py b/tests/test_models/test_textdet/test_losses/test_textsnake_loss.py index 8a2b1cfb..0579b8f1 100644 --- a/tests/test_models/test_textdet/test_losses/test_textsnake_loss.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_base_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_base_postprocessor.py index 03e3b622..13f9ff9e 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_base_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_db_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_db_postprocessor.py index b725df31..c6c1fe34 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_db_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_drrg_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_drrg_postprocessor.py index 90e48594..7ec32bbf 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_drrg_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_fce_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_fce_postprocessor.py index ee97a168..b141d013 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_fce_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_pan_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_pan_postprocessor.py index ceda19e3..a69170e6 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_pan_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_pse_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_pse_postprocessor.py index 716412c7..de7daa0f 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_pse_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textdet/test_postprocessors/test_textsnake_postprocessor.py b/tests/test_models/test_textdet/test_postprocessors/test_textsnake_postprocessor.py index cfe25ed9..2ac96379 100644 --- a/tests/test_models/test_textdet/test_postprocessors/test_textsnake_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_data_preprocessors/test_data_preprocessor.py b/tests/test_models/test_textrecog/test_data_preprocessors/test_data_preprocessor.py index d468070b..bb4be2ed 100644 --- a/tests/test_models/test_textrecog/test_data_preprocessors/test_data_preprocessor.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_decoders/test_master_decoder.py b/tests/test_models/test_textrecog/test_decoders/test_master_decoder.py index 16ca4ffd..eac9f039 100644 --- a/tests/test_models/test_textrecog/test_decoders/test_master_decoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_decoders/test_nrtr_decoder.py b/tests/test_models/test_textrecog/test_decoders/test_nrtr_decoder.py index db7400b3..7e1c859f 100644 --- a/tests/test_models/test_textrecog/test_decoders/test_nrtr_decoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_decoders/test_position_attention_decoder.py b/tests/test_models/test_textrecog/test_decoders/test_position_attention_decoder.py index 021946d6..a9e7624d 100644 --- a/tests/test_models/test_textrecog/test_decoders/test_position_attention_decoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_decoders/test_robust_scanner_fuser.py b/tests/test_models/test_textrecog/test_decoders/test_robust_scanner_fuser.py index acdf7a77..3dd2f487 100644 --- a/tests/test_models/test_textrecog/test_decoders/test_robust_scanner_fuser.py +++ b/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) diff --git a/tests/test_models/test_textrecog/test_decoders/test_sar_decoder.py b/tests/test_models/test_textrecog/test_decoders/test_sar_decoder.py index 7295e0b0..c9cc77bc 100644 --- a/tests/test_models/test_textrecog/test_decoders/test_sar_decoder.py +++ b/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) diff --git a/tests/test_models/test_textrecog/test_decoders/test_sequence_attention_decoder.py b/tests/test_models/test_textrecog/test_decoders/test_sequence_attention_decoder.py index 79a05706..10af06a6 100644 --- a/tests/test_models/test_textrecog/test_decoders/test_sequence_attention_decoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_encoders/test_channel_reduction_encoder.py b/tests/test_models/test_textrecog/test_encoders/test_channel_reduction_encoder.py index dd1fa5e8..2ce3056c 100644 --- a/tests/test_models/test_textrecog/test_encoders/test_channel_reduction_encoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_encoders/test_nrtr_encoder.py b/tests/test_models/test_textrecog/test_encoders/test_nrtr_encoder.py index a986d55c..3d876459 100644 --- a/tests/test_models/test_textrecog/test_encoders/test_nrtr_encoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_encoders/test_sar_encoder.py b/tests/test_models/test_textrecog/test_encoders/test_sar_encoder.py index 51fe6015..a2694bdd 100644 --- a/tests/test_models/test_textrecog/test_encoders/test_sar_encoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_encoders/test_satrn_decoder.py b/tests/test_models/test_textrecog/test_encoders/test_satrn_decoder.py index 58962d40..e2fbc38d 100644 --- a/tests/test_models/test_textrecog/test_encoders/test_satrn_decoder.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_losses/test_base_recog_loss.py b/tests/test_models/test_textrecog/test_losses/test_base_recog_loss.py index 38b40403..3a1110d3 100644 --- a/tests/test_models/test_textrecog/test_losses/test_base_recog_loss.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_losses/test_ce_loss.py b/tests/test_models/test_textrecog/test_losses/test_ce_loss.py index 6d592020..2beb46dd 100644 --- a/tests/test_models/test_textrecog/test_losses/test_ce_loss.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_losses/test_ctc_loss.py b/tests/test_models/test_textrecog/test_losses/test_ctc_loss.py index fa2db098..cbfb3a47 100644 --- a/tests/test_models/test_textrecog/test_losses/test_ctc_loss.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_postprocessors/test_attn_postprocessor.py b/tests/test_models/test_textrecog/test_postprocessors/test_attn_postprocessor.py index c1f1392e..8bfa5979 100644 --- a/tests/test_models/test_textrecog/test_postprocessors/test_attn_postprocessor.py +++ b/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 diff --git a/tests/test_models/test_textrecog/test_postprocessors/test_base_textrecog_postprocessor.py b/tests/test_models/test_textrecog/test_postprocessors/test_base_textrecog_postprocessor.py index 744af39e..5484aaf1 100644 --- a/tests/test_models/test_textrecog/test_postprocessors/test_base_textrecog_postprocessor.py +++ b/tests/test_models/test_textrecog/test_postprocessors/test_base_textrecog_postprocessor.py @@ -5,7 +5,7 @@ from unittest import TestCase, mock 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 import BaseTextRecogPostprocessor diff --git a/tests/test_models/test_textrecog/test_postprocessors/test_ctc_postprocessor.py b/tests/test_models/test_textrecog/test_postprocessors/test_ctc_postprocessor.py index 2995c31f..1d73df0f 100644 --- a/tests/test_models/test_textrecog/test_postprocessors/test_ctc_postprocessor.py +++ b/tests/test_models/test_textrecog/test_postprocessors/test_ctc_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.ctc_postprocessor import \ CTCPostProcessor