From e32d33493e2d5f3f947ab64ea9fa6cf5578123ce Mon Sep 17 00:00:00 2001
From: Dang Qingqing <dangqingqing@baidu.com>
Date: Tue, 17 Apr 2018 12:48:33 +0800
Subject: [PATCH] Follow comments.

---
 fluid/object_detection/eval.py   | 6 +++---
 fluid/object_detection/reader.py | 1 -
 fluid/object_detection/train.py  | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fluid/object_detection/eval.py b/fluid/object_detection/eval.py
index 7be22024..84fbcf82 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 2d6d7500..78efcc4a 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 ff2fbb4f..e8864d1e 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])
-- 
GitLab