Improve unittest coverage and minor fix

mmaction/apis/inference.py

@@ -91,6 +91,7 @@ def inference_recognizer(model, video_path, label_path, use_frames=False):
         data = dict(
             frame_dir=video_path,
             total_frames=len(os.listdir(video_path)),
+            # assuming files in ``video_path`` are all named with ``filename_tmpl``  # noqa: E501
             label=-1,
             filename_tmpl=filename_tmpl,
             modality=modality)

tests/test_models/test_inference.py

@@ -5,23 +5,33 @@
 
 from mmaction.apis import inference_recognizer, init_recognizer
 
-config_file = 'configs/recognition/tsn/tsn_r50_video_inference_1x1x3_100e_kinetics400_rgb.py'  # noqa: E501
+video_config_file = 'configs/recognition/tsn/tsn_r50_video_inference_1x1x3_100e_kinetics400_rgb.py'  # noqa: E501
+frame_config_file = 'configs/recognition/tsn/tsn_r50_inference_1x1x3_100e_kinetics400_rgb.py'  # noqa: E501
 label_path = 'demo/label_map.txt'
 video_path = 'demo/demo.mp4'
 
 
 def test_init_recognizer():
     with pytest.raises(TypeError):
+        # config must be a filename or Config object
         init_recognizer(dict(config_file=None))
 
+    with pytest.raises(RuntimeError):
+        # input data type should be consist with the dataset type
+        init_recognizer(frame_config_file)
+
+    with pytest.raises(RuntimeError):
+        # input data type should be consist with the dataset type
+        init_recognizer(video_config_file, use_frames=True)
+
     if torch.cuda.is_available():
         device = 'cuda:0'
     else:
         device = 'cpu'
 
-    model = init_recognizer(config_file, None, device)
+    model = init_recognizer(video_config_file, None, device)
 
-    config = mmcv.Config.fromfile(config_file)
+    config = mmcv.Config.fromfile(video_config_file)
     config.model.backbone.pretrained = None
 
     isinstance(model, nn.Module)
@@ -37,7 +47,19 @@ def test_inference_recognizer():
         device = 'cuda:0'
     else:
         device = 'cpu'
-    model = init_recognizer(config_file, None, device)
+    model = init_recognizer(video_config_file, None, device)
+
+    with pytest.raises(RuntimeError):
+        # video path doesn't exist
+        inference_recognizer(model, 'missing.mp4', label_path)
+
+    with pytest.raises(RuntimeError):
+        # ``video_path`` should be consist with the ``use_frames``
+        inference_recognizer(model, video_path, label_path, use_frames=True)
+
+    with pytest.raises(RuntimeError):
+        # ``video_path`` should be consist with the ``use_frames``
+        inference_recognizer(model, 'demo/', label_path)
 
     for ops in model.cfg.data.test.pipeline:
         if ops['type'] == 'TenCrop':

tools/data/kinetics400/download_annotations.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 DATA_DIR="../../../data/kinetics400/annotations"
 

tools/data/kinetics400/download_videos.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 # set up environment
 conda env create -f environment.yml

tools/data/kinetics400/extract_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/kinetics400/videos_train/ ../../data/kinetics400/rawframes_train/ --level 2 --flow-type tvl1 --ext mp4 --task both  --new-width 340 --new-height 256

tools/data/kinetics400/extract_rgb_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/kinetics400/videos_train/ ../../data/kinetics400/rawframes_train/ --level 2  --ext mp4 --task rgb  --new-width 340 --new-height 256

tools/data/kinetics400/extract_rgb_frames_opencv.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/kinetics400/videos_train/ ../../data/kinetics400/rawframes_train/ --level 2  --ext mp4 --task rgb --new-width 340 --new-height 256 --use-opencv

tools/data/kinetics400/generate_rawframes_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py kinetics400 data/kinetics400/rawframes_train/ --level 2 --format rawframes --num-split 1 --subset train --shuffle

tools/data/kinetics400/generate_videos_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py kinetics400 data/kinetics400/videos_train/ --level 2 --format videos --num-split 1 --subset train --shuffle

tools/data/kinetics400/rename_classnames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 # Rename classname for convenience
 cd ../../../data/kinetics400/

tools/data/mit/download_data.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 DATA_DIR="../../../data/mit/"
 

tools/data/mit/extract_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/mit/videos/training ../../data/mit/rawframes/training/ --level 2 --flow-type tvl1 --ext mp4 --task both

