Merge branch 'skeleton_demo' of https://github.com/Dai-Wenxun/mmaction2…

… into skeleton_demo
open-mmlab · Sep 15, 2022 · c5d6ea1 · c5d6ea1
2 parents fbe0db9 + 819f209
commit c5d6ea1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/mmaction/apis/inference.py b/mmaction/apis/inference.py
@@ -6,7 +6,6 @@
 import numpy as np
 import torch
 import torch.nn as nn
-from torchvision.transforms import Compose
 from mmengine.dataset import Compose, pseudo_collate
 from mmengine.runner import load_checkpoint
 from mmengine.utils import track_iter_progress
@@ -48,11 +47,10 @@ def init_recognizer(config: Union[str, Path, mmengine.Config],
     return model
 
 
-def inference_recognizer(
-        model: nn.Module,
-        video: Union[str, dict],
-        test_pipeline: Optional[Compose] = None
-) -> ActionDataSample:
+def inference_recognizer(model: nn.Module,
+                         video: Union[str, dict],
+                         test_pipeline: Optional[Compose] = None
+                         ) -> ActionDataSample:
     """Inference a video with the recognizer.
 
     Args:

diff --git a/tests/apis/test_inference.py b/tests/apis/test_inference.py
@@ -1,15 +1,14 @@
 # Copyright (c) OpenMMLab. All rights reserved.
-import pytest
 import os.path as osp
-import torch
-import torch.nn as nn
 from pathlib import Path
 from unittest import TestCase
+
+import torch
 from parameterized import parameterized
 
 from mmaction.apis import inference_recognizer, init_recognizer
-from mmaction.utils import register_all_modules
 from mmaction.structures import ActionDataSample
+from mmaction.utils import register_all_modules
 
 
 class TestInference(TestCase):
@@ -19,7 +18,8 @@ def setUp(self):
 
     @parameterized.expand([(('configs/recognition/tsn/'
                              'tsn_imagenet-pretrained-r50_8xb32-'
-                             '1x1x3-100e_kinetics400-rgb.py'), ('cpu', 'cuda'))])
+                             '1x1x3-100e_kinetics400-rgb.py'), ('cpu', 'cuda'))
+                           ])
     def test_init_recognizer(self, config, devices):
         project_dir = osp.abspath(osp.dirname(osp.dirname(__file__)))
         project_dir = osp.join(project_dir, '..')
@@ -44,8 +44,8 @@ def test_init_recognizer(self, config, devices):
 
     @parameterized.expand([(('configs/recognition/tsn/'
                              'tsn_imagenet-pretrained-r50_8xb32-'
-                             '1x1x3-100e_kinetics400-rgb.py'),
-                            'demo/demo.mp4', ('cpu', 'cuda'))])
+                             '1x1x3-100e_kinetics400-rgb.py'), 'demo/demo.mp4',
+                            ('cpu', 'cuda'))])
     def test_inference_recognizer(self, config, video_path, devices):
         project_dir = osp.abspath(osp.dirname(osp.dirname(__file__)))
         project_dir = osp.join(project_dir, '..')