“10b039b7773296acaaaaa16206f536563e119741”上不存在“paddle/phi/ops/compat/kldiv_loss_sig.cc”
提交 85c3b475 编写于 作者: B barrierye

improve interfaces

上级 1a5bb9db
...@@ -548,9 +548,43 @@ class MultiLangServer(object): ...@@ -548,9 +548,43 @@ class MultiLangServer(object):
self.bserver_ = Server() self.bserver_ = Server()
self.worker_num_ = worker_num self.worker_num_ = worker_num
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):
# TODO: grpc body
self.bserver_.set_max_body_size(body_size)
def set_port(self, port):
self.gport_ = port
def set_reload_interval(self, interval):
self.bserver_.set_reload_interval(interval)
def set_op_sequence(self, op_seq): def set_op_sequence(self, op_seq):
self.bserver_.set_op_sequence(op_seq) self.bserver_.set_op_sequence(op_seq)
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 set_op_sequence(self, op_seq):
self.bserver_.set_op_sequence(op_seq)
def use_mkl(self, flag):
self.bserver_.use_mkl(flag)
def load_model_config(self, model_config_path): def load_model_config(self, model_config_path):
if not isinstance(model_config_path, str): if not isinstance(model_config_path, str):
raise Exception( raise Exception(
...@@ -559,6 +593,8 @@ class MultiLangServer(object): ...@@ -559,6 +593,8 @@ class MultiLangServer(object):
self.model_config_path_ = model_config_path self.model_config_path_ = model_config_path
def prepare_server(self, workdir=None, port=9292, device="cpu"): def prepare_server(self, workdir=None, port=9292, device="cpu"):
if not self._port_is_available(port):
raise SystemExit("Prot {} is already used".format(port))
default_port = 12000 default_port = 12000
self.port_list_ = [] self.port_list_ = []
for i in range(1000): for i in range(1000):
...@@ -568,7 +604,7 @@ class MultiLangServer(object): ...@@ -568,7 +604,7 @@ class MultiLangServer(object):
break break
self.bserver_.prepare_server( self.bserver_.prepare_server(
workdir=workdir, port=self.port_list_[0], device=device) workdir=workdir, port=self.port_list_[0], device=device)
self.gport_ = port self.set_port(port)
def _launch_brpc_service(self, bserver): def _launch_brpc_service(self, bserver):
bserver.run_server() bserver.run_server()
......
...@@ -53,6 +53,11 @@ def parse_args(): # pylint: disable=doc-string-missing ...@@ -53,6 +53,11 @@ def parse_args(): # pylint: disable=doc-string-missing
type=int, type=int,
default=512 * 1024 * 1024, default=512 * 1024 * 1024,
help="Limit sizes of messages") help="Limit sizes of messages")
parser.add_argument(
"--use_multilang",
default=False,
action="store_true",
help="Use Multi-language-service")
return parser.parse_args() return parser.parse_args()
...@@ -67,6 +72,7 @@ def start_standard_model(): # pylint: disable=doc-string-missing ...@@ -67,6 +72,7 @@ def start_standard_model(): # pylint: disable=doc-string-missing
ir_optim = args.ir_optim ir_optim = args.ir_optim
max_body_size = args.max_body_size max_body_size = args.max_body_size
use_mkl = args.use_mkl use_mkl = args.use_mkl
use_multilang = args.use_multilang
if model == "": if model == "":
print("You must specify your serving model") print("You must specify your serving model")
...@@ -83,7 +89,11 @@ def start_standard_model(): # pylint: disable=doc-string-missing ...@@ -83,7 +89,11 @@ def start_standard_model(): # pylint: disable=doc-string-missing
op_seq_maker.add_op(general_infer_op) op_seq_maker.add_op(general_infer_op)
op_seq_maker.add_op(general_response_op) op_seq_maker.add_op(general_response_op)
server = serving.Server() server = None
if use_multilang:
server = serving.MultiLangServer()
else:
server = serving.Server()
server.set_op_sequence(op_seq_maker.get_op_sequence()) server.set_op_sequence(op_seq_maker.get_op_sequence())
server.set_num_threads(thread_num) server.set_num_threads(thread_num)
server.set_memory_optimize(mem_optim) server.set_memory_optimize(mem_optim)
......
...@@ -68,6 +68,11 @@ def serve_args(): ...@@ -68,6 +68,11 @@ def serve_args():
type=int, type=int,
default=512 * 1024 * 1024, default=512 * 1024 * 1024,
help="Limit sizes of messages") help="Limit sizes of messages")
parser.add_argument(
"--use_multilang",
default=False,
action="store_true",
help="Use Multi-language-service")
return parser.parse_args() return parser.parse_args()
...@@ -592,9 +597,40 @@ class MultiLangServer(object): ...@@ -592,9 +597,40 @@ class MultiLangServer(object):
self.bserver_ = Server() self.bserver_ = Server()
self.worker_num_ = worker_num self.worker_num_ = worker_num
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):
# TODO: grpc body
self.bserver_.set_max_body_size(body_size)
def set_port(self, port):
self.gport_ = port
def set_reload_interval(self, interval):
self.bserver_.set_reload_interval(interval)
def set_op_sequence(self, op_seq): def set_op_sequence(self, op_seq):
self.bserver_.set_op_sequence(op_seq) self.bserver_.set_op_sequence(op_seq)
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 use_mkl(self, flag):
self.bserver_.use_mkl(flag)
def load_model_config(self, model_config_path): def load_model_config(self, model_config_path):
if not isinstance(model_config_path, str): if not isinstance(model_config_path, str):
raise Exception( raise Exception(
...@@ -603,6 +639,8 @@ class MultiLangServer(object): ...@@ -603,6 +639,8 @@ class MultiLangServer(object):
self.model_config_path_ = model_config_path self.model_config_path_ = model_config_path
def prepare_server(self, workdir=None, port=9292, device="cpu"): def prepare_server(self, workdir=None, port=9292, device="cpu"):
if not self._port_is_available(port):
raise SystemExit("Prot {} is already used".format(port))
default_port = 12000 default_port = 12000
self.port_list_ = [] self.port_list_ = []
for i in range(1000): for i in range(1000):
...@@ -612,7 +650,7 @@ class MultiLangServer(object): ...@@ -612,7 +650,7 @@ class MultiLangServer(object):
break break
self.bserver_.prepare_server( self.bserver_.prepare_server(
workdir=workdir, port=self.port_list_[0], device=device) workdir=workdir, port=self.port_list_[0], device=device)
self.gport_ = port self.set_port(port)
def _launch_brpc_service(self, bserver): def _launch_brpc_service(self, bserver):
bserver.run_server() bserver.run_server()
......
...@@ -37,6 +37,7 @@ def start_gpu_card_model(index, gpuid, args): # pylint: disable=doc-string-miss ...@@ -37,6 +37,7 @@ def start_gpu_card_model(index, gpuid, args): # pylint: disable=doc-string-miss
mem_optim = args.mem_optim mem_optim = args.mem_optim
ir_optim = args.ir_optim ir_optim = args.ir_optim
max_body_size = args.max_body_size max_body_size = args.max_body_size
use_multilang = args.use_multilang
workdir = "{}_{}".format(args.workdir, gpuid) workdir = "{}_{}".format(args.workdir, gpuid)
if model == "": if model == "":
...@@ -54,7 +55,10 @@ def start_gpu_card_model(index, gpuid, args): # pylint: disable=doc-string-miss ...@@ -54,7 +55,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_infer_op)
op_seq_maker.add_op(general_response_op) op_seq_maker.add_op(general_response_op)
server = serving.Server() if use_multilang:
server = serving.MultiLangServer()
else:
server = serving.Server()
server.set_op_sequence(op_seq_maker.get_op_sequence()) server.set_op_sequence(op_seq_maker.get_op_sequence())
server.set_num_threads(thread_num) server.set_num_threads(thread_num)
server.set_memory_optimize(mem_optim) server.set_memory_optimize(mem_optim)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册