Merge pull request #1291 from HexToString/develop-p

fix examples

python/examples/grpc_impl_example/fit_a_line/test_server_gpu.py

@@ -32,6 +32,6 @@ op_seq_maker.add_op(response_op)
 server = Server()
 server.set_op_sequence(op_seq_maker.get_op_sequence())
 server.load_model_config(sys.argv[1])
-server.set_gpuid(0)
-server.prepare_server(workdir="work_dir1", port=9393, device="cpu")
+server.set_gpuid("0")
+server.prepare_server(workdir="work_dir1", port=9393, device="gpu")
 server.run_server()

python/examples/ocr/det_debugger_server.py

@@ -71,8 +71,7 @@ ocr_service = OCRService(name="ocr")
 ocr_service.load_model_config("ocr_det_model")
 if sys.argv[1] == 'gpu':
     ocr_service.set_gpus("0")
-    ocr_service.prepare_server(
-        workdir="workdir", port=9292, device="gpu", gpuid=0)
+    ocr_service.prepare_server(workdir="workdir", port=9292, device="gpu")
 elif sys.argv[1] == 'cpu':
     ocr_service.prepare_server(workdir="workdir", port=9292)
 ocr_service.init_det()

python/examples/ocr/det_web_server.py

@@ -70,8 +70,7 @@ ocr_service = OCRService(name="ocr")
 ocr_service.load_model_config("ocr_det_model")
 if sys.argv[1] == 'gpu':
     ocr_service.set_gpus("0")
-    ocr_service.prepare_server(
-        workdir="workdir", port=9292, device="gpu", gpuid=0)
+    ocr_service.prepare_server(workdir="workdir", port=9292, device="gpu")
 elif sys.argv[1] == 'cpu':
     ocr_service.prepare_server(workdir="workdir", port=9292, device="cpu")
 ocr_service.init_det()

python/examples/ocr/ocr_web_server.py

@@ -95,8 +95,7 @@ ocr_service = OCRService(name="ocr")
 ocr_service.load_model_config("ocr_rec_model")
 if sys.argv[1] == 'gpu':
     ocr_service.set_gpus("0")
-    ocr_service.prepare_server(
-        workdir="workdir", port=9292, device="gpu", gpuid=0)
+    ocr_service.prepare_server(workdir="workdir", port=9292, device="gpu")
 elif sys.argv[1] == 'cpu':
     ocr_service.prepare_server(workdir="workdir", port=9292)
 ocr_service.init_det_client(

python/examples/ocr/rec_debugger_server.py

@@ -71,8 +71,7 @@ ocr_service.load_model_config("ocr_rec_model")
 if sys.argv[1] == 'gpu':
     ocr_service.set_gpus("0")
     ocr_service.init_rec()
-    ocr_service.prepare_server(
-        workdir="workdir", port=9292, device="gpu", gpuid=0)
+    ocr_service.prepare_server(workdir="workdir", port=9292, device="gpu")
 elif sys.argv[1] == 'cpu':
     ocr_service.init_rec()
     ocr_service.prepare_server(workdir="workdir", port=9292, device="cpu")

python/examples/ocr/rec_web_server.py

@@ -73,8 +73,7 @@ ocr_service.load_model_config("ocr_rec_model")
 ocr_service.init_rec()
 if sys.argv[1] == 'gpu':
     ocr_service.set_gpus("0")
-    ocr_service.prepare_server(
-        workdir="workdir", port=9292, device="gpu", gpuid=0)
+    ocr_service.prepare_server(workdir="workdir", port=9292, device="gpu")
 elif sys.argv[1] == 'cpu':
     ocr_service.prepare_server(workdir="workdir", port=9292, device="cpu")
 ocr_service.run_rpc_service()

python/paddle_serving_app/local_predict.py

@@ -91,6 +91,7 @@ class LocalPredictor(object):
             mkldnn_bf16_op_list: op list accelerated using MKLDNN bf16, None default.
             use_feed_fetch_ops: use feed/fetch ops, False default.
         """
+        gpu_id = int(gpu_id)
         client_config = "{}/serving_server_conf.prototxt".format(model_path)
         model_conf = m_config.GeneralModelConfig()
         f = open(client_config, 'r')