[refactor] move tests/models/base.py -> mmaction/testing/_utils.py

open-mmlab · Nov 25, 2022 · 40381ce · 40381ce
1 parent 71f6e4f
commit 40381ce
Show file tree

Hide file tree

Showing 29 changed files with 41 additions and 39 deletions.
diff --git a/mmaction/testing/__init__.py b/mmaction/testing/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (c) OpenMMLab. All rights reserved.
+from ._utils import (check_norm_state, generate_backbone_demo_inputs,
+                     generate_detector_demo_inputs, generate_gradcam_inputs,
+                     generate_recognizer_demo_inputs, get_audio_recognizer_cfg,
+                     get_cfg, get_detector_cfg, get_localizer_cfg,
+                     get_recognizer_cfg, get_skeletongcn_cfg)
+
+__all__ = [
+    'check_norm_state', 'generate_backbone_demo_inputs',
+    'generate_recognizer_demo_inputs', 'generate_gradcam_inputs', 'get_cfg',
+    'get_recognizer_cfg', 'get_audio_recognizer_cfg', 'get_localizer_cfg',
+    'get_detector_cfg', 'generate_detector_demo_inputs', 'get_skeletongcn_cfg'
+]
diff --git a/tests/models/base.py → mmaction/testing/_utils.py b/tests/models/base.py → mmaction/testing/_utils.py
diff --git a/tests/models/__init__.py b/tests/models/__init__.py
diff --git a/tests/models/backbones/test_agcn.py b/tests/models/backbones/test_agcn.py
@@ -2,7 +2,7 @@
 import torch
 
 from mmaction.models import AGCN
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_AGCN_backbone():

diff --git a/tests/models/backbones/test_c2d.py b/tests/models/backbones/test_c2d.py
@@ -2,7 +2,7 @@
 import torch
 
 from mmaction.models import C2D
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_c2d_backbone():

diff --git a/tests/models/backbones/test_c3d.py b/tests/models/backbones/test_c3d.py
@@ -2,7 +2,7 @@
 import torch
 
 from mmaction.models import C3D
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_c3d_backbone():

diff --git a/tests/models/backbones/test_mobilenet_v2.py b/tests/models/backbones/test_mobilenet_v2.py
@@ -4,7 +4,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import MobileNetV2
-from ..base import check_norm_state, generate_backbone_demo_inputs
+from mmaction.testing import check_norm_state, generate_backbone_demo_inputs
 
 
 def test_mobilenetv2_backbone():

diff --git a/tests/models/backbones/test_mobilenet_v2_tsm.py b/tests/models/backbones/test_mobilenet_v2_tsm.py
@@ -2,7 +2,7 @@
 import torch
 
 from mmaction.models import MobileNetV2TSM
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_mobilenetv2_tsm_backbone():

diff --git a/tests/models/backbones/test_resnet.py b/tests/models/backbones/test_resnet.py
@@ -5,7 +5,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import ResNet
-from ..base import check_norm_state, generate_backbone_demo_inputs
+from mmaction.testing import check_norm_state, generate_backbone_demo_inputs
 
 
 def test_resnet_backbone():

diff --git a/tests/models/backbones/test_resnet2plus1d.py b/tests/models/backbones/test_resnet2plus1d.py
@@ -4,7 +4,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import ResNet2Plus1d
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_resnet2plus1d_backbone():

diff --git a/tests/models/backbones/test_resnet3d.py b/tests/models/backbones/test_resnet3d.py
@@ -7,7 +7,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import ResNet3d, ResNet3dLayer
-from ..base import check_norm_state, generate_backbone_demo_inputs
+from mmaction.testing import check_norm_state, generate_backbone_demo_inputs
 
 
 @pytest.mark.skipif(platform.system() == 'Windows', reason='Windows mem limit')

diff --git a/tests/models/backbones/test_resnet3d_csn.py b/tests/models/backbones/test_resnet3d_csn.py
@@ -5,7 +5,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import ResNet3dCSN
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_resnet_csn_backbone():

diff --git a/tests/models/backbones/test_resnet3d_slowfast.py b/tests/models/backbones/test_resnet3d_slowfast.py
@@ -4,7 +4,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import ResNet3dSlowFast
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_slowfast_backbone():

diff --git a/tests/models/backbones/test_resnet3d_slowonly.py b/tests/models/backbones/test_resnet3d_slowonly.py
@@ -3,7 +3,7 @@
 import torch
 
 from mmaction.models import ResNet3dSlowOnly
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_slowonly_backbone():

diff --git a/tests/models/backbones/test_resnet_audio.py b/tests/models/backbones/test_resnet_audio.py
@@ -2,7 +2,7 @@
 import torch
 
 from mmaction.models import ResNetAudio
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_resnet_audio_backbone():

