diff --git a/tools/export_serving_model.py b/tools/export_serving_model.py index 177399e9503303eb8220173234b2e2e5d4e62887..725f0fe44f5947737de45b1ea68d406fbe156928 100644 --- a/tools/export_serving_model.py +++ b/tools/export_serving_model.py @@ -22,6 +22,7 @@ from paddle import fluid from ppdet.core.workspace import load_config, merge_config, create from ppdet.utils.cli import ArgsParser +from ppdet.utils.check import check_config import ppdet.utils.checkpoint as checkpoint import yaml import logging @@ -55,13 +56,10 @@ def save_serving_model(FLAGS, exe, feed_vars, test_fetches, infer_prog): def main(): cfg = load_config(FLAGS.config) - - if 'architecture' in cfg: - main_arch = cfg.architecture - else: - raise ValueError("'architecture' not specified in config file.") - merge_config(FLAGS.opt) + check_config(cfg) + + main_arch = cfg.architecture # Use CPU for exporting inference model instead of GPU place = fluid.CPUPlace() diff --git a/tools/face_eval.py b/tools/face_eval.py index 05642efdfddf161a8664610ffa5428fc87a07cc1..ff1ef0f01a2df932c550dc1462a697781d1a72f6 100644 --- a/tools/face_eval.py +++ b/tools/face_eval.py @@ -25,7 +25,7 @@ from collections import OrderedDict import ppdet.utils.checkpoint as checkpoint from ppdet.utils.cli import ArgsParser -from ppdet.utils.check import check_gpu +from ppdet.utils.check import check_gpu, check_config from ppdet.utils.widerface_eval_utils import get_shrink, bbox_vote, \ save_widerface_bboxes, save_fddb_bboxes, to_chw_bgr from ppdet.core.workspace import load_config, merge_config, create