提交 900afe55 编写于 作者: G gongweibao

fix ci test=develop

上级 ec3eb64f
......@@ -63,6 +63,16 @@ def serve_args():
help="Memory optimize")
parser.add_argument(
"--ir_optim", default=False, action="store_true", help="Graph optimize")
parser.add_argument(
"--async",
default=False,
action="store_true",
help="Use async communication or not.")
parser.add_argument(
"--hidden_port",
type=int,
default=None,
help="Used for async communication.")
parser.add_argument(
"--max_body_size",
type=int,
......@@ -615,6 +625,33 @@ class MultiLangServer(object):
def set_op_sequence(self, op_seq):
self.bserver_.set_op_sequence(op_seq)
def set_max_concurrency(self, concurrency):
self.bserver_.set_max_concurrency(concurrency)
def set_num_threads(self, threads):
self.bserver_.set_num_threads(threads)
def set_max_body_size(self, body_size):
self.bserver_.set_max_body_size(body_size)
def set_port(self, port):
self.bserver_.set_port(port)
def set_reload_interval(self, interval):
self.bserver_.set_reload_interval(interval)
def set_op_graph(self, op_graph):
self.bserver_.set_op_graph(op_graph)
def set_memory_optimize(self, flag=False):
self.bserver_.set_memory_optimize(flag)
def set_ir_optimize(self, flag=False):
self.bserver_.set_ir_optimize(flag)
def set_gpuid(self, gpuid=0):
self.bserver_.set_gpuid(gpuid)
def load_model_config(self, model_config_path):
if not isinstance(model_config_path, str):
raise Exception(
......@@ -622,16 +659,25 @@ class MultiLangServer(object):
self.bserver_.load_model_config(model_config_path)
self.model_config_path_ = model_config_path
def prepare_server(self, workdir=None, port=9292, device="cpu"):
default_port = 12000
def prepare_server(self,
workdir=None,
port=9292,
device="cpu",
hidden_port=None):
self.port_list_ = []
for i in range(1000):
if default_port + i != port and self._port_is_available(default_port
+ i):
self.port_list_.append(default_port + i)
break
if hidden_port is None:
default_port = 12000
for i in range(1000):
if default_port + i != port and self._port_is_available(
default_port + i):
self.port_list_.append(default_port + i)
break
else:
self.port_list_.append(int(hidden_port))
self.bserver_.prepare_server(
workdir=workdir, port=self.port_list_[0], device=device)
self.gport_ = port
def _launch_brpc_service(self, bserver):
......
......@@ -54,7 +54,10 @@ def start_gpu_card_model(index, gpuid, args): # pylint: disable=doc-string-miss
op_seq_maker.add_op(general_infer_op)
op_seq_maker.add_op(general_response_op)
server = serving.Server()
if args.async:
server = serving.MultiLangServer()
else:
server = serving.Server()
server.set_op_sequence(op_seq_maker.get_op_sequence())
server.set_num_threads(thread_num)
server.set_memory_optimize(mem_optim)
......@@ -62,7 +65,14 @@ def start_gpu_card_model(index, gpuid, args): # pylint: disable=doc-string-miss
server.set_max_body_size(max_body_size)
server.load_model_config(model)
server.prepare_server(workdir=workdir, port=port, device=device)
if not args.async:
server.prepare_server(workdir=workdir, port=port, device=device)
else:
server.prepare_server(
workdir=workdir,
port=port,
device=device,
hidden_port=args.hidden_port)
if gpuid >= 0:
server.set_gpuid(gpuid)
server.run_server()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册