Merge d9af6b0 into 1b15f02

open-mmlab · Jun 25, 2021 · 6843309 · 6843309
2 parents 1b15f02 + d9af6b0
commit 6843309
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/mmcv/cnn/bricks/norm.py b/mmcv/cnn/bricks/norm.py
@@ -106,7 +106,7 @@ def build_norm_layer(cfg, num_features, postfix=''):
     cfg_.setdefault('eps', 1e-5)
     if layer_type != 'GN':
         layer = norm_layer(num_features, **cfg_)
-        if layer_type == 'SyncBN':
+        if layer_type == 'SyncBN' and hasattr(layer, '_specify_ddp_gpu_num'):
             layer._specify_ddp_gpu_num(1)
     else:
         assert 'num_groups' in cfg_

diff --git a/mmcv/utils/parrots_wrapper.py b/mmcv/utils/parrots_wrapper.py
@@ -82,10 +82,6 @@ def _get_norm():
 
 class SyncBatchNorm(SyncBatchNorm_):
 
-    def _specify_ddp_gpu_num(self, gpu_size):
-        if TORCH_VERSION != 'parrots':
-            super()._specify_ddp_gpu_num(gpu_size)
-
     def _check_input_dim(self, input):
         if TORCH_VERSION == 'parrots':
             if input.dim() < 2: