diff --git a/fluid/object_detection/eval.py b/fluid/object_detection/eval.py index 7be22024b009ef514f51fbd8a3d90c8bdbb2171f..84fbcf82c9862ed0c9e74a4ba5bacd50372ad7ab 100644 --- a/fluid/object_detection/eval.py +++ b/fluid/object_detection/eval.py @@ -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])) diff --git a/fluid/object_detection/reader.py b/fluid/object_detection/reader.py index 2d6d7500106a6af89e58868bb8f92bab46436037..78efcc4a517001023c72c9d82c6972d60e830c6c 100644 --- a/fluid/object_detection/reader.py +++ b/fluid/object_detection/reader.py @@ -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 diff --git a/fluid/object_detection/train.py b/fluid/object_detection/train.py index ff2fbb4f89d32ec2c5d200847c01b4faf40d968b..e8864d1e873896c58bb7368dcb7f188978ee90e1 100644 --- a/fluid/object_detection/train.py +++ b/fluid/object_detection/train.py @@ -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])