[Refactor] MMEngine directory tree (#1317)

mmocr/datasets/dataset_wrapper.py

@@ -1,8 +1,8 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 from typing import Callable, List, Sequence, Union
 
-from mmengine import BaseDataset, Compose
+from mmengine.dataset import BaseDataset, Compose
-from mmengine import ConcatDataset as MMENGINE_CONCATDATASET
+from mmengine.dataset import ConcatDataset as MMENGINE_CONCATDATASET
 
 from mmocr.registry import DATASETS
 

mmocr/datasets/transforms/formatting.py

@@ -3,7 +3,7 @@ import numpy as np
 import torch
 from mmcv.transforms import to_tensor
 from mmcv.transforms.base import BaseTransform
-from mmengine.data import InstanceData, LabelData
+from mmengine.structures import InstanceData, LabelData
 
 from mmocr.registry import TRANSFORMS
 from mmocr.structures import (KIEDataSample, TextDetDataSample,

mmocr/models/common/backbones/unet.py

@@ -4,7 +4,7 @@ import torch.nn as nn
 import torch.utils.checkpoint as cp
 from mmcv.cnn import ConvModule, build_norm_layer
 from mmengine.model import BaseModule
-from mmengine.utils.parrots_wrapper import _BatchNorm
+from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmocr.registry import MODELS
 

mmocr/models/kie/postprocessors/sdmgr_postprocessor.py

@@ -3,7 +3,7 @@ from typing import List, Optional, Tuple
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from torch import Tensor, nn
 
 from mmocr.registry import MODELS

mmocr/models/textdet/detectors/mmdet_wrapper.py

@@ -5,8 +5,8 @@ import cv2
 import torch
 from mmdet.structures import DetDataSample, OptSampleList
 from mmdet.structures.mask import bitmap_to_polygon
-from mmengine import InstanceData
 from mmengine.model import BaseModel
+from mmengine.structures import InstanceData
 
 from mmocr.registry import MODELS
 from mmocr.structures import TextDetDataSample

mmocr/models/textdet/postprocessors/db_postprocessor.py

@@ -4,7 +4,7 @@ from typing import Sequence
 import cv2
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from shapely.geometry import Polygon
 from torch import Tensor
 

mmocr/models/textdet/postprocessors/drrg_postprocessor.py

@@ -6,7 +6,7 @@ from typing import Dict, List, Tuple, Union
 import cv2
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from numpy import ndarray
 
 from mmocr.registry import MODELS

mmocr/models/textdet/postprocessors/fce_postprocessor.py

@@ -4,7 +4,7 @@ from typing import Dict, List, Sequence
 import cv2
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from numpy.fft import ifft
 
 from mmocr.registry import MODELS

mmocr/models/textdet/postprocessors/pan_postprocessor.py

@@ -5,7 +5,7 @@ import cv2
 import numpy as np
 import torch
 from mmcv.ops import pixel_group
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.registry import MODELS
 from mmocr.structures import TextDetDataSample

mmocr/models/textdet/postprocessors/pse_postprocessor.py

@@ -6,7 +6,7 @@ import cv2
 import numpy as np
 import torch
 from mmcv.ops import contour_expand
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.registry import MODELS
 from mmocr.structures import TextDetDataSample

mmocr/models/textdet/postprocessors/textsnake_postprocessor.py

@@ -5,7 +5,7 @@ from typing import List, Sequence
 import cv2
 import numpy as np
 import torch
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 from numpy.linalg import norm
 from skimage.morphology import skeletonize
 

mmocr/models/textrecog/encoders/satrn_encoder.py

@@ -3,7 +3,6 @@ import math
 from typing import Dict, List, Optional, Union
 
 import torch.nn as nn
-# from mmengine.model import ModuleList
 from mmengine.model import ModuleList
 from torch import Tensor
 

mmocr/models/textrecog/postprocessors/base.py

@@ -4,7 +4,7 @@ from typing import Dict, Optional, Sequence, Tuple, Union
 
 import mmengine
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.common.dictionary import Dictionary
 from mmocr.registry import TASK_UTILS

mmocr/structures/kie_data_sample.py

@@ -1,5 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmengine.data import BaseDataElement, InstanceData
+from mmengine.structures import BaseDataElement, InstanceData
 
 
 class KIEDataSample(BaseDataElement):
@@ -14,7 +14,7 @@ class KIEDataSample(BaseDataElement):
     Examples:
          >>> import torch
          >>> import numpy as np
-         >>> from mmengine.data import InstanceData
+         >>> from mmengine.structures import InstanceData
          >>> from mmocr.data import KIEDataSample
          >>> # gt_instances
          >>> data_sample = KIEDataSample()

mmocr/structures/textdet_data_sample.py

@@ -1,5 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmengine.data import BaseDataElement, InstanceData
+from mmengine.structures import BaseDataElement, InstanceData
 
 
 class TextDetDataSample(BaseDataElement):
@@ -14,7 +14,7 @@ class TextDetDataSample(BaseDataElement):
     Examples:
          >>> import torch
          >>> import numpy as np
-         >>> from mmengine.data import InstanceData
+         >>> from mmengine.structures import InstanceData
          >>> from mmocr.data import TextDetDataSample
          >>> # gt_instances
          >>> data_sample = TextDetDataSample()

mmocr/structures/textrecog_data_sample.py

@@ -1,5 +1,5 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmengine.data import BaseDataElement, LabelData
+from mmengine.structures import BaseDataElement, LabelData
 
 
 class TextRecogDataSample(BaseDataElement):
@@ -14,7 +14,7 @@ class TextRecogDataSample(BaseDataElement):
     Examples:
          >>> import torch
          >>> import numpy as np
-         >>> from mmengine.data import LabelData
+         >>> from mmengine.structures import LabelData
          >>> from mmocr.data import TextRecogDataSample
          >>> # gt_text
          >>> data_sample = TextRecogDataSample()

mmocr/testing/data.py

@@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional, Sequence
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.structures import TextDetDataSample
 

mmocr/utils/collect_env.py

@@ -1,6 +1,6 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmengine.utils import collect_env as collect_base_env
 from mmengine.utils import get_git_hash
+from mmengine.utils.dl_utils import collect_env as collect_base_env
 
 import mmocr
 

mmocr/utils/polygon_utils.py

@@ -5,7 +5,7 @@ from typing import List, Optional, Sequence, Tuple, Union
 import numpy as np
 import pyclipper
 import shapely
-from mmengine import is_list_of
+from mmengine.utils import is_list_of
 from shapely.geometry import MultiPolygon, Polygon
 
 from mmocr.utils import bbox2poly, valid_boundary

mmocr/utils/setup_env.py

@@ -2,7 +2,7 @@
 import datetime
 import warnings
 
-from mmengine import DefaultScope
+from mmengine.registry import DefaultScope
 
 
 def register_all_modules(init_default_scope: bool = True) -> None:

mmocr/visualization/textdet_visualizer.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional, Tuple, Union
 
 import mmcv
 import numpy as np
-from mmengine import Visualizer
+from mmengine.visualization import Visualizer
 
 from mmocr.registry import VISUALIZERS
 from mmocr.structures import TextDetDataSample

mmocr/visualization/textrecog_visualizer.py

@@ -4,7 +4,7 @@ from typing import Dict, Optional, Tuple, Union
 import cv2
 import mmcv
 import numpy as np
-from mmengine import Visualizer
+from mmengine.visualization import Visualizer
 
 from mmocr.registry import VISUALIZERS
 from mmocr.structures import TextRecogDataSample

tests/test_engine/test_hooks/test_visualization_hook.py

@@ -6,7 +6,7 @@ from unittest import TestCase
 from unittest.mock import Mock
 
 import torch
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.engine.hooks import VisualizationHook
 from mmocr.structures import TextDetDataSample

tests/test_evaluation/test_evaluator/test_multi_datasets_evaluator.py

@@ -5,8 +5,9 @@ from typing import Dict, List, Optional
 from unittest import TestCase
 
 import numpy as np
-from mmengine import METRICS, BaseDataElement, DefaultScope
 from mmengine.evaluator import BaseMetric
+from mmengine.registry import METRICS, DefaultScope
+from mmengine.structures import BaseDataElement
 
 from mmocr.evaluation import MultiDatasetsEvaluator
 

tests/test_evaluation/test_metrics/test_f_metric.py

@@ -2,7 +2,7 @@
 import unittest
 
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.evaluation import F1Metric
 from mmocr.structures import KIEDataSample

tests/test_evaluation/test_metrics/test_hmean_iou_metric.py

@@ -3,7 +3,7 @@ import unittest
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.evaluation import HmeanIOUMetric
 from mmocr.structures import TextDetDataSample

tests/test_evaluation/test_metrics/test_recog_metric.py

@@ -1,7 +1,7 @@
 # Copyright (c) OpenMMLab. All rights reserved.
 import unittest
 
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.evaluation import CharMetric, OneMinusNEDMetric, WordMetric
 from mmocr.structures import TextRecogDataSample

tests/test_models/test_kie/test_extractors/test_sdmgr.py

@@ -4,7 +4,8 @@ import unittest
 from os.path import dirname, exists, join
 
 import torch
-from mmengine import Config, ConfigDict, InstanceData
+from mmengine.config import Config, ConfigDict
+from mmengine.structures import InstanceData
 
 from mmocr.registry import MODELS
 from mmocr.structures import KIEDataSample

tests/test_models/test_kie/test_heads/test_sdmgr_head.py

@@ -4,7 +4,7 @@ import tempfile
 from unittest import TestCase
 
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.common.dictionary import Dictionary
 from mmocr.models.kie.heads import SDMGRHead

tests/test_models/test_kie/test_module_losses/test_sdmgr_module_loss.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.kie.module_losses import SDMGRModuleLoss
 from mmocr.structures import KIEDataSample

tests/test_models/test_kie/test_postprocessors/test_sdmgr_postprocessor.py

@@ -3,7 +3,7 @@ import copy
 from unittest import TestCase
 
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.kie.postprocessors import SDMGRPostProcessor
 from mmocr.structures import KIEDataSample

tests/test_models/test_textdet/test_detectors/test_drrg.py

@@ -6,7 +6,7 @@ from unittest import mock
 
 import numpy as np
 import torch
-from mmengine import Config, ConfigDict
+from mmengine.config import Config, ConfigDict
 
 from mmocr.registry import MODELS
 from mmocr.testing.data import create_dummy_textdet_inputs

tests/test_models/test_textdet/test_module_losses/test_db_module_loss.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.module_losses import DBModuleLoss
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textdet/test_module_losses/test_drrg_module_loss.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.module_losses import DRRGModuleLoss
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textdet/test_module_losses/test_fce_module_loss.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.module_losses import FCEModuleLoss
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textdet/test_module_losses/test_pan_module_loss.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import numpy as np
 import torch
 import torch.nn as nn
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.module_losses import PANModuleLoss
 from mmocr.models.textdet.module_losses.pan_module_loss import PANEmbLossV1

tests/test_models/test_textdet/test_module_losses/test_pse_module_loss.py

@@ -4,7 +4,7 @@ from unittest import TestCase
 import numpy as np
 import torch
 import torch.nn as nn
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from parameterized import parameterized
 
 from mmocr.models.textdet.module_losses import PSEModuleLoss

tests/test_models/test_textdet/test_module_losses/test_textsnake_module_loss.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.module_losses import TextSnakeModuleLoss
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textdet/test_postprocessors/test_base_postprocessor.py

@@ -4,7 +4,7 @@ from unittest import mock
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.postprocessors import BaseTextDetPostProcessor
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textdet/test_postprocessors/test_db_postprocessor.py

@@ -3,7 +3,7 @@ import unittest
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from parameterized import parameterized
 
 from mmocr.models.textdet.postprocessors import DBPostprocessor

tests/test_models/test_textdet/test_postprocessors/test_drrg_postprocessor.py

@@ -3,7 +3,7 @@ import unittest
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.models.textdet.postprocessors import DRRGPostprocessor
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textdet/test_postprocessors/test_fce_postprocessor.py

@@ -3,7 +3,7 @@ import unittest
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from parameterized import parameterized
 
 from mmocr.models.textdet.postprocessors import FCEPostprocessor

tests/test_models/test_textdet/test_postprocessors/test_textsnake_postprocessor.py

@@ -4,7 +4,7 @@ import unittest
 
 import numpy as np
 import torch
-from mmengine import InstanceData
+from mmengine.structures import InstanceData
 from parameterized import parameterized
 
 from mmocr.models.textdet.postprocessors import TextSnakePostprocessor

tests/test_models/test_textdet/test_wrappers/test_mmdet_wrapper.py

@@ -5,7 +5,7 @@ import torch
 from mmdet.structures import DetDataSample
 from mmdet.testing import demo_mm_inputs
 from mmengine.config import Config
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.registry import MODELS
 from mmocr.structures import TextDetDataSample

tests/test_models/test_textrecog/test_decoders/test_master_decoder.py

@@ -4,7 +4,7 @@ import tempfile
 from unittest import TestCase
 
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.textrecog.decoders import MasterDecoder
 from mmocr.structures import TextRecogDataSample

tests/test_models/test_textrecog/test_decoders/test_nrtr_decoder.py

@@ -4,7 +4,7 @@ import tempfile
 from unittest import TestCase
 
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.textrecog.decoders import NRTRDecoder
 from mmocr.structures import TextRecogDataSample

tests/test_models/test_textrecog/test_decoders/test_position_attention_decoder.py

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

tests/test_models/test_textrecog/test_decoders/test_robust_scanner_fuser.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.textrecog.decoders import (PositionAttentionDecoder,
                                              RobustScannerFuser,

tests/test_models/test_textrecog/test_decoders/test_sar_decoder.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.textrecog.decoders import (ParallelSARDecoder,
                                              SequentialSARDecoder)

tests/test_models/test_textrecog/test_decoders/test_sequence_attention_decoder.py

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

tests/test_models/test_textrecog/test_module_losses/test_abi_module_loss.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.textrecog.module_losses import ABIModuleLoss
 from mmocr.structures import TextRecogDataSample

tests/test_models/test_textrecog/test_module_losses/test_base_recog_module_loss.py

@@ -5,7 +5,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.common.dictionary import Dictionary
 from mmocr.models.textrecog.module_losses import BaseTextRecogModuleLoss

tests/test_models/test_textrecog/test_module_losses/test_ce_module_loss.py

@@ -2,7 +2,7 @@
 from unittest import TestCase
 
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.textrecog.module_losses import CEModuleLoss
 from mmocr.structures import TextRecogDataSample

tests/test_models/test_textrecog/test_module_losses/test_ctc_module_loss.py

@@ -4,7 +4,7 @@ import tempfile
 from unittest import TestCase
 
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.models.common.dictionary import Dictionary
 from mmocr.models.textrecog.module_losses import CTCModuleLoss

tests/test_structures/test_kie_data_sample.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.structures import KIEDataSample
 

tests/test_structures/test_textdet_data_sample.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.structures import TextDetDataSample
 

tests/test_structures/test_textrecog_data_sample.py

@@ -3,7 +3,7 @@ from unittest import TestCase
 
 import numpy as np
 import torch
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.structures import TextRecogDataSample
 

tests/test_visualization/test_textdet_visualizer.py

@@ -6,7 +6,7 @@ import unittest
 import cv2
 import numpy as np
 import torch
-from mmengine.data import InstanceData
+from mmengine.structures import InstanceData
 
 from mmocr.structures import TextDetDataSample
 from mmocr.utils import bbox2poly

tests/test_visualization/test_textrecog_visualizer.py

@@ -5,7 +5,7 @@ import unittest
 
 import cv2
 import numpy as np
-from mmengine.data import LabelData
+from mmengine.structures import LabelData
 
 from mmocr.structures import TextRecogDataSample
 from mmocr.visualization import TextRecogLocalVisualizer

tools/analysis_tools/browse_dataset.py

@@ -3,7 +3,7 @@ import argparse
 import os.path as osp
 
 import mmengine
-from mmengine import Config, DictAction
+from mmengine.config import Config, DictAction
 
 from mmocr.registry import DATASETS, VISUALIZERS
 from mmocr.utils import register_all_modules

tools/analysis_tools/offline_eval.py

@@ -3,7 +3,7 @@ import argparse
 import json
 
 import mmengine
-from mmengine import Config, DictAction
+from mmengine.config import Config, DictAction
 from mmengine.evaluator import Evaluator
 
 from mmocr.registry import DATASETS