clean optimizer code (#2947)

* clean optimizer code * remove duplicate test optimizer * fix test_config error
open-mmlab · Jun 8, 2020 · b5de202 · b5de202
1 parent a04a482
commit b5de202
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 678 deletions.
diff --git a/mmdet/apis/train.py b/mmdet/apis/train.py
@@ -5,10 +5,10 @@
 import torch
 import torch.distributed as dist
 from mmcv.parallel import MMDataParallel, MMDistributedDataParallel
-from mmcv.runner import DistSamplerSeedHook, OptimizerHook, Runner
+from mmcv.runner import (DistSamplerSeedHook, OptimizerHook, Runner,
+                         build_optimizer)
 
-from mmdet.core import (DistEvalHook, EvalHook, Fp16OptimizerHook,
-                        build_optimizer)
+from mmdet.core import DistEvalHook, EvalHook, Fp16OptimizerHook
 from mmdet.datasets import build_dataloader, build_dataset
 from mmdet.utils import get_root_logger
 

diff --git a/mmdet/core/__init__.py b/mmdet/core/__init__.py
@@ -3,6 +3,5 @@
 from .evaluation import *  # noqa: F401, F403
 from .fp16 import *  # noqa: F401, F403
 from .mask import *  # noqa: F401, F403
-from .optimizer import *  # noqa: F401, F403
 from .post_processing import *  # noqa: F401, F403
 from .utils import *  # noqa: F401, F403
diff --git a/mmdet/core/optimizer/__init__.py b/mmdet/core/optimizer/__init__.py
diff --git a/mmdet/core/optimizer/builder.py b/mmdet/core/optimizer/builder.py
diff --git a/mmdet/core/optimizer/copy_of_sgd.py b/mmdet/core/optimizer/copy_of_sgd.py
diff --git a/mmdet/core/optimizer/default_constructor.py b/mmdet/core/optimizer/default_constructor.py
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -1,9 +1,9 @@
 from os.path import dirname, exists, join, relpath
 
 import torch
+from mmcv.runner import build_optimizer
 
 from mmdet.core import BitmapMasks, PolygonMasks
-from mmdet.core.optimizer import build_optimizer
 
 
 def _get_config_directory():