BC

open-mmlab · Jan 27, 2021 · cbfbf82 · cbfbf82
1 parent 9923cdf
commit cbfbf82
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/configs/detection/ava/slowfast_context_kinetics_pretrained_r50_4x16x1_20e_ava_rgb.py b/configs/detection/ava/slowfast_context_kinetics_pretrained_r50_4x16x1_20e_ava_rgb.py
@@ -159,7 +159,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/configs/detection/ava/slowfast_kinetics_pretrained_r50_4x16x1_20e_ava_rgb.py b/configs/detection/ava/slowfast_kinetics_pretrained_r50_4x16x1_20e_ava_rgb.py
@@ -158,7 +158,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/configs/detection/ava/slowfast_kinetics_pretrained_r50_8x8x1_20e_ava_rgb.py b/configs/detection/ava/slowfast_kinetics_pretrained_r50_8x8x1_20e_ava_rgb.py
@@ -158,7 +158,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/configs/detection/ava/slowonly_kinetics_pretrained_r101_8x8x1_20e_ava_rgb.py b/configs/detection/ava/slowonly_kinetics_pretrained_r101_8x8x1_20e_ava_rgb.py
@@ -143,7 +143,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/configs/detection/ava/slowonly_kinetics_pretrained_r50_4x16x1_20e_ava_rgb.py b/configs/detection/ava/slowonly_kinetics_pretrained_r50_4x16x1_20e_ava_rgb.py
@@ -142,7 +142,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/configs/detection/ava/slowonly_omnisource_pretrained_r101_8x8x1_20e_ava_rgb.py b/configs/detection/ava/slowonly_omnisource_pretrained_r101_8x8x1_20e_ava_rgb.py
@@ -142,7 +142,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/configs/detection/ava/slowonly_omnisource_pretrained_r50_4x16x1_20e_ava_rgb.py b/configs/detection/ava/slowonly_omnisource_pretrained_r50_4x16x1_20e_ava_rgb.py
@@ -143,7 +143,7 @@
 total_epochs = 20
 checkpoint_config = dict(interval=1)
 workflow = [('train', 1)]
-evaluation = dict(interval=1, key_indicator='[email protected]')
+evaluation = dict(interval=1, save_best='[email protected]')
 log_config = dict(
     interval=20, hooks=[
         dict(type='TextLoggerHook'),

diff --git a/mmaction/core/evaluation/eval_hooks.py b/mmaction/core/evaluation/eval_hooks.py
@@ -63,6 +63,13 @@ def __init__(self,
                  save_best=None,
                  rule=None,
                  **eval_kwargs):
+        if 'key_indicator' in eval_kwargs:
+            raise RuntimeError(
+                '"key_indicator" is deprecated, '
+                'you need to use "save_best" instead. '
+                'See https://github.com/open-mmlab/mmaction2/pull/395 for more info'  # noqa: E501
+            )
+
         if not isinstance(dataloader, DataLoader):
             raise TypeError(f'dataloader must be a pytorch DataLoader, '
                             f'but got {type(dataloader)}')