open-mmlab · innerlee · Jan 27, 2021 · Jan 22, 2021 · Jan 22, 2021 · Jan 22, 2021
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Install PyTorch
         run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
       - name: Install MMCV
-        run: pip install mmcv-full==1.2.4 -f https://download.openmmlab.com/mmcv/dist/cpu/torch${{matrix.torch}}/index.html
+        run: pip install mmcv-full==1.2.6 -f https://download.openmmlab.com/mmcv/dist/cpu/torch${{matrix.torch}}/index.html
       - name: Install MMDet
         run: pip install git+https://github.com/open-mmlab/mmdetection/
       - name: Install unittest dependencies
@@ -138,7 +138,7 @@ jobs:
         run: pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
       - name: Install mmaction dependencies
         run: |
-          pip install mmcv-full==1.2.4 -f https://download.openmmlab.com/mmcv/dist/${{matrix.mmcv}}/index.html
+          pip install mmcv-full==1.2.6 -f https://download.openmmlab.com/mmcv/dist/${{matrix.mmcv}}/index.html
           pip install -q git+https://github.com/open-mmlab/mmdetection/
           pip install -r requirements.txt
       - name: Build and install

diff --git a/.gitignore b/.gitignore
@@ -119,3 +119,9 @@ work_dirs/
 
 # Profile
 *.prof
