diff --git a/mmseg/apis/inference.py b/mmseg/apis/inference.py index d26b1c87a..ac88f295b 100644 --- a/mmseg/apis/inference.py +++ b/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 diff --git a/mmseg/datasets/transforms/formatting.py b/mmseg/datasets/transforms/formatting.py index 6f4c9318a..4f343c3d4 100644 --- a/mmseg/datasets/transforms/formatting.py +++ b/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() diff --git a/mmseg/engine/hooks/visualization_hook.py b/mmseg/engine/hooks/visualization_hook.py index d03235340..bc368e5b5 100644 --- a/mmseg/engine/hooks/visualization_hook.py +++ b/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 diff --git a/mmseg/models/decode_heads/decode_head.py b/mmseg/models/decode_heads/decode_head.py index b4a5ce258..5889bd673 100644 --- a/mmseg/models/decode_heads/decode_head.py +++ b/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 diff --git a/mmseg/models/decode_heads/stdc_head.py b/mmseg/models/decode_heads/stdc_head.py index 615b85818..644b829bd 100644 --- a/mmseg/models/decode_heads/stdc_head.py +++ b/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 diff --git a/mmseg/models/segmentors/base.py b/mmseg/models/segmentors/base.py index 1798c9386..586f718b6 100644 --- a/mmseg/models/segmentors/base.py +++ b/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) diff --git a/mmseg/data/__init__.py b/mmseg/structures/__init__.py similarity index 100% rename from mmseg/data/__init__.py rename to mmseg/structures/__init__.py diff --git a/mmseg/data/sampler/__init__.py b/mmseg/structures/sampler/__init__.py similarity index 100% rename from mmseg/data/sampler/__init__.py rename to mmseg/structures/sampler/__init__.py diff --git a/mmseg/data/sampler/base_pixel_sampler.py b/mmseg/structures/sampler/base_pixel_sampler.py similarity index 100% rename from mmseg/data/sampler/base_pixel_sampler.py rename to mmseg/structures/sampler/base_pixel_sampler.py diff --git a/mmseg/data/sampler/builder.py b/mmseg/structures/sampler/builder.py similarity index 100% rename from mmseg/data/sampler/builder.py rename to mmseg/structures/sampler/builder.py diff --git a/mmseg/data/sampler/ohem_pixel_sampler.py b/mmseg/structures/sampler/ohem_pixel_sampler.py similarity index 100% rename from mmseg/data/sampler/ohem_pixel_sampler.py rename to mmseg/structures/sampler/ohem_pixel_sampler.py diff --git a/mmseg/data/seg_data_sample.py b/mmseg/structures/seg_data_sample.py similarity index 100% rename from mmseg/data/seg_data_sample.py rename to mmseg/structures/seg_data_sample.py diff --git a/mmseg/utils/set_env.py b/mmseg/utils/set_env.py index 082a495db..c948950d6 100644 --- a/mmseg/utils/set_env.py +++ b/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 \ diff --git a/mmseg/utils/typing.py b/mmseg/utils/typing.py index 4f148dc71..fba7d3b92 100644 --- a/mmseg/utils/typing.py +++ b/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] diff --git a/mmseg/visualization/local_visualizer.py b/mmseg/visualization/local_visualizer.py index df7ba9a4c..6cd707bad 100644 --- a/mmseg/visualization/local_visualizer.py +++ b/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() diff --git a/tests/test_data/test_seg_data_sample.py b/tests/test_data/test_seg_data_sample.py index 9bf5b476d..92ec04f72 100644 --- a/tests/test_data/test_seg_data_sample.py +++ b/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): diff --git a/tests/test_datasets/test_formatting.py b/tests/test_datasets/test_formatting.py index 87f96037e..539c200b3 100644 --- a/tests/test_datasets/test_formatting.py +++ 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): diff --git a/tests/test_engine/test_visualization_hook.py b/tests/test_engine/test_visualization_hook.py index ce7ca35f0..076caf8c7 100644 --- a/tests/test_engine/test_visualization_hook.py +++ b/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 diff --git a/tests/test_evaluation/test_citys_metric.py b/tests/test_evaluation/test_citys_metric.py index 2c5827d84..f59b97211 100644 --- a/tests/test_evaluation/test_citys_metric.py +++ b/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): diff --git a/tests/test_evaluation/test_iou_metric.py b/tests/test_evaluation/test_iou_metric.py index 3bda595bd..78f3f2e5a 100644 --- a/tests/test_evaluation/test_iou_metric.py +++ b/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): diff --git a/tests/test_models/test_data_preprocessor.py b/tests/test_models/test_data_preprocessor.py index 4472e4367..6bc350cd2 100644 --- a/tests/test_models/test_data_preprocessor.py +++ b/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): diff --git a/tests/test_models/test_forward.py b/tests/test_models/test_forward.py index 57b9d31b9..c03d701b3 100644 --- a/tests/test_models/test_forward.py +++ b/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() diff --git a/tests/test_sampler.py b/tests/test_sampler.py index 12490ef3c..322be9579 100644 --- a/tests/test_sampler.py +++ b/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(): diff --git a/tests/test_visualization/test_local_visualizer.py b/tests/test_visualization/test_local_visualizer.py index 7b94ec223..f41e2b3fa 100644 --- a/tests/test_visualization/test_local_visualizer.py +++ b/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