tools/data/mit/extract_rgb_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/mit/videos/training ../../data/mit/rawframes/training/ --level 2 --ext mp4 --task rgb

tools/data/mit/extract_rgb_frames_opencv.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/mit/videos/training ../../data/mit/rawframes/training/ --level 2 --ext mp4 --task rgb --use-opencv

tools/data/mit/generate_rawframes_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py mit data/mit/rawframes/training/ --level 2 --format rawframes --num-split 1 --subset train --shuffle

tools/data/mit/generate_videos_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py mit data/mit/videos/training/ --level 2 --format videos --num-split 1 --subset train --shuffle

tools/data/mmit/extract_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/mmit/videos/ ../../../data/mmit/rawframes/ --task both --level 2 --flow-type tvl1 --ext mp4

tools/data/mmit/extract_rgb_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/mmit/videos/ ../../data/mmit/rawframes/ --task rgb --level 2 --ext mp4

tools/data/mmit/extract_rgb_frames_opencv.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/mmit/videos/ ../../data/mmit/rawframes/ --task rgb --level 2 --ext mp4 --use-opencv

tools/data/mmit/generate_rawframes_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py mmit data/mmit/rawframes/ --level 2 --format rawframes --num-split 1 --subset train --shuffle

tools/data/mmit/generate_videos_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py mmit data/mmit/videos/ --level 2 --format videos --num-split 1 --subset train --shuffle

tools/data/sthv1/extract_flow.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/sthv1/rawframes/ ../../data/sthv1/rawframes/ --task flow --level 1 --flow-type tvl1 --input-frames

tools/data/sthv1/generate_rawframes_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py sthv1 data/sthv1/rawframes/ --num-split 1 --level 1 --subset train --format rawframe --shuffle

tools/data/sthv2/extract_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/sthv2/videos/ ../../data/sthv2/rawframes/ --task both --level 1 --flow-type tvl1 --ext webm

tools/data/sthv2/extract_rgb_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/sthv2/videos/ ../../data/sthv2/rawframes/ --task rgb --level 1  --ext webm

tools/data/sthv2/extract_rgb_frames_opencv.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/sthv2/videos/ ../../data/sthv2/rawframes/ --task rgb --level 1 --ext webm --use-opencv

tools/data/sthv2/generate_rawframes_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py sthv2 data/sthv2/rawframes/ --num-split 1 --level 1 --subset train --format rawframe --shuffle

tools/data/sthv2/generate_videos_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 PYTHONPATH=. python tools/data/build_file_list.py sthv2 data/sthv2/videos/ --num-split 1 --level 1 --subset train --format videos --shuffle

tools/data/thumos14/download_annotations.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 DATA_DIR="../../../data/thumos14/"
 

tools/data/thumos14/download_videos.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 DATA_DIR="../../../data/thumos14/"
 

tools/data/thumos14/extract_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/thumos14/videos/validation/ ../../data/thumos14/rawframes/validation/ --level 1 --flow-type tvl1 --ext mp4 --task both

tools/data/thumos14/extract_rgb_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/thumos14/videos/validation/ ../../data/thumos14/rawframes/validation/ --level 1 --ext mp4 --task rgb

tools/data/thumos14/extract_rgb_frames_opencv.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/thumos14/videos/validation/ ../../data/thumos14/rawframes/validation/ --level 1 --ext mp4 --task rgb --use-opencv

tools/data/thumos14/fetch_tag_proposals.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 PROP_DIR="../../../data/thumos14/proposals"
 

tools/data/ucf101/download_annotations.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 DATA_DIR="../../../data/ucf101/annotations"
 

tools/data/ucf101/download_videos.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 DATA_DIR="../../../data/ucf101/"
 

tools/data/ucf101/extract_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/ucf101/videos/ ../../data/ucf101/rawframes/ --task both --level 2 --flow-type tvl1

tools/data/ucf101/extract_rgb_frames.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/ucf101/videos/ ../../data/ucf101/rawframes/ --task rgb --level 2  --ext avi

tools/data/ucf101/extract_rgb_frames_opencv.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../
 python build_rawframes.py ../../data/ucf101/videos/ ../../data/ucf101/rawframes/ --task rgb --level 2 --ext avi --use-opencv

tools/data/ucf101/generate_rawframes_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../
 

tools/data/ucf101/generate_videos_filelist.sh

@@ -1,4 +1,4 @@
-#! /usr/bin/bash env
+#!/usr/bin/env bash
 
 cd ../../../