Npu dev (#2306)

* fix autocast bugs on npu * using scatter_kwargs in mmcv.device.scatter_gather
open-mmlab · Sep 29, 2022 · a043541 · a043541
1 parent 9b0133c
commit a043541
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 88 deletions.
diff --git a/mmcv/device/npu/_functions.py b/mmcv/device/npu/_functions.py
diff --git a/mmcv/device/npu/data_parallel.py b/mmcv/device/npu/data_parallel.py
@@ -5,8 +5,8 @@
 
 import torch
 
+from mmcv.device.scatter_gather import scatter_kwargs
 from mmcv.parallel import MMDataParallel
-from .scatter_gather import scatter_kwargs
 
 
 def _check_balance(*args, **kwargs):
@@ -19,7 +19,7 @@ def _check_balance(*args, **kwargs):
 # _check_balance function in DataParallel to make initialization pass.
 for m in sys.modules:
     if m.startswith('torch') or 'mmcv' in m:
-        if getattr(sys.modules[m], '_check_balance', None) is not None:
+        if hasattr(sys.modules[m], '_check_balance'):
             setattr(sys.modules[m], '_check_balance', _check_balance)
 
 

diff --git a/mmcv/device/npu/distributed.py b/mmcv/device/npu/distributed.py
@@ -1,8 +1,8 @@
 # Copyright Huawei Technologies Co., Ltd. All rights reserved.
 # Copyright (c) OpenMMLab. All rights reserved.
 
+from mmcv.device.scatter_gather import scatter_kwargs
 from mmcv.parallel import MMDistributedDataParallel
-from .scatter_gather import scatter_kwargs
 
 
 class NPUDistributedDataParallel(MMDistributedDataParallel):

diff --git a/mmcv/device/npu/scatter_gather.py b/mmcv/device/npu/scatter_gather.py