[Fix] Fix register_all_modules and imports (#1793)

* [Fix] Fix register_all_modules and imports

* fix transforms import

mmseg/datasets/__init__.py

@@ -1,7 +1,4 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmengine.dataset import ConcatDataset, RepeatDataset
-
-from mmseg.registry import DATASETS, TRANSFORMS
 from .ade import ADE20KDataset
 from .chase_db1 import ChaseDB1Dataset
 from .cityscapes import CityscapesDataset
@@ -18,13 +15,19 @@ from .night_driving import NightDrivingDataset
 from .pascal_context import PascalContextDataset, PascalContextDataset59
 from .potsdam import PotsdamDataset
 from .stare import STAREDataset
+from .transforms import (CLAHE, AdjustGamma, LoadAnnotations, PackSegInputs,
+                         PhotoMetricDistortion, RandomCrop, RandomCutOut,
+                         RandomMosaic, RandomRotate, Rerange, ResizeToMultiple,
+                         RGB2Gray, SegRescale)
 from .voc import PascalVOCDataset
 
 __all__ = [
-    'CustomDataset', 'ConcatDataset', 'RepeatDataset', 'DATASETS',
+    'CustomDataset', 'CityscapesDataset', 'PascalVOCDataset', 'ADE20KDataset',
-    'TRANSFORMS', 'CityscapesDataset', 'PascalVOCDataset', 'ADE20KDataset',
     'PascalContextDataset', 'PascalContextDataset59', 'ChaseDB1Dataset',
     'DRIVEDataset', 'HRFDataset', 'STAREDataset', 'DarkZurichDataset',
     'NightDrivingDataset', 'COCOStuffDataset', 'LoveDADataset',
-    'MultiImageMixDataset', 'iSAIDDataset', 'ISPRSDataset', 'PotsdamDataset'
+    'MultiImageMixDataset', 'iSAIDDataset', 'ISPRSDataset', 'PotsdamDataset',
+    'LoadAnnotations', 'RandomCrop', 'SegRescale', 'PhotoMetricDistortion',
+    'RandomRotate', 'AdjustGamma', 'CLAHE', 'Rerange', 'RGB2Gray',
+    'RandomCutOut', 'RandomMosaic', 'PackSegInputs', 'ResizeToMultiple'
 ]

mmseg/datasets/transforms/__init__.py

@@ -1,21 +1,12 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-from mmcv.transforms import (LoadImageFromFile, MultiScaleFlipAug, Normalize,
+from .formatting import PackSegInputs
-                             Pad, RandomChoiceResize, RandomFlip, RandomResize,
-                             Resize)
-
-from .compose import Compose
-from .formatting import (ImageToTensor, PackSegInputs, ToDataContainer,
-                         Transpose)
 from .loading import LoadAnnotations
 from .transforms import (CLAHE, AdjustGamma, PhotoMetricDistortion, RandomCrop,
                          RandomCutOut, RandomMosaic, RandomRotate, Rerange,
-                         RGB2Gray, SegRescale)
+                         ResizeToMultiple, RGB2Gray, SegRescale)
 
 __all__ = [
-    'Compose', 'ImageToTensor', 'ToDataContainer', 'Transpose',
+    'LoadAnnotations', 'RandomCrop', 'SegRescale', 'PhotoMetricDistortion',
-    'LoadAnnotations', 'LoadImageFromFile', 'RandomFlip', 'Pad', 'RandomCrop',
+    'RandomRotate', 'AdjustGamma', 'CLAHE', 'Rerange', 'RGB2Gray',
-    'Normalize', 'SegRescale', 'PhotoMetricDistortion', 'RandomRotate',
+    'RandomCutOut', 'RandomMosaic', 'PackSegInputs', 'ResizeToMultiple'
-    'AdjustGamma', 'CLAHE', 'Rerange', 'RGB2Gray', 'RandomCutOut',
-    'RandomMosaic', 'PackSegInputs', 'Resize', 'RandomResize',
-    'RandomChoiceResize', 'MultiScaleFlipAug'
 ]

mmseg/engine/__init__.py

@@ -0,0 +1,7 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+from .optimizers import (LayerDecayOptimizerConstructor,
+                         LearningRateDecayOptimizerConstructor)
+
+__all__ = [
+    'LearningRateDecayOptimizerConstructor', 'LayerDecayOptimizerConstructor'
+]

mmseg/evaluation/__init__.py

@@ -0,0 +1,4 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+from .metrics import CitysMetric, IoUMetric
+
+__all__ = ['IoUMetric', 'CitysMetric']

mmseg/utils/set_env.py

@@ -19,7 +19,7 @@ def register_all_modules(init_default_scope: bool = True) -> None:
     import mmseg.data  # noqa: F401,F403
     import mmseg.datasets  # noqa: F401,F403
     import mmseg.engine  # noqa: F401,F403
-    import mmseg.metrics  # noqa: F401,F403
+    import mmseg.evaluation  # noqa: F401,F403
     import mmseg.models  # noqa: F401,F403
 
     if init_default_scope:

tests/test_datasets/test_dataset.py

@@ -6,10 +6,10 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from mmseg.datasets import (DATASETS, ADE20KDataset, CityscapesDataset,
+from mmseg.datasets import (ADE20KDataset, CityscapesDataset, COCOStuffDataset,
-                            COCOStuffDataset, CustomDataset, ISPRSDataset,
+                            CustomDataset, ISPRSDataset, LoveDADataset,
-                            LoveDADataset, PascalVOCDataset, PotsdamDataset,
+                            PascalVOCDataset, PotsdamDataset, iSAIDDataset)
-                            iSAIDDataset)
+from mmseg.registry import DATASETS
 from mmseg.utils import get_classes, get_palette
 
 

tests/test_datasets/test_dataset_builder.py

@@ -3,7 +3,8 @@ import os.path as osp
 
 from mmengine.dataset import ConcatDataset, RepeatDataset
 
-from mmseg.datasets import DATASETS, MultiImageMixDataset
+from mmseg.datasets import MultiImageMixDataset
+from mmseg.registry import DATASETS
 from mmseg.utils import register_all_modules
 
 register_all_modules()

tests/test_datasets/test_transform.py

@@ -9,6 +9,9 @@ from PIL import Image
 
 from mmseg.datasets.transforms import PhotoMetricDistortion, RandomCrop
 from mmseg.registry import TRANSFORMS
+from mmseg.utils import register_all_modules
+
+register_all_modules()
 
 
 def test_resize():

tests/test_evaluation/test_citys_metric.py

@@ -6,7 +6,7 @@ import torch
 from mmengine.data import BaseDataElement, PixelData
 
 from mmseg.data import SegDataSample
-from mmseg.metrics import CitysMetric
+from mmseg.evaluation import CitysMetric
 
 
 class TestCitysMetric(TestCase):

tests/test_evaluation/test_iou_metric.py

@@ -6,7 +6,7 @@ import torch
 from mmengine.data import BaseDataElement, PixelData
 
 from mmseg.data import SegDataSample
-from mmseg.metrics import IoUMetric
+from mmseg.evaluation import IoUMetric
 
 
 class TestIoUMetric(TestCase):

tools/browse_dataset.py

@@ -8,7 +8,7 @@ import mmcv
 import numpy as np
 from mmcv import Config, DictAction
 
-from mmseg.datasets import DATASETS
+from mmseg.registry import DATASETS
 
 
 def parse_args():