提交 e32d3349 编写于 作者: D Dang Qingqing

Follow comments.

上级 19f9260b
......@@ -64,7 +64,6 @@ def eval(args, data_args, test_list, batch_size, model_dir=None):
place = fluid.CUDAPlace(0) if args.use_gpu else fluid.CPUPlace()
exe = fluid.Executor(place)
#exe.run(fluid.default_startup_program())
if model_dir:
......@@ -72,7 +71,6 @@ def eval(args, data_args, test_list, batch_size, model_dir=None):
return os.path.exists(os.path.join(model_dir, var.name))
fluid.io.load_vars(exe, model_dir, predicate=if_exist)
#fluid.io.load_persistables(exe, model_dir, main_program=test_program)
test_reader = paddle.batch(
reader.test(data_args, test_list), batch_size=batch_size)
......@@ -81,10 +79,12 @@ def eval(args, data_args, test_list, batch_size, model_dir=None):
_, accum_map = map_eval.get_map_var()
map_eval.reset(exe)
for _, data in enumerate(test_reader()):
for idx, data in enumerate(test_reader()):
test_map = exe.run(test_program,
feed=feeder.feed(data),
fetch_list=[accum_map])
if idx % 50 == 0:
print("Batch {0}, map {1}".format(idx, test_map[0]))
print("Test model {0}, map {1}".format(model_dir, test_map[0]))
......
......@@ -157,7 +157,6 @@ def preprocess(img, bbox_labels, mode, settings):
img = img[[2, 1, 0], :, :]
img = img.astype('float32')
img -= settings.img_mean
#img = img.flatten()
img = img * 0.007843
return img, sampled_labels
......
......@@ -135,7 +135,7 @@ def parallel_do(args,
_, accum_map = map_eval.get_map_var()
map_eval.reset(exe)
test_map = None
for _, data in enumerate(test_reader()):
for data in test_reader():
test_map = exe.run(test_program,
feed=feeder.feed(data),
fetch_list=[accum_map])
......@@ -262,7 +262,7 @@ def parallel_exe(args,
_, accum_map = map_eval.get_map_var()
map_eval.reset(exe)
test_map = None
for _, data in enumerate(test_reader()):
for data in test_reader():
test_map = exe.run(test_program,
feed=feeder.feed(data),
fetch_list=[accum_map])
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册