[Fix] Fix potential bug about output_config overwrite (#463)

* fix_merge_config * pre-commit * add changelog
open-mmlab · Dec 19, 2020 · 30ff6b2 · 30ff6b2
1 parent 137351c
commit 30ff6b2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -13,12 +13,13 @@
 - Support training and testing for Spatio-Temporal Action Detection ([#351](https://github.com/open-mmlab/mmaction2/pull/351))
 - Fix CI due to pip upgrade ([#454](https://github.com/open-mmlab/mmaction2/pull/454))
 - Add markdown lint in pre-commit hook ([#255](https://github.com/open-mmlab/mmaction2/pull/225))
-- Use title case in modelzoo statistics. ([#456](https://github.com/open-mmlab/mmaction2/pull/456))
+- Use title case in modelzoo statistics ([#456](https://github.com/open-mmlab/mmaction2/pull/456))
 - Add FAQ documents for easy troubleshooting. ([#413](https://github.com/open-mmlab/mmaction2/pull/413), [#420](https://github.com/open-mmlab/mmaction2/pull/420), [#439](https://github.com/open-mmlab/mmaction2/pull/439))
 
 **Bug and Typo Fixes**
 
-- Fix typo in default argument of BaseHead. ([#446](https://github.com/open-mmlab/mmaction2/pull/446))
+- Fix typo in default argument of BaseHead ([#446](https://github.com/open-mmlab/mmaction2/pull/446))
+- Fix potential bug about `output_config` overwrite ([#463](https://github.com/open-mmlab/mmaction2/pull/463))
 
 **ModelZoo**
 

diff --git a/tools/test.py b/tools/test.py
@@ -102,15 +102,20 @@ def main():
 
     # Load output_config from cfg
     output_config = cfg.get('output_config', {})
-    # Overwrite output_config from args.out
-    output_config = Config._merge_a_into_b(dict(out=args.out), output_config)
+    if args.out:
+        # Overwrite output_config from args.out
+        output_config = Config._merge_a_into_b(
+            dict(out=args.out), output_config)
 
     # Load eval_config from cfg
     eval_config = cfg.get('eval_config', {})
-    # Overwrite eval_config from args.eval
-    eval_config = Config._merge_a_into_b(dict(metrics=args.eval), eval_config)
-    # Add options from args.eval_options
-    eval_config = Config._merge_a_into_b(args.eval_options, eval_config)
+    if args.eval:
+        # Overwrite eval_config from args.eval
+        eval_config = Config._merge_a_into_b(
+            dict(metrics=args.eval), eval_config)
+    if args.eval_options:
+        # Add options from args.eval_options
+        eval_config = Config._merge_a_into_b(args.eval_options, eval_config)
 
     assert output_config or eval_config, \
         ('Please specify at least one operation (save or eval the '