fix eval for multi-scale test (#3592)

ppdet/modeling/architectures/mask_rcnn.py

@@ -93,6 +93,7 @@ class MaskRCNN(object):
                                      for k, v in body_feats.items())
 
         # FPN
+        spatial_scale = None
         if self.fpn is not None:
             body_feats, spatial_scale = self.fpn.get_output(body_feats)
 

tools/eval.py

@@ -81,7 +81,10 @@ def main():
     with fluid.program_guard(eval_prog, startup_prog):
         with fluid.unique_name.guard():
             pyreader, feed_vars = create_feed(eval_feed)
-            fetches = model.eval(feed_vars, multi_scale_test)
+            if multi_scale_test is None:
+                fetches = model.eval(feed_vars)
+            else:
+                fetches = model.eval(feed_vars, multi_scale_test)
     eval_prog = eval_prog.clone(True)
     reader = create_reader(eval_feed, args_path=FLAGS.dataset_dir)
     pyreader.decorate_sample_list_generator(reader, place)

tools/train.py

@@ -77,9 +77,6 @@ def main():
     if 'log_iter' not in cfg:
         cfg.log_iter = 20
 
-    if 'multi_scale_test' not in cfg:
-        cfg.multi_scale_test = False
-
     ignore_params = cfg.finetune_exclude_pretrained_params \
                  if 'finetune_exclude_pretrained_params' in cfg else []
 
@@ -150,7 +147,7 @@ def main():
             with fluid.unique_name.guard():
                 model = create(main_arch)
                 eval_pyreader, feed_vars = create_feed(eval_feed)
-                fetches = model.eval(feed_vars, cfg.multi_scale_test)
+                fetches = model.eval(feed_vars)
         eval_prog = eval_prog.clone(True)
 
         eval_reader = create_reader(eval_feed, args_path=FLAGS.dataset_dir)