mmdet.nn.parallel -> mmdet.core.parallel

mmdet/core/__init__.py

@@ -3,5 +3,6 @@ from .bbox_ops import *
 from .mask_ops import *
 from .losses import *
 from .eval import *
+from .parallel import *
 from .post_processing import *
 from .utils import *

mmdet/nn/parallel/scatter_gather.py → mmdet/core/parallel/scatter_gather.py

 import torch
-from ._functions import Scatter
 from torch.nn.parallel._functions import Scatter as OrigScatter
+
+from ._functions import Scatter
 from mmdet.datasets.utils import DataContainer
 
 

mmdet/core/utils/hooks.py

@@ -7,11 +7,11 @@ import mmcv
 import numpy as np
 import torch
 from mmcv.torchpack import Hook
-from mmdet.datasets.loader import collate
-from mmdet.nn.parallel import scatter
 from pycocotools.cocoeval import COCOeval
 
 from ..eval import eval_recalls
+from ..parallel import scatter
+from mmdet.datasets.loader import collate
 
 
 class EmptyCacheHook(Hook):

mmdet/nn/__init__.py

-from .parallel import MMDataParallel, MMDistributedDataParallel

tools/test.py

@@ -5,10 +5,9 @@ import mmcv
 from mmcv.torchpack import load_checkpoint, parallel_test, obj_from_dict
 
 from mmdet import datasets
-from mmdet.core import results2json, coco_eval
+from mmdet.core import scatter, MMDataParallel, results2json, coco_eval
 from mmdet.datasets.loader import collate, build_dataloader
 from mmdet.models import build_detector, detectors
-from mmdet.nn.parallel import scatter, MMDataParallel
 
 
 def single_test(model, data_loader, show=False):

tools/train.py

@@ -8,10 +8,10 @@ from mmcv import Config
 from mmcv.torchpack import Runner, obj_from_dict
 
 from mmdet import datasets
-from mmdet.core import init_dist, DistOptimizerHook, DistSamplerSeedHook
+from mmdet.core import (init_dist, DistOptimizerHook, DistSamplerSeedHook,
+                        MMDataParallel, MMDistributedDataParallel)
 from mmdet.datasets.loader import build_dataloader
 from mmdet.models import build_detector
-from mmdet.nn.parallel import MMDataParallel, MMDistributedDataParallel
 
 
 def parse_losses(losses):