Merge pull request #5 from PaddlePaddle/develop

merge to local

fluid/PaddleCV/faster_rcnn/utility.py

@@ -98,7 +98,7 @@ def parse_args():
     add_arg('pretrained_model', str,    'imagenet_resnet50_fusebn', "The init model path.")
     add_arg('dataset',          str,   'coco2017',  "coco2014, coco2017.")
     add_arg('class_num',        int,   81,          "Class number.")
-    add_arg('data_dir',         str,   'data/COCO17',        "The data root path.")
+    add_arg('data_dir',         str,   'dataset/coco',        "The data root path.")
     add_arg('use_pyreader',     bool,   True,           "Use pyreader.")
     add_arg('use_profile',         bool,   False,       "Whether use profiler.")
     add_arg('padding_minibatch',bool,   False,

fluid/PaddleCV/image_classification/eval.py

@@ -49,7 +49,7 @@ def eval(args):
     # model definition
     model = models.__dict__[model_name]()
 
-    if model_name is "GoogleNet":
+    if model_name == "GoogleNet":
         out0, out1, out2 = model.net(input=image, class_dim=class_dim)
         cost0 = fluid.layers.cross_entropy(input=out0, label=label)
         cost1 = fluid.layers.cross_entropy(input=out1, label=label)
@@ -71,8 +71,10 @@ def eval(args):
 
     test_program = fluid.default_main_program().clone(for_test=True)
 
+    fetch_list = [avg_cost.name, acc_top1.name, acc_top5.name]
     if with_memory_optimization:
-        fluid.memory_optimize(fluid.default_main_program())
+        fluid.memory_optimize(
+            fluid.default_main_program(), skip_opt_set=set(fetch_list))
 
     place = fluid.CUDAPlace(0) if args.use_gpu else fluid.CPUPlace()
     exe = fluid.Executor(place)
@@ -88,8 +90,6 @@ def eval(args):
     val_reader = paddle.batch(reader.val(), batch_size=args.batch_size)
     feeder = fluid.DataFeeder(place=place, feed_list=[image, label])
 
-    fetch_list = [avg_cost.name, acc_top1.name, acc_top5.name]
-
     test_info = [[], [], []]
     cnt = 0
     for batch_id, data in enumerate(val_reader()):

fluid/PaddleRec/ctr/data/download.sh

 #!/bin/bash
 
-wget --no-check-certificate https://s3-eu-west-1.amazonaws.com/criteo-labs/dac.tar.gz
+wget --no-check-certificate https://s3-eu-west-1.amazonaws.com/kaggle-display-advertising-challenge-dataset/dac.tar.gz
 tar zxf dac.tar.gz
 rm -f dac.tar.gz