diff --git a/PaddleCV/object_detection/eval.py b/PaddleCV/object_detection/eval.py index 157384b04f40ab2e3023fa57269267219b16d62d..0e3d68f61ed9e174198cda303ed978537ab23689 100644 --- a/PaddleCV/object_detection/eval.py +++ b/PaddleCV/object_detection/eval.py @@ -8,7 +8,7 @@ import math import paddle import paddle.fluid as fluid import reader -from mobilenet_ssd import mobile_net +from mobilenet_ssd import build_mobilenet_ssd from utility import add_arguments, print_arguments parser = argparse.ArgumentParser(description=__doc__) @@ -47,8 +47,8 @@ def build_program(main_prog, startup_prog, args, data_args): with fluid.unique_name.guard(): image, gt_box, gt_label, difficult = fluid.layers.read_file( py_reader) - locs, confs, box, box_var = mobile_net(num_classes, image, - image_shape) + locs, confs, box, box_var = build_mobilenet_ssd(image, num_classes, + image_shape) nmsed_out = fluid.layers.detection_output( locs, confs, box, box_var, nms_threshold=args.nms_threshold) with fluid.program_guard(main_prog): @@ -67,7 +67,6 @@ def build_program(main_prog, startup_prog, args, data_args): def eval(args, data_args, test_list, batch_size, model_dir=None): startup_prog = fluid.Program() test_prog = fluid.Program() - test_py_reader, map_eval = build_program( main_prog=test_prog, startup_prog=startup_prog, diff --git a/PaddleCV/object_detection/infer.py b/PaddleCV/object_detection/infer.py index e81b5f31e763fbddb57657d16befbb04ed2e62bf..3e43db54c4e3b0f868ae7711f5fdd8346bd29b72 100644 --- a/PaddleCV/object_detection/infer.py +++ b/PaddleCV/object_detection/infer.py @@ -10,7 +10,7 @@ from PIL import ImageFont import paddle import paddle.fluid as fluid import reader -from mobilenet_ssd import mobile_net +from mobilenet_ssd import build_mobilenet_ssd from utility import add_arguments, print_arguments parser = argparse.ArgumentParser(description=__doc__) @@ -50,7 +50,8 @@ def infer(args, data_args, image_path, model_dir): label_list = data_args.label_list image = fluid.layers.data(name='image', shape=image_shape, dtype='float32') - locs, confs, box, box_var = mobile_net(num_classes, image, image_shape) + locs, confs, box, box_var = build_mobilenet_ssd(image, num_classes, + image_shape) nmsed_out = fluid.layers.detection_output( locs, confs, box, box_var, nms_threshold=args.nms_threshold)