rename data to structures (#1854)

mmseg/apis/inference.py

@@ -8,9 +8,9 @@ from mmcv.runner import load_checkpoint
 from mmengine import Config
 from mmengine.dataset import Compose
 
-from mmseg.data import SegDataSample
 from mmseg.models import BaseSegmentor
 from mmseg.registry import MODELS
+from mmseg.structures import SegDataSample
 from mmseg.utils import SampleList
 from mmseg.visualization import SegLocalVisualizer
 

mmseg/datasets/transforms/formatting.py

@@ -5,8 +5,8 @@ from mmcv.transforms import to_tensor
 from mmcv.transforms.base import BaseTransform
 from mmengine.data import PixelData
 
-from mmseg.data import SegDataSample
 from mmseg.registry import TRANSFORMS
+from mmseg.structures import SegDataSample
 
 
 @TRANSFORMS.register_module()

mmseg/engine/hooks/visualization_hook.py

@@ -7,8 +7,8 @@ import mmcv
 from mmengine.hooks import Hook
 from mmengine.runner import Runner
 
-from mmseg.data import SegDataSample
 from mmseg.registry import HOOKS
+from mmseg.structures import SegDataSample
 from mmseg.visualization import SegLocalVisualizer
 
 

mmseg/models/decode_heads/decode_head.py

@@ -7,8 +7,8 @@ import torch.nn as nn
 from mmengine.model import BaseModule
 from torch import Tensor
 
-from mmseg.data import build_pixel_sampler
 from mmseg.ops import resize
+from mmseg.structures import build_pixel_sampler
 from mmseg.utils import ConfigType, SampleList
 from ..builder import build_loss
 from ..losses import accuracy

mmseg/models/decode_heads/stdc_head.py

@@ -4,8 +4,8 @@ import torch.nn.functional as F
 from mmengine.data import PixelData
 from torch import Tensor
 
-from mmseg.data import SegDataSample
 from mmseg.registry import MODELS
+from mmseg.structures import SegDataSample
 from mmseg.utils import SampleList
 from .fcn_head import FCNHead
 

mmseg/models/segmentors/base.py

@@ -6,8 +6,8 @@ from mmengine.data import PixelData
 from mmengine.model import BaseModel
 from torch import Tensor
 
-from mmseg.data import SegDataSample
 from mmseg.ops import resize
+from mmseg.structures import SegDataSample
 from mmseg.utils import (ForwardResults, OptConfigType, OptMultiConfig,
                          OptSampleList, SampleList)
 

mmseg/utils/set_env.py

@@ -16,11 +16,11 @@ def register_all_modules(init_default_scope: bool = True) -> None:
             to https://github.com/open-mmlab/mmengine/blob/main/docs/en/tutorials/registry.md
             Defaults to True.
     """  # noqa
-    import mmseg.data  # noqa: F401,F403
     import mmseg.datasets  # noqa: F401,F403
     import mmseg.engine  # noqa: F401,F403
     import mmseg.evaluation  # noqa: F401,F403
     import mmseg.models  # noqa: F401,F403
+    import mmseg.structures  # noqa: F401,F403
 
     if init_default_scope:
         never_created = DefaultScope.get_current_instance() is None \

mmseg/utils/typing.py

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Sequence, Tuple, Union
 import torch
 from mmengine.config import ConfigDict
 
-from mmseg.data import SegDataSample
+from mmseg.structures import SegDataSample
 
 # Type hint of config data
 ConfigType = Union[ConfigDict, dict]

mmseg/visualization/local_visualizer.py

@@ -6,8 +6,8 @@ from mmengine import Visualizer
 from mmengine.data import PixelData
 from mmengine.dist import master_only
 
-from mmseg.data import SegDataSample
 from mmseg.registry import VISUALIZERS
+from mmseg.structures import SegDataSample
 
 
 @VISUALIZERS.register_module()

tests/test_data/test_seg_data_sample.py

@@ -6,7 +6,7 @@ import pytest
 import torch
 from mmengine.data import PixelData
 
-from mmseg.data import SegDataSample
+from mmseg.structures import SegDataSample
 
 
 def _equal(a, b):

tests/test_datasets/test_formatting.py

@@ -6,8 +6,8 @@ import unittest
 import numpy as np
 from mmengine.data import BaseDataElement
 
-from mmseg.data import SegDataSample
 from mmseg.datasets.transforms import PackSegInputs
+from mmseg.structures import SegDataSample
 
 
 class TestPackSegInputs(unittest.TestCase):

tests/test_engine/test_visualization_hook.py

@@ -5,8 +5,8 @@ from unittest.mock import Mock
 import torch
 from mmengine.data import PixelData
 
-from mmseg.data import SegDataSample
 from mmseg.engine.hooks import SegVisualizationHook
+from mmseg.structures import SegDataSample
 from mmseg.visualization import SegLocalVisualizer
 
 

tests/test_evaluation/test_citys_metric.py

@@ -5,8 +5,8 @@ import numpy as np
 import torch
 from mmengine.data import BaseDataElement, PixelData
 
-from mmseg.data import SegDataSample
 from mmseg.evaluation import CitysMetric
+from mmseg.structures import SegDataSample
 
 
 class TestCitysMetric(TestCase):

tests/test_evaluation/test_iou_metric.py

@@ -5,8 +5,8 @@ import numpy as np
 import torch
 from mmengine.data import BaseDataElement, PixelData
 
-from mmseg.data import SegDataSample
 from mmseg.evaluation import IoUMetric
+from mmseg.structures import SegDataSample
 
 
 class TestIoUMetric(TestCase):

tests/test_models/test_data_preprocessor.py

@@ -4,8 +4,8 @@ from unittest import TestCase
 import torch
 from mmengine.data import PixelData
 
-from mmseg.data import SegDataSample
 from mmseg.models import SegDataPreProcessor
+from mmseg.structures import SegDataSample
 
 
 class TestSegDataPreProcessor(TestCase):

tests/test_models/test_forward.py

@@ -13,7 +13,7 @@ from mmcv.cnn.utils import revert_sync_batchnorm
 from mmengine.data import PixelData
 from torch import Tensor
 
-from mmseg.data import SegDataSample
+from mmseg.structures import SegDataSample
 from mmseg.utils import register_all_modules
 
 register_all_modules()

tests/test_sampler.py

@@ -2,8 +2,8 @@
 import pytest
 import torch
 
-from mmseg.data import OHEMPixelSampler
 from mmseg.models.decode_heads import FCNHead
+from mmseg.structures import OHEMPixelSampler
 
 
 def _context_for_ohem():

tests/test_visualization/test_local_visualizer.py

@@ -10,7 +10,7 @@ import numpy as np
 import torch
 from mmengine.data import PixelData
 
-from mmseg.data import SegDataSample
+from mmseg.structures import SegDataSample
 from mmseg.visualization import SegLocalVisualizer