diff --git a/tests/models/backbones/test_resnet_tin.py b/tests/models/backbones/test_resnet_tin.py
@@ -4,7 +4,7 @@
 import torch.nn as nn
 
 from mmaction.models import ResNetTIN
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 @pytest.mark.skipif(

diff --git a/tests/models/backbones/test_resnet_tsm.py b/tests/models/backbones/test_resnet_tsm.py
@@ -7,7 +7,7 @@
 
 from mmaction.models import ResNetTSM
 from mmaction.models.backbones.resnet_tsm import NL3DWrapper
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_resnet_tsm_backbone():

diff --git a/tests/models/backbones/test_stgcn.py b/tests/models/backbones/test_stgcn.py
@@ -2,7 +2,7 @@
 import torch
 
 from mmaction.models import STGCN
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_stgcn_backbone():

diff --git a/tests/models/backbones/test_swin.py b/tests/models/backbones/test_swin.py
@@ -3,7 +3,7 @@
 import torch
 
 from mmaction.models import SwinTransformer3D
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_swin_backbone():

diff --git a/tests/models/backbones/test_tanet.py b/tests/models/backbones/test_tanet.py
@@ -3,7 +3,7 @@
 import torch
 
 from mmaction.models import TANet
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_tanet_backbone():

diff --git a/tests/models/backbones/test_timesformer.py b/tests/models/backbones/test_timesformer.py
@@ -3,7 +3,7 @@
 import torch
 
 from mmaction.models import TimeSformer
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def test_timesformer_backbone():

diff --git a/tests/models/backbones/test_x3d.py b/tests/models/backbones/test_x3d.py
@@ -4,7 +4,7 @@
 from mmengine.utils.dl_utils.parrots_wrapper import _BatchNorm
 
 from mmaction.models import X3D
-from ..base import check_norm_state, generate_backbone_demo_inputs
+from mmaction.testing import check_norm_state, generate_backbone_demo_inputs
 
 
 def test_x3d_backbone():

diff --git a/tests/models/localizers/test_bmn.py b/tests/models/localizers/test_bmn.py
@@ -9,8 +9,8 @@
 
 from mmaction.registry import MODELS
 from mmaction.structures import ActionDataSample
+from mmaction.testing import get_localizer_cfg
 from mmaction.utils import register_all_modules
-from ..base import get_localizer_cfg
 
 register_all_modules()
 

diff --git a/tests/models/localizers/test_pem.py b/tests/models/localizers/test_pem.py
@@ -8,8 +8,8 @@
 
 from mmaction.registry import MODELS
 from mmaction.structures import ActionDataSample
+from mmaction.testing import get_localizer_cfg
 from mmaction.utils import register_all_modules
-from ..base import get_localizer_cfg
 
 register_all_modules()
 

diff --git a/tests/models/localizers/test_tem.py b/tests/models/localizers/test_tem.py
@@ -9,8 +9,8 @@
 
 from mmaction.registry import MODELS
 from mmaction.structures import ActionDataSample
+from mmaction.testing import get_localizer_cfg
 from mmaction.utils import register_all_modules
-from ..base import get_localizer_cfg
 
 register_all_modules()
 

diff --git a/tests/models/necks/test_tpn.py b/tests/models/necks/test_tpn.py
@@ -7,7 +7,7 @@
 
 from mmaction.models import TPN
 from mmaction.structures import ActionDataSample
-from ..base import generate_backbone_demo_inputs
+from mmaction.testing import generate_backbone_demo_inputs
 
 
 def get_label(label_):

diff --git a/tests/models/recognizers/test_recognizer2d.py b/tests/models/recognizers/test_recognizer2d.py
@@ -2,8 +2,9 @@
 import torch
 
 from mmaction.registry import MODELS
+from mmaction.testing import (generate_recognizer_demo_inputs,
+                              get_recognizer_cfg)
 from mmaction.utils import register_all_modules
-from ..base import generate_recognizer_demo_inputs, get_recognizer_cfg
 
 
 def test_tsn():

diff --git a/tests/models/recognizers/test_recognizer3d.py b/tests/models/recognizers/test_recognizer3d.py
@@ -5,8 +5,8 @@
 
 from mmaction.registry import MODELS
 from mmaction.structures import ActionDataSample
+from mmaction.testing import get_recognizer_cfg
 from mmaction.utils import register_all_modules
-from ..base import get_recognizer_cfg
 
 
 def train_test_step(cfg, input_shape):

diff --git a/tests/models/recognizers/test_recognizer_gcn.py b/tests/models/recognizers/test_recognizer_gcn.py
@@ -2,8 +2,9 @@
 import torch
 
 from mmaction.registry import MODELS
+from mmaction.testing import (generate_recognizer_demo_inputs,
+                              get_skeletongcn_cfg)
 from mmaction.utils import register_all_modules
-from ..base import generate_recognizer_demo_inputs, get_skeletongcn_cfg
 
 
 def test_recognizer_gcn():