From 4de57b49c5a38dc5dc20d37a5d76c3f6a953a655 Mon Sep 17 00:00:00 2001 From: Miao Zheng <76149310+MeowZheng@users.noreply.github.com> Date: Thu, 21 Jul 2022 22:44:42 +0800 Subject: [PATCH] [Fix] Fix register_all_modules and imports (#1793) * [Fix] Fix register_all_modules and imports * fix transforms import --- mmseg/datasets/__init__.py | 15 +++++++++------ mmseg/datasets/transforms/__init__.py | 19 +++++-------------- mmseg/engine/__init__.py | 7 +++++++ mmseg/evaluation/__init__.py | 4 ++++ mmseg/{ => evaluation}/metrics/__init__.py | 0 .../{ => evaluation}/metrics/citys_metric.py | 0 mmseg/{ => evaluation}/metrics/iou_metric.py | 0 mmseg/utils/set_env.py | 2 +- tests/test_datasets/test_dataset.py | 8 ++++---- tests/test_datasets/test_dataset_builder.py | 3 ++- tests/test_datasets/test_transform.py | 3 +++ .../test_citys_metric.py | 2 +- .../test_iou_metric.py | 2 +- tools/browse_dataset.py | 2 +- 14 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 mmseg/engine/__init__.py create mode 100644 mmseg/evaluation/__init__.py rename mmseg/{ => evaluation}/metrics/__init__.py (100%) rename mmseg/{ => evaluation}/metrics/citys_metric.py (100%) rename mmseg/{ => evaluation}/metrics/iou_metric.py (100%) rename tests/{test_metrics => test_evaluation}/test_citys_metric.py (99%) rename tests/{test_metrics => test_evaluation}/test_iou_metric.py (98%) diff --git a/mmseg/datasets/__init__.py b/mmseg/datasets/__init__.py index 626f0e398..b56515279 100644 --- a/mmseg/datasets/__init__.py +++ b/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', - 'TRANSFORMS', 'CityscapesDataset', 'PascalVOCDataset', 'ADE20KDataset', + 'CustomDataset', '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' ] diff --git a/mmseg/datasets/transforms/__init__.py b/mmseg/datasets/transforms/__init__.py index ec6d67916..e0feb5536 100644 --- a/mmseg/datasets/transforms/__init__.py +++ b/mmseg/datasets/transforms/__init__.py @@ -1,21 +1,12 @@ # Copyright (c) OpenMMLab. All rights reserved. -from mmcv.transforms import (LoadImageFromFile, MultiScaleFlipAug, Normalize, - Pad, RandomChoiceResize, RandomFlip, RandomResize, - Resize) - -from .compose import Compose -from .formatting import (ImageToTensor, PackSegInputs, ToDataContainer, - Transpose) +from .formatting import PackSegInputs 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', 'LoadImageFromFile', 'RandomFlip', 'Pad', 'RandomCrop', - 'Normalize', 'SegRescale', 'PhotoMetricDistortion', 'RandomRotate', - 'AdjustGamma', 'CLAHE', 'Rerange', 'RGB2Gray', 'RandomCutOut', - 'RandomMosaic', 'PackSegInputs', 'Resize', 'RandomResize', - 'RandomChoiceResize', 'MultiScaleFlipAug' + 'LoadAnnotations', 'RandomCrop', 'SegRescale', 'PhotoMetricDistortion', + 'RandomRotate', 'AdjustGamma', 'CLAHE', 'Rerange', 'RGB2Gray', + 'RandomCutOut', 'RandomMosaic', 'PackSegInputs', 'ResizeToMultiple' ] diff --git a/mmseg/engine/__init__.py b/mmseg/engine/__init__.py new file mode 100644 index 000000000..36a88d71f --- /dev/null +++ b/mmseg/engine/__init__.py @@ -0,0 +1,7 @@ +# Copyright (c) OpenMMLab. All rights reserved. +from .optimizers import (LayerDecayOptimizerConstructor, + LearningRateDecayOptimizerConstructor) + +__all__ = [ + 'LearningRateDecayOptimizerConstructor', 'LayerDecayOptimizerConstructor' +] diff --git a/mmseg/evaluation/__init__.py b/mmseg/evaluation/__init__.py new file mode 100644 index 000000000..c28bb75cb --- /dev/null +++ b/mmseg/evaluation/__init__.py @@ -0,0 +1,4 @@ +# Copyright (c) OpenMMLab. All rights reserved. +from .metrics import CitysMetric, IoUMetric + +__all__ = ['IoUMetric', 'CitysMetric'] diff --git a/mmseg/metrics/__init__.py b/mmseg/evaluation/metrics/__init__.py similarity index 100% rename from mmseg/metrics/__init__.py rename to mmseg/evaluation/metrics/__init__.py diff --git a/mmseg/metrics/citys_metric.py b/mmseg/evaluation/metrics/citys_metric.py similarity index 100% rename from mmseg/metrics/citys_metric.py rename to mmseg/evaluation/metrics/citys_metric.py diff --git a/mmseg/metrics/iou_metric.py b/mmseg/evaluation/metrics/iou_metric.py similarity index 100% rename from mmseg/metrics/iou_metric.py rename to mmseg/evaluation/metrics/iou_metric.py diff --git a/mmseg/utils/set_env.py b/mmseg/utils/set_env.py index 1063a8a73..082a495db 100644 --- a/mmseg/utils/set_env.py +++ b/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: diff --git a/tests/test_datasets/test_dataset.py b/tests/test_datasets/test_dataset.py index f8c7e0336..4b4750fca 100644 --- a/tests/test_datasets/test_dataset.py +++ b/tests/test_datasets/test_dataset.py @@ -6,10 +6,10 @@ from unittest.mock import MagicMock import pytest -from mmseg.datasets import (DATASETS, ADE20KDataset, CityscapesDataset, - COCOStuffDataset, CustomDataset, ISPRSDataset, - LoveDADataset, PascalVOCDataset, PotsdamDataset, - iSAIDDataset) +from mmseg.datasets import (ADE20KDataset, CityscapesDataset, COCOStuffDataset, + CustomDataset, ISPRSDataset, LoveDADataset, + PascalVOCDataset, PotsdamDataset, iSAIDDataset) +from mmseg.registry import DATASETS from mmseg.utils import get_classes, get_palette diff --git a/tests/test_datasets/test_dataset_builder.py b/tests/test_datasets/test_dataset_builder.py index 7954f3a1a..d48801aea 100644 --- a/tests/test_datasets/test_dataset_builder.py +++ b/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() diff --git a/tests/test_datasets/test_transform.py b/tests/test_datasets/test_transform.py index 727ef8fed..fac21f2a8 100644 --- a/tests/test_datasets/test_transform.py +++ b/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(): diff --git a/tests/test_metrics/test_citys_metric.py b/tests/test_evaluation/test_citys_metric.py similarity index 99% rename from tests/test_metrics/test_citys_metric.py rename to tests/test_evaluation/test_citys_metric.py index 5a67bc07c..2c5827d84 100644 --- a/tests/test_metrics/test_citys_metric.py +++ b/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): diff --git a/tests/test_metrics/test_iou_metric.py b/tests/test_evaluation/test_iou_metric.py similarity index 98% rename from tests/test_metrics/test_iou_metric.py rename to tests/test_evaluation/test_iou_metric.py index 5f4a7522d..3bda595bd 100644 --- a/tests/test_metrics/test_iou_metric.py +++ b/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): diff --git a/tools/browse_dataset.py b/tools/browse_dataset.py index 64fe69585..4a62a8a49 100644 --- a/tools/browse_dataset.py +++ b/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():