From 0a33d86d18c401335b2a3f607dacaaa9b2cf94f6 Mon Sep 17 00:00:00 2001
From: guru4elephant <guru4elephant@gmail.com>
Date: Wed, 4 Mar 2020 09:55:19 +0800
Subject: [PATCH] make web_serve simple enough

---
 python/examples/fit_a_line/README.md      |  2 +-
 python/paddle_serving_server/web_serve.py | 47 ++---------------------
 2 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/python/examples/fit_a_line/README.md b/python/examples/fit_a_line/README.md
index 72ae1e09..fedd4089 100644
--- a/python/examples/fit_a_line/README.md
+++ b/python/examples/fit_a_line/README.md
@@ -13,7 +13,7 @@ python test_client.py uci_housing_client/serving_client_conf.prototxt
 # prediction through http service
 Start a web service with default web service hosting modules
 ``` shell
-python -m paddle_serving_server.web_serve --model uci_housing_model/ --thread 10 --name uci --port 9393
+python -m paddle_serving_server.web_serve --model uci_housing_model/ --thread 10 --name uci --port 9393 --name uci
 ```
 
 Prediction through http post
diff --git a/python/paddle_serving_server/web_serve.py b/python/paddle_serving_server/web_serve.py
index 2d67a3c9..337584c8 100644
--- a/python/paddle_serving_server/web_serve.py
+++ b/python/paddle_serving_server/web_serve.py
@@ -31,48 +31,9 @@ def parse_args():
     parser.add_argument("--name", type=str, default="default", help="Default service name")
     return parser.parse_args()
 
-def start_web_service(args):
-    model = args.model
-    port = args.port
-    name = args.name
-    web_service = WebService(name=name, model=model, port=port)
-    web_service.start_service()
-
-def start_standard_model(args):
-    thread_num = args.thread
-    model = args.model
-    port = args.port
-    workdir = args.workdir
-    device = args.device
-
-    if model == "":
-        print("You must specify your serving model")
-        exit(-1)
-
-    import paddle_serving_server as serving
-    op_maker = serving.OpMaker()
-    read_op = op_maker.create('general_reader')
-    general_infer_op = op_maker.create('general_infer')
-    general_response_op = op_maker.create('general_response')
-
-    op_seq_maker = serving.OpSeqMaker()
-    op_seq_maker.add_op(read_op)
-    op_seq_maker.add_op(general_infer_op)
-    op_seq_maker.add_op(general_response_op)
-
-    server = serving.Server()
-    server.set_op_sequence(op_seq_maker.get_op_sequence())
-    server.set_num_threads(thread_num)
-
-    server.load_model_config(model)
-    server.prepare_server(workdir=workdir, port=port + 1, device=device)
-    server.run_server()
-
 if __name__ == "__main__":
     args = parse_args()
-    p_serving = Process(target=start_standard_model, args=(args,))
-    p_web_service = Process(target=start_web_service, args=(args,))
-    p_serving.start()
-    p_web_service.start()
-    p_web_service.join()
-    p_serving.join()
+    service = WebService(name=args.name)
+    service.load_model_config(args.model)
+    service.prepare_server(workdir=args.workdir, port=args.port, device=args.device)
+    service.run_server()
-- 
GitLab