Merge branch 'develop' of https://github.com/PaddlePaddle/Serving into add-hdfs-monitor

python/examples/bert/benchmark_batch.py

@@ -53,7 +53,7 @@ def single_func(idx, resource):
                     feed_batch.append(reader.process(dataset[bi]))
                 b_end = time.time()
                 if profile_flags:
-                    print("PROFILE\tpid:{}\tbert+pre_0:{} bert_pre_1:{}".format(
+                    print("PROFILE\tpid:{}\tbert_pre_0:{} bert_pre_1:{}".format(
                         os.getpid(),
                         int(round(b_start * 1000000)),
                         int(round(b_end * 1000000))))
@@ -69,9 +69,7 @@ def single_func(idx, resource):
 
 if __name__ == '__main__':
     multi_thread_runner = MultiThreadRunner()
-    endpoint_list = [
-        "127.0.0.1:9292", "127.0.0.1:9293", "127.0.0.1:9294", "127.0.0.1:9295"
-    ]
+    endpoint_list = ["127.0.0.1:9292"]
     result = multi_thread_runner.run(single_func, args.thread,
                                      {"endpoint": endpoint_list})
     avg_cost = 0

python/examples/imagenet/image_http_client.py

@@ -30,7 +30,10 @@ def predict(image_path, server):
     req = json.dumps({"image": image, "fetch": ["score"]})
     r = requests.post(
         server, data=req, headers={"Content-Type": "application/json"})
-    print(r.json()["score"][0])
+    try:
+        print(r.json()["score"][0])
+    except ValueError:
+        print(r.text)
     return r
 
 

python/paddle_serving_client/io/__init__.py

@@ -32,7 +32,7 @@ def save_model(server_model_folder,
     executor = Executor(place=CPUPlace())
 
     feed_var_names = [feed_var_dict[x].name for x in feed_var_dict]
-    target_vars = fetch_var_dict.values()
+    target_vars = list(fetch_var_dict.values())
 
     save_inference_model(
         server_model_folder,