+
+# unignore some data file in tests/data
+!tests/data/**/*.pkl
+!tests/data/**/*.pkl.json
+!tests/data/**/*.log.json
+!tests/data/**/*.pth
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -11,6 +11,7 @@
 **Improvements**
 
 - Support setting `max_testing_views` for extremely large models to save GPU memory used ([#511](https://github.com/open-mmlab/mmaction2/pull/511))
+- Refactor unit test structure ([#433](https://github.com/open-mmlab/mmaction2/pull/433))
 - Add repo citation ([#545](https://github.com/open-mmlab/mmaction2/pull/545))
 
 **Bug and Typo Fixes**

diff --git a/mmaction/models/backbones/resnet3d.py b/mmaction/models/backbones/resnet3d.py
@@ -66,7 +66,7 @@ def __init__(self,
         super().__init__()
         assert style in ['pytorch', 'caffe']
         # make sure that only ``inflate_style`` is passed into kwargs
-        assert set(kwargs.keys()).issubset(['inflate_style'])
+        assert set(kwargs).issubset(['inflate_style'])
 
         self.inplanes = inplanes
         self.planes = planes

diff --git a/...ata/test_activitynet_features/v_test1.csv → tests/data/activitynet_features/v_test1.csv b/...ata/test_activitynet_features/v_test1.csv → tests/data/activitynet_features/v_test1.csv
diff --git a/...ata/test_activitynet_features/v_test2.csv → tests/data/activitynet_features/v_test2.csv b/...ata/test_activitynet_features/v_test2.csv → tests/data/activitynet_features/v_test2.csv
diff --git a/tests/data/action_test_anno.json → tests/data/annotations/action_test_anno.json b/tests/data/action_test_anno.json → tests/data/annotations/action_test_anno.json
diff --git a/tests/data/audio_feature_test_list.txt → ...a/annotations/audio_feature_test_list.txt b/tests/data/audio_feature_test_list.txt → ...a/annotations/audio_feature_test_list.txt
diff --git a/tests/data/audio_test_list.txt → tests/data/annotations/audio_test_list.txt b/tests/data/audio_test_list.txt → tests/data/annotations/audio_test_list.txt
diff --git a/tests/data/hvu_frame_test_anno.json → ...data/annotations/hvu_frame_test_anno.json b/tests/data/hvu_frame_test_anno.json → ...data/annotations/hvu_frame_test_anno.json
@@ -1,6 +1,6 @@
 [
   {
-    "frame_dir":"test_imgs",
+    "frame_dir":"imgs",
     "total_frames":5,
     "label":{
         "concept":[250, 131, 42, 51, 57, 155, 122],
@@ -11,7 +11,7 @@
     }
   },
   {
-    "frame_dir":"test_imgs",
+    "frame_dir":"imgs",
     "total_frames":5,
     "label":{
         "concept":[250, 131, 42, 51, 57, 155, 122],

diff --git a/tests/data/hvu_video_eval_test_anno.json → ...annotations/hvu_video_eval_test_anno.json b/tests/data/hvu_video_eval_test_anno.json → ...annotations/hvu_video_eval_test_anno.json
diff --git a/tests/data/hvu_video_test_anno.json → ...data/annotations/hvu_video_test_anno.json b/tests/data/hvu_video_test_anno.json → ...data/annotations/hvu_video_test_anno.json
diff --git a/tests/data/proposal_normalized_list.txt → .../annotations/proposal_normalized_list.txt b/tests/data/proposal_normalized_list.txt → .../annotations/proposal_normalized_list.txt
@@ -1,5 +1,5 @@
 # 0
-test_imgs
+imgs
 5
 1
 2

diff --git a/tests/data/proposal_test_list.txt → ...s/data/annotations/proposal_test_list.txt b/tests/data/proposal_test_list.txt → ...s/data/annotations/proposal_test_list.txt
@@ -1,5 +1,5 @@
 # 0
-test_imgs
+imgs
 5
 1
 2

diff --git a/tests/data/annotations/rawframe_test_list.txt b/tests/data/annotations/rawframe_test_list.txt
@@ -0,0 +1,2 @@
+imgs 5 127
+imgs 5 127
diff --git a/tests/data/annotations/rawframe_test_list_multi_label.txt b/tests/data/annotations/rawframe_test_list_multi_label.txt
@@ -0,0 +1,2 @@
+imgs 5 1
+imgs 5 3 5
diff --git a/tests/data/annotations/rawframe_test_list_with_offset.txt b/tests/data/annotations/rawframe_test_list_with_offset.txt
@@ -0,0 +1,2 @@
+imgs 2 5 127
+imgs 2 5 127
diff --git a/tests/data/rawvideo_test_anno.json → .../data/annotations/rawvideo_test_anno.json b/tests/data/rawvideo_test_anno.json → .../data/annotations/rawvideo_test_anno.json
@@ -1,6 +1,6 @@
 [
   {
-    "video_dir":"test_rawvideo_dataset",
+    "video_dir":"rawvideo_dataset",
     "label":1,
     "num_clips":2,
     "positive_clip_inds":[0]

diff --git a/tests/data/annotations/rawvideo_test_anno.txt b/tests/data/annotations/rawvideo_test_anno.txt
@@ -0,0 +1 @@
+rawvideo_dataset 1 2 0
diff --git a/tests/data/video_test_list.txt → tests/data/annotations/video_test_list.txt b/tests/data/video_test_list.txt → tests/data/annotations/video_test_list.txt
diff --git a/...ataset/ava_excluded_timestamps_sample.csv → ...ataset/ava_excluded_timestamps_sample.csv b/...ataset/ava_excluded_timestamps_sample.csv → ...ataset/ava_excluded_timestamps_sample.csv
diff --git a/...test_ava_dataset/ava_proposals_sample.pkl → ...data/ava_dataset/ava_proposals_sample.pkl b/...test_ava_dataset/ava_proposals_sample.pkl → ...data/ava_dataset/ava_proposals_sample.pkl
diff --git a/tests/data/test_ava_dataset/ava_sample.csv → tests/data/ava_dataset/ava_sample.csv b/tests/data/test_ava_dataset/ava_sample.csv → tests/data/ava_dataset/ava_sample.csv
diff --git a/tests/data/test_bsp_features/v_test1.npy → tests/data/bsp_features/v_test1.npy b/tests/data/test_bsp_features/v_test1.npy → tests/data/bsp_features/v_test1.npy
diff --git a/.../data/test_eval_detection/action_list.txt → tests/data/eval_detection/action_list.txt b/.../data/test_eval_detection/action_list.txt → tests/data/eval_detection/action_list.txt
diff --git a/tests/data/test_eval_detection/gt.csv → tests/data/eval_detection/gt.csv b/tests/data/test_eval_detection/gt.csv → tests/data/eval_detection/gt.csv
diff --git a/tests/data/test_eval_detection/pred.csv → tests/data/eval_detection/pred.csv b/tests/data/test_eval_detection/pred.csv → tests/data/eval_detection/pred.csv
diff --git a/tests/data/test_eval_detection/proposal.pkl → tests/data/eval_detection/proposal.pkl b/tests/data/test_eval_detection/proposal.pkl → tests/data/eval_detection/proposal.pkl
diff --git a/tests/data/test_eval_localization/gt.json → tests/data/eval_localization/gt.json b/tests/data/test_eval_localization/gt.json → tests/data/eval_localization/gt.json
diff --git a/...s/data/test_eval_localization/result.json → tests/data/eval_localization/result.json b/...s/data/test_eval_localization/result.json → tests/data/eval_localization/result.json
diff --git a/tests/data/frame_test_list.txt b/tests/data/frame_test_list.txt
diff --git a/tests/data/frame_test_list_multi_label.txt b/tests/data/frame_test_list_multi_label.txt
diff --git a/tests/data/frame_test_list_with_offset.txt b/tests/data/frame_test_list_with_offset.txt
diff --git a/tests/data/test_imgs/img_00001.jpg → tests/data/imgs/img_00001.jpg b/tests/data/test_imgs/img_00001.jpg → tests/data/imgs/img_00001.jpg
diff --git a/tests/data/test_imgs/img_00002.jpg → tests/data/imgs/img_00002.jpg b/tests/data/test_imgs/img_00002.jpg → tests/data/imgs/img_00002.jpg
diff --git a/tests/data/test_imgs/img_00003.jpg → tests/data/imgs/img_00003.jpg b/tests/data/test_imgs/img_00003.jpg → tests/data/imgs/img_00003.jpg
diff --git a/tests/data/test_imgs/img_00004.jpg → tests/data/imgs/img_00004.jpg b/tests/data/test_imgs/img_00004.jpg → tests/data/imgs/img_00004.jpg
diff --git a/tests/data/test_imgs/img_00005.jpg → tests/data/imgs/img_00005.jpg b/tests/data/test_imgs/img_00005.jpg → tests/data/imgs/img_00005.jpg
diff --git a/tests/data/test_imgs/img_00006.jpg → tests/data/imgs/img_00006.jpg b/tests/data/test_imgs/img_00006.jpg → tests/data/imgs/img_00006.jpg
diff --git a/tests/data/test_imgs/img_00007.jpg → tests/data/imgs/img_00007.jpg b/tests/data/test_imgs/img_00007.jpg → tests/data/imgs/img_00007.jpg
diff --git a/tests/data/test_imgs/img_00008.jpg → tests/data/imgs/img_00008.jpg b/tests/data/test_imgs/img_00008.jpg → tests/data/imgs/img_00008.jpg
diff --git a/tests/data/test_imgs/img_00009.jpg → tests/data/imgs/img_00009.jpg b/tests/data/test_imgs/img_00009.jpg → tests/data/imgs/img_00009.jpg
diff --git a/tests/data/test_imgs/img_00010.jpg → tests/data/imgs/img_00010.jpg b/tests/data/test_imgs/img_00010.jpg → tests/data/imgs/img_00010.jpg
diff --git a/tests/data/test_imgs/x_00001.jpg → tests/data/imgs/x_00001.jpg b/tests/data/test_imgs/x_00001.jpg → tests/data/imgs/x_00001.jpg
diff --git a/tests/data/test_imgs/x_00002.jpg → tests/data/imgs/x_00002.jpg b/tests/data/test_imgs/x_00002.jpg → tests/data/imgs/x_00002.jpg
diff --git a/tests/data/test_imgs/x_00003.jpg → tests/data/imgs/x_00003.jpg b/tests/data/test_imgs/x_00003.jpg → tests/data/imgs/x_00003.jpg
diff --git a/tests/data/test_imgs/x_00004.jpg → tests/data/imgs/x_00004.jpg b/tests/data/test_imgs/x_00004.jpg → tests/data/imgs/x_00004.jpg
diff --git a/tests/data/test_imgs/x_00005.jpg → tests/data/imgs/x_00005.jpg b/tests/data/test_imgs/x_00005.jpg → tests/data/imgs/x_00005.jpg
diff --git a/tests/data/test_imgs/y_00001.jpg → tests/data/imgs/y_00001.jpg b/tests/data/test_imgs/y_00001.jpg → tests/data/imgs/y_00001.jpg
diff --git a/tests/data/test_imgs/y_00002.jpg → tests/data/imgs/y_00002.jpg b/tests/data/test_imgs/y_00002.jpg → tests/data/imgs/y_00002.jpg
diff --git a/tests/data/test_imgs/y_00003.jpg → tests/data/imgs/y_00003.jpg b/tests/data/test_imgs/y_00003.jpg → tests/data/imgs/y_00003.jpg
diff --git a/tests/data/test_imgs/y_00004.jpg → tests/data/imgs/y_00004.jpg b/tests/data/test_imgs/y_00004.jpg → tests/data/imgs/y_00004.jpg
diff --git a/tests/data/test_imgs/y_00005.jpg → tests/data/imgs/y_00005.jpg b/tests/data/test_imgs/y_00005.jpg → tests/data/imgs/y_00005.jpg
diff --git a/tests/data/test_proposals/v_test1.csv → tests/data/proposals/v_test1.csv b/tests/data/test_proposals/v_test1.csv → tests/data/proposals/v_test1.csv
diff --git a/tests/data/test_proposals/v_test2.csv → tests/data/proposals/v_test2.csv b/tests/data/test_proposals/v_test2.csv → tests/data/proposals/v_test2.csv
diff --git a/tests/data/test_rawvideo_dataset/part_0.mp4 → tests/data/rawvideo_dataset/part_0.mp4 b/tests/data/test_rawvideo_dataset/part_0.mp4 → tests/data/rawvideo_dataset/part_0.mp4
diff --git a/tests/data/test_rawvideo_dataset/part_1.mp4 → tests/data/rawvideo_dataset/part_1.mp4 b/tests/data/test_rawvideo_dataset/part_1.mp4 → tests/data/rawvideo_dataset/part_1.mp4
diff --git a/tests/data/rawvideo_test_anno.txt b/tests/data/rawvideo_test_anno.txt
diff --git a/tests/data/test_tem_results/v_test1.csv → tests/data/tem_results/v_test1.csv b/tests/data/test_tem_results/v_test1.csv → tests/data/tem_results/v_test1.csv
diff --git a/tests/data/test_tem_results/v_test2.csv → tests/data/tem_results/v_test2.csv b/tests/data/test_tem_results/v_test2.csv → tests/data/tem_results/v_test2.csv