Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
5c0b20b2
S
Serving
项目概览
PaddlePaddle
/
Serving
大约 2 年 前同步成功
通知
187
Star
833
Fork
253
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
105
列表
看板
标记
里程碑
合并请求
10
Wiki
2
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Serving
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
105
Issue
105
列表
看板
标记
里程碑
合并请求
10
合并请求
10
Pages
分析
分析
仓库分析
DevOps
Wiki
2
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
5c0b20b2
编写于
6月 15, 2020
作者:
W
wangjiawei04
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'pyserving' of
https://github.com/barrierye/Serving
into pyserving
上级
2c23bcf1
8090d687
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
212 addition
and
143 deletion
+212
-143
python/paddle_serving_server/pyserver.py
python/paddle_serving_server/pyserver.py
+212
-143
未找到文件。
python/paddle_serving_server/pyserver.py
浏览文件 @
5c0b20b2
...
@@ -14,11 +14,13 @@
...
@@ -14,11 +14,13 @@
# pylint: disable=doc-string-missing
# pylint: disable=doc-string-missing
import
threading
import
threading
import
multiprocessing
import
multiprocessing
import
multiprocessing.queues
import
Queue
import
Queue
import
os
import
os
import
sys
import
sys
import
paddle_serving_server
import
paddle_serving_server
from
paddle_serving_client
import
MultiLangClient
as
Client
from
paddle_serving_client
import
MultiLangClient
as
Client
from
paddle_serving_client
import
MultiLangPredictFuture
from
concurrent
import
futures
from
concurrent
import
futures
import
numpy
as
np
import
numpy
as
np
import
grpc
import
grpc
...
@@ -87,6 +89,7 @@ class ChannelDataType(enum.Enum):
...
@@ -87,6 +89,7 @@ class ChannelDataType(enum.Enum):
CHANNEL_PBDATA
=
0
CHANNEL_PBDATA
=
0
CHANNEL_FUTURE
=
1
CHANNEL_FUTURE
=
1
CHANNEL_NPDATA
=
2
CHANNEL_NPDATA
=
2
ERROR
=
3
class
ChannelData
(
object
):
class
ChannelData
(
object
):
...
@@ -108,35 +111,29 @@ class ChannelData(object):
...
@@ -108,35 +111,29 @@ class ChannelData(object):
4. ChannelData(ChannelDataType.CHANNEL_PBDATA.value, npdata, data_id)
4. ChannelData(ChannelDataType.CHANNEL_PBDATA.value, npdata, data_id)
5. ChannelData(ChannelDataType.CHANNEL_NPDATA.value, npdata, data_id)
5. ChannelData(ChannelDataType.CHANNEL_NPDATA.value, npdata, data_id)
6. ChannelData(ecode, error_info, data_id)
6. ChannelData(ecode, error_info, data_id)
Protobufs are not pickle-able:
https://stackoverflow.com/questions/55344376/how-to-import-protobuf-module
'''
'''
if
ecode
is
not
None
:
if
ecode
is
not
None
:
if
data_id
is
None
or
error_info
is
None
:
if
data_id
is
None
or
error_info
is
None
:
raise
ValueError
(
"data_id and error_info cannot be None"
)
raise
ValueError
(
"data_id and error_info cannot be None"
)
pbdata
=
channel_pb2
.
ChannelData
()
datatype
=
ChannelDataType
.
ERROR
.
value
pbdata
.
ecode
=
ecode
pbdata
.
id
=
data_id
pbdata
.
error_info
=
error_info
else
:
else
:
if
datatype
==
ChannelDataType
.
CHANNEL_FUTURE
.
value
:
if
datatype
==
ChannelDataType
.
CHANNEL_FUTURE
.
value
:
if
pbdata
is
None
:
if
data_id
is
None
:
if
data_id
is
None
:
raise
ValueError
(
"data_id cannot be None"
)
raise
ValueError
(
"data_id cannot be None"
)
ecode
=
ChannelDataEcode
.
OK
.
value
pbdata
=
channel_pb2
.
ChannelData
()
pbdata
.
ecode
=
ChannelDataEcode
.
OK
.
value
pbdata
.
id
=
data_id
elif
datatype
==
ChannelDataType
.
CHANNEL_PBDATA
.
value
:
elif
datatype
==
ChannelDataType
.
CHANNEL_PBDATA
.
value
:
if
pbdata
is
None
:
if
pbdata
is
None
:
if
data_id
is
None
:
if
data_id
is
None
:
raise
ValueError
(
"data_id cannot be None"
)
raise
ValueError
(
"data_id cannot be None"
)
pbdata
=
channel_pb2
.
ChannelData
()
pbdata
=
channel_pb2
.
ChannelData
()
pbdata
.
id
=
data_id
ecode
,
error_info
=
self
.
_check_npdata
(
npdata
)
ecode
,
error_info
=
self
.
_check_npdata
(
npdata
)
pbdata
.
ecode
=
ecode
if
ecode
!=
ChannelDataEcode
.
OK
.
value
:
if
pbdata
.
ecode
!=
ChannelDataEcode
.
OK
.
value
:
logging
.
error
(
error_info
)
pbdata
.
error_info
=
error_info
logging
.
error
(
pbdata
.
error_info
)
else
:
else
:
for
name
,
value
in
postped_
data
.
items
():
for
name
,
value
in
np
data
.
items
():
inst
=
channel_pb2
.
Inst
()
inst
=
channel_pb2
.
Inst
()
inst
.
data
=
value
.
tobytes
()
inst
.
data
=
value
.
tobytes
()
inst
.
name
=
name
inst
.
name
=
name
...
@@ -146,23 +143,18 @@ class ChannelData(object):
...
@@ -146,23 +143,18 @@ class ChannelData(object):
pbdata
.
insts
.
append
(
inst
)
pbdata
.
insts
.
append
(
inst
)
elif
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
elif
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
ecode
,
error_info
=
self
.
_check_npdata
(
npdata
)
ecode
,
error_info
=
self
.
_check_npdata
(
npdata
)
pbdata
=
channel_pb2
.
ChannelData
()
if
ecode
!=
ChannelDataEcode
.
OK
.
value
:
pbdata
.
id
=
data_id
logging
.
error
(
error_info
)
pbdata
.
ecode
=
ecode
if
pbdata
.
ecode
!=
ChannelDataEcode
.
OK
.
value
:
pbdata
.
error_info
=
error_info
logging
.
error
(
pbdata
.
error_info
)
else
:
else
:
raise
ValueError
(
"datatype not match"
)
raise
ValueError
(
"datatype not match"
)
if
not
isinstance
(
pbdata
,
channel_pb2
.
ChannelData
):
raise
TypeError
(
"pbdata must be pyserving_channel_pb2.ChannelData type({})"
.
format
(
type
(
pbdata
)))
self
.
future
=
future
self
.
future
=
future
self
.
pbdata
=
pbdata
self
.
pbdata
=
pbdata
self
.
npdata
=
npdata
self
.
npdata
=
npdata
self
.
datatype
=
datatype
self
.
datatype
=
datatype
self
.
callback_func
=
callback_func
self
.
callback_func
=
callback_func
self
.
id
=
data_id
self
.
ecode
=
ecode
self
.
error_info
=
error_info
def
_check_npdata
(
self
,
npdata
):
def
_check_npdata
(
self
,
npdata
):
ecode
=
ChannelDataEcode
.
OK
.
value
ecode
=
ChannelDataEcode
.
OK
.
value
...
@@ -174,8 +166,8 @@ class ChannelData(object):
...
@@ -174,8 +166,8 @@ class ChannelData(object):
"be str, but get {}"
.
format
(
type
(
name
)))
"be str, but get {}"
.
format
(
type
(
name
)))
break
break
if
not
isinstance
(
value
,
np
.
ndarray
):
if
not
isinstance
(
value
,
np
.
ndarray
):
pbdata
.
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
pbdata
.
error_info
=
log
(
"the value of postped_data must "
\
error_info
=
log
(
"the value of postped_data must "
\
"be np.ndarray, but get {}"
.
format
(
type
(
value
)))
"be np.ndarray, but get {}"
.
format
(
type
(
value
)))
break
break
return
ecode
,
error_info
return
ecode
,
error_info
...
@@ -195,16 +187,15 @@ class ChannelData(object):
...
@@ -195,16 +187,15 @@ class ChannelData(object):
elif
self
.
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
elif
self
.
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
feed
=
self
.
npdata
feed
=
self
.
npdata
else
:
else
:
raise
TypeError
(
"Error type({}) in pbdata.type."
.
format
(
raise
TypeError
(
"Error type({}) in datatype."
.
format
(
self
.
datatype
))
self
.
pbdata
.
type
))
return
feed
return
feed
def
__str__
(
self
):
def
__str__
(
self
):
return
"type[{}], ecode[{}]"
.
format
(
return
"type[{}], ecode[{}]
, id[{}]
"
.
format
(
ChannelDataType
(
self
.
datatype
).
name
,
self
.
pbdata
.
ecode
)
ChannelDataType
(
self
.
datatype
).
name
,
self
.
ecode
,
self
.
id
)
class
Channel
(
Queue
.
Queue
):
class
Channel
(
multiprocessing
.
queues
.
Queue
):
"""
"""
The channel used for communication between Ops.
The channel used for communication between Ops.
...
@@ -222,23 +213,30 @@ class Channel(Queue.Queue):
...
@@ -222,23 +213,30 @@ class Channel(Queue.Queue):
and can only be called during initialization.
and can only be called during initialization.
"""
"""
def
__init__
(
self
,
name
=
None
,
maxsize
=-
1
,
timeout
=
None
):
def
__init__
(
self
,
manager
,
name
=
None
,
maxsize
=
0
,
timeout
=
None
):
Queue
.
Queue
.
__init__
(
self
,
maxsize
=
maxsize
)
# https://stackoverflow.com/questions/39496554/cannot-subclass-multiprocessing-queue-in-python-3-5/
multiprocessing
.
queues
.
Queue
.
__init__
(
self
,
maxsize
=
maxsize
)
self
.
_maxsize
=
maxsize
self
.
_maxsize
=
maxsize
self
.
_timeout
=
timeout
self
.
_timeout
=
timeout
self
.
name
=
name
self
.
name
=
name
self
.
_stop
=
False
self
.
_stop
=
False
self
.
_cv
=
thread
ing
.
Condition
()
self
.
_cv
=
multiprocess
ing
.
Condition
()
self
.
_producers
=
[]
self
.
_producers
=
[]
self
.
_producer_res_count
=
{}
# {data_id: count}
self
.
_producer_res_count
=
manager
.
dict
()
# {data_id: count}
self
.
_push_res
=
{}
# {data_id: {op_name: data}}
# self._producer_res_count = {} # {data_id: count}
self
.
_push_res
=
manager
.
dict
()
# {data_id: {op_name: data}}
self
.
_consumers
=
{}
# {op_name: idx}
# self._push_res = {} # {data_id: {op_name: data}}
self
.
_idx_consumer_num
=
{}
# {idx: num}
self
.
_consumer_base_idx
=
0
self
.
_consumers
=
manager
.
dict
()
# {op_name: idx}
self
.
_front_res
=
[]
# self._consumers = {} # {op_name: idx}
self
.
_idx_consumer_num
=
manager
.
dict
()
# {idx: num}
# self._idx_consumer_num = {} # {idx: num}
self
.
_consumer_base_idx
=
manager
.
Value
(
'i'
,
0
)
# self._consumer_base_idx = 0
self
.
_front_res
=
manager
.
list
()
# self._front_res = []
def
get_producers
(
self
):
def
get_producers
(
self
):
return
self
.
_producers
return
self
.
_producers
...
@@ -286,9 +284,13 @@ class Channel(Queue.Queue):
...
@@ -286,9 +284,13 @@ class Channel(Queue.Queue):
try
:
try
:
self
.
put
(
channeldata
,
timeout
=
0
)
self
.
put
(
channeldata
,
timeout
=
0
)
break
break
except
Queue
.
Empty
:
except
Queue
.
Full
:
self
.
_cv
.
wait
()
self
.
_cv
.
wait
()
logging
.
debug
(
self
.
_log
(
"{} channel size: {}"
.
format
(
op_name
,
self
.
qsize
())))
self
.
_cv
.
notify_all
()
self
.
_cv
.
notify_all
()
logging
.
debug
(
self
.
_log
(
"{} notify all"
.
format
(
op_name
)))
logging
.
debug
(
self
.
_log
(
"{} push data succ!"
.
format
(
op_name
)))
logging
.
debug
(
self
.
_log
(
"{} push data succ!"
.
format
(
op_name
)))
return
True
return
True
elif
op_name
is
None
:
elif
op_name
is
None
:
...
@@ -297,7 +299,7 @@ class Channel(Queue.Queue):
...
@@ -297,7 +299,7 @@ class Channel(Queue.Queue):
"There are multiple producers, so op_name cannot be None."
))
"There are multiple producers, so op_name cannot be None."
))
producer_num
=
len
(
self
.
_producers
)
producer_num
=
len
(
self
.
_producers
)
data_id
=
channeldata
.
pbdata
.
id
data_id
=
channeldata
.
id
put_data
=
None
put_data
=
None
with
self
.
_cv
:
with
self
.
_cv
:
logging
.
debug
(
self
.
_log
(
"{} get lock"
.
format
(
op_name
)))
logging
.
debug
(
self
.
_log
(
"{} get lock"
.
format
(
op_name
)))
...
@@ -307,7 +309,12 @@ class Channel(Queue.Queue):
...
@@ -307,7 +309,12 @@ class Channel(Queue.Queue):
for
name
in
self
.
_producers
for
name
in
self
.
_producers
}
}
self
.
_producer_res_count
[
data_id
]
=
0
self
.
_producer_res_count
[
data_id
]
=
0
self
.
_push_res
[
data_id
][
op_name
]
=
channeldata
# see: https://docs.python.org/3.6/library/multiprocessing.html?highlight=multiprocess#proxy-objects
# self._push_res[data_id][op_name] = channeldata
tmp_push_res
=
self
.
_push_res
[
data_id
]
tmp_push_res
[
op_name
]
=
channeldata
self
.
_push_res
[
data_id
]
=
tmp_push_res
if
self
.
_producer_res_count
[
data_id
]
+
1
==
producer_num
:
if
self
.
_producer_res_count
[
data_id
]
+
1
==
producer_num
:
put_data
=
self
.
_push_res
[
data_id
]
put_data
=
self
.
_push_res
[
data_id
]
self
.
_push_res
.
pop
(
data_id
)
self
.
_push_res
.
pop
(
data_id
)
...
@@ -322,6 +329,9 @@ class Channel(Queue.Queue):
...
@@ -322,6 +329,9 @@ class Channel(Queue.Queue):
else
:
else
:
while
self
.
_stop
is
False
:
while
self
.
_stop
is
False
:
try
:
try
:
logging
.
debug
(
self
.
_log
(
"{} push data succ: {}"
.
format
(
op_name
,
put_data
.
__str__
())))
self
.
put
(
put_data
,
timeout
=
0
)
self
.
put
(
put_data
,
timeout
=
0
)
break
break
except
Queue
.
Empty
:
except
Queue
.
Empty
:
...
@@ -333,7 +343,7 @@ class Channel(Queue.Queue):
...
@@ -333,7 +343,7 @@ class Channel(Queue.Queue):
return
True
return
True
def
front
(
self
,
op_name
=
None
):
def
front
(
self
,
op_name
=
None
):
logging
.
debug
(
self
.
_log
(
"{} try to get data"
.
format
(
op_name
)))
logging
.
debug
(
self
.
_log
(
"{} try to get data
...
"
.
format
(
op_name
)))
if
len
(
self
.
_consumers
)
==
0
:
if
len
(
self
.
_consumers
)
==
0
:
raise
Exception
(
raise
Exception
(
self
.
_log
(
self
.
_log
(
...
@@ -344,9 +354,18 @@ class Channel(Queue.Queue):
...
@@ -344,9 +354,18 @@ class Channel(Queue.Queue):
with
self
.
_cv
:
with
self
.
_cv
:
while
self
.
_stop
is
False
and
resp
is
None
:
while
self
.
_stop
is
False
and
resp
is
None
:
try
:
try
:
resp
=
self
.
get
(
timeout
=
0
)
logging
.
debug
(
self
.
_log
(
"{} try to get(with channel size: {})"
.
format
(
op_name
,
self
.
qsize
())))
#TODO: bug to fix
# (multiple processes) the queue is not empty, but it raise Queue.Empty
resp
=
self
.
get
(
timeout
=
1e-3
)
break
break
except
Queue
.
Empty
:
except
Queue
.
Empty
:
logging
.
debug
(
self
.
_log
(
"{} wait for empty queue(with channel size: {})"
.
format
(
op_name
,
self
.
qsize
())))
self
.
_cv
.
wait
()
self
.
_cv
.
wait
()
logging
.
debug
(
logging
.
debug
(
self
.
_log
(
"{} get data succ: {}"
.
format
(
op_name
,
resp
.
__str__
(
self
.
_log
(
"{} get data succ: {}"
.
format
(
op_name
,
resp
.
__str__
(
...
@@ -360,16 +379,31 @@ class Channel(Queue.Queue):
...
@@ -360,16 +379,31 @@ class Channel(Queue.Queue):
with
self
.
_cv
:
with
self
.
_cv
:
# data_idx = consumer_idx - base_idx
# data_idx = consumer_idx - base_idx
while
self
.
_stop
is
False
and
self
.
_consumers
[
while
self
.
_stop
is
False
and
self
.
_consumers
[
op_name
]
-
self
.
_consumer_base_idx
>=
len
(
self
.
_front_res
):
op_name
]
-
self
.
_consumer_base_idx
.
value
>=
len
(
self
.
_front_res
):
logging
.
debug
(
self
.
_log
(
"({}) B self._consumers: {}, self._consumer_base_idx: {}, len(self._front_res): {}"
.
format
(
op_name
,
self
.
_consumers
,
self
.
_consumer_base_idx
.
value
,
len
(
self
.
_front_res
))))
try
:
try
:
channeldata
=
self
.
get
(
timeout
=
0
)
logging
.
debug
(
self
.
_log
(
"{} try to get(with channel size: {})"
.
format
(
op_name
,
self
.
qsize
())))
#TODO: bug to fix
# (multiple processes) the queue is not empty, but it raise Queue.Empty
channeldata
=
self
.
get
(
timeout
=
1e-3
)
self
.
_front_res
.
append
(
channeldata
)
self
.
_front_res
.
append
(
channeldata
)
break
break
except
Queue
.
Empty
:
except
Queue
.
Empty
:
logging
.
debug
(
self
.
_log
(
"{} wait for empty queue(with channel size: {})"
.
format
(
op_name
,
self
.
qsize
())))
self
.
_cv
.
wait
()
self
.
_cv
.
wait
()
consumer_idx
=
self
.
_consumers
[
op_name
]
consumer_idx
=
self
.
_consumers
[
op_name
]
base_idx
=
self
.
_consumer_base_idx
base_idx
=
self
.
_consumer_base_idx
.
value
data_idx
=
consumer_idx
-
base_idx
data_idx
=
consumer_idx
-
base_idx
resp
=
self
.
_front_res
[
data_idx
]
resp
=
self
.
_front_res
[
data_idx
]
logging
.
debug
(
self
.
_log
(
"{} get data: {}"
.
format
(
op_name
,
resp
)))
logging
.
debug
(
self
.
_log
(
"{} get data: {}"
.
format
(
op_name
,
resp
)))
...
@@ -379,14 +413,19 @@ class Channel(Queue.Queue):
...
@@ -379,14 +413,19 @@ class Channel(Queue.Queue):
consumer_idx
]
==
0
:
consumer_idx
]
==
0
:
self
.
_idx_consumer_num
.
pop
(
consumer_idx
)
self
.
_idx_consumer_num
.
pop
(
consumer_idx
)
self
.
_front_res
.
pop
(
0
)
self
.
_front_res
.
pop
(
0
)
self
.
_consumer_base_idx
+=
1
self
.
_consumer_base_idx
.
value
+=
1
self
.
_consumers
[
op_name
]
+=
1
self
.
_consumers
[
op_name
]
+=
1
new_consumer_idx
=
self
.
_consumers
[
op_name
]
new_consumer_idx
=
self
.
_consumers
[
op_name
]
if
self
.
_idx_consumer_num
.
get
(
new_consumer_idx
)
is
None
:
if
self
.
_idx_consumer_num
.
get
(
new_consumer_idx
)
is
None
:
self
.
_idx_consumer_num
[
new_consumer_idx
]
=
0
self
.
_idx_consumer_num
[
new_consumer_idx
]
=
0
self
.
_idx_consumer_num
[
new_consumer_idx
]
+=
1
self
.
_idx_consumer_num
[
new_consumer_idx
]
+=
1
logging
.
debug
(
self
.
_log
(
"({}) A self._consumers: {}, self._consumer_base_idx: {}, len(self._front_res): {}"
.
format
(
op_name
,
self
.
_consumers
,
self
.
_consumer_base_idx
.
value
,
len
(
self
.
_front_res
))))
logging
.
debug
(
self
.
_log
(
"{} notify all"
.
format
(
op_name
)))
self
.
_cv
.
notify_all
()
self
.
_cv
.
notify_all
()
logging
.
debug
(
self
.
_log
(
"multi | {} get data succ!"
.
format
(
op_name
)))
logging
.
debug
(
self
.
_log
(
"multi | {} get data succ!"
.
format
(
op_name
)))
...
@@ -412,33 +451,42 @@ class Op(object):
...
@@ -412,33 +451,42 @@ class Op(object):
concurrency
=
1
,
concurrency
=
1
,
timeout
=-
1
,
timeout
=-
1
,
retry
=
2
):
retry
=
2
):
self
.
_run
=
False
self
.
_
is_
run
=
False
self
.
name
=
name
# to identify the type of OP, it must be globally unique
self
.
name
=
name
# to identify the type of OP, it must be globally unique
self
.
_concurrency
=
concurrency
# amount of concurrency
self
.
_concurrency
=
concurrency
# amount of concurrency
self
.
set_input_ops
(
inputs
)
self
.
set_input_ops
(
inputs
)
self
.
set_client
(
client_config
,
server_name
,
fetch_names
)
self
.
_server_model
=
server_model
self
.
_server_port
=
server_port
self
.
_device
=
device
self
.
_timeout
=
timeout
self
.
_timeout
=
timeout
self
.
_retry
=
max
(
1
,
retry
)
self
.
_retry
=
max
(
1
,
retry
)
self
.
_input
=
None
self
.
_input
=
None
self
.
_outputs
=
[]
self
.
_outputs
=
[]
def
set_client
(
self
,
client_config
,
server_name
,
fetch_names
):
self
.
with_serving
=
False
self
.
_client
=
None
self
.
_client_config
=
client_config
if
client_config
is
None
or
\
self
.
_server_name
=
server_name
server_name
is
None
or
\
self
.
_fetch_names
=
fetch_names
fetch_names
is
None
:
self
.
_server_model
=
server_model
self
.
_server_port
=
server_port
self
.
_device
=
device
if
self
.
_client_config
is
not
None
and
\
self
.
_server_name
is
not
None
and
\
self
.
_fetch_names
is
not
None
and
\
self
.
_server_model
is
not
None
and
\
self
.
_server_port
is
not
None
and
\
self
.
_device
is
not
None
:
self
.
with_serving
=
True
def
init_client
(
self
,
client_config
,
server_name
,
fetch_names
):
if
self
.
with_serving
==
False
:
logging
.
debug
(
"{} no client"
.
format
(
self
.
name
))
return
return
logging
.
debug
(
"{} client_config: {}"
.
format
(
self
.
name
,
client_config
))
logging
.
debug
(
"{} server_name: {}"
.
format
(
self
.
name
,
server_name
))
logging
.
debug
(
"{} fetch_names: {}"
.
format
(
self
.
name
,
fetch_names
))
self
.
_client
=
Client
()
self
.
_client
=
Client
()
self
.
_client
.
load_client_config
(
client_config
)
self
.
_client
.
load_client_config
(
client_config
)
self
.
_client
.
connect
([
server_name
])
self
.
_client
.
connect
([
server_name
])
self
.
_fetch_names
=
fetch_names
self
.
_fetch_names
=
fetch_names
def
with_serving
(
self
):
return
self
.
_client
is
not
None
def
get_input_channel
(
self
):
def
get_input_channel
(
self
):
return
self
.
_input
return
self
.
_input
...
@@ -503,48 +551,59 @@ class Op(object):
...
@@ -503,48 +551,59 @@ class Op(object):
self
.
_input
.
stop
()
self
.
_input
.
stop
()
for
channel
in
self
.
_outputs
:
for
channel
in
self
.
_outputs
:
channel
.
stop
()
channel
.
stop
()
self
.
_run
=
False
self
.
_
is_
run
=
False
def
_parse_channeldata
(
self
,
channeldata
):
def
_parse_channeldata
(
self
,
channeldata
):
data_id
,
error_
pb
data
=
None
,
None
data_id
,
error_
channel
data
=
None
,
None
if
isinstance
(
channeldata
,
dict
):
if
isinstance
(
channeldata
,
dict
):
parsed_data
=
{}
parsed_data
=
{}
key
=
channeldata
.
keys
()[
0
]
key
=
channeldata
.
keys
()[
0
]
data_id
=
channeldata
[
key
].
pbdata
.
id
data_id
=
channeldata
[
key
].
id
for
_
,
data
in
channeldata
.
items
():
for
_
,
data
in
channeldata
.
items
():
if
data
.
pbdata
.
ecode
!=
ChannelDataEcode
.
OK
.
value
:
if
data
.
ecode
!=
ChannelDataEcode
.
OK
.
value
:
error_
pbdata
=
data
.
pb
data
error_
channeldata
=
data
break
break
else
:
else
:
data_id
=
channeldata
.
pbdata
.
id
data_id
=
channeldata
.
id
if
channeldata
.
pbdata
.
ecode
!=
ChannelDataEcode
.
OK
.
value
:
if
channeldata
.
ecode
!=
ChannelDataEcode
.
OK
.
value
:
error_
pbdata
=
channeldata
.
pb
data
error_
channeldata
=
channel
data
return
data_id
,
error_
pb
data
return
data_id
,
error_
channel
data
def
_push_to_output_channels
(
self
,
data
,
name
=
None
):
def
_push_to_output_channels
(
self
,
data
,
channels
,
name
=
None
):
if
name
is
None
:
if
name
is
None
:
name
=
self
.
name
name
=
self
.
name
for
channel
in
self
.
_output
s
:
for
channel
in
channel
s
:
channel
.
push
(
data
,
name
)
channel
.
push
(
data
,
name
)
def
start
(
self
,
concurrency_idx
):
def
start
(
self
):
proces
=
[]
for
concurrency_idx
in
range
(
self
.
_concurrency
):
p
=
multiprocessing
.
Process
(
target
=
self
.
_run
,
args
=
(
concurrency_idx
,
self
.
get_input_channel
(),
self
.
get_output_channels
()))
p
.
start
()
proces
.
append
(
p
)
return
proces
def
_run
(
self
,
concurrency_idx
,
input_channel
,
output_channels
):
self
.
init_client
(
self
.
_client_config
,
self
.
_server_name
,
self
.
_fetch_names
)
op_info_prefix
=
"[{}|{}]"
.
format
(
self
.
name
,
concurrency_idx
)
op_info_prefix
=
"[{}|{}]"
.
format
(
self
.
name
,
concurrency_idx
)
log
=
self
.
_get_log_func
(
op_info_prefix
)
log
=
self
.
_get_log_func
(
op_info_prefix
)
self
.
_run
=
True
self
.
_
is_
run
=
True
while
self
.
_run
:
while
self
.
_
is_
run
:
_profiler
.
record
(
"{}-get_0"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-get_0"
.
format
(
op_info_prefix
))
channeldata
=
self
.
_input
.
front
(
self
.
name
)
channeldata
=
input_channel
.
front
(
self
.
name
)
_profiler
.
record
(
"{}-get_1"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-get_1"
.
format
(
op_info_prefix
))
logging
.
debug
(
log
(
"input_data: {}"
.
format
(
channeldata
)))
logging
.
debug
(
log
(
"input_data: {}"
.
format
(
channeldata
)))
data_id
,
error_
pb
data
=
self
.
_parse_channeldata
(
channeldata
)
data_id
,
error_
channel
data
=
self
.
_parse_channeldata
(
channeldata
)
# error data in predecessor Op
# error data in predecessor Op
if
error_pbdata
is
not
None
:
if
error_channeldata
is
not
None
:
self
.
_push_to_output_channels
(
self
.
_push_to_output_channels
(
error_channeldata
,
ChannelData
(
output_channels
)
datatype
=
ChannelDataType
.
CHANNEL_PBDATA
.
value
,
pbdata
=
error_pbdata
))
continue
continue
# preprecess
# preprecess
...
@@ -560,31 +619,34 @@ class Op(object):
...
@@ -560,31 +619,34 @@ class Op(object):
ChannelData
(
ChannelData
(
ecode
=
ChannelDataEcode
.
NOT_IMPLEMENTED
.
value
,
ecode
=
ChannelDataEcode
.
NOT_IMPLEMENTED
.
value
,
error_info
=
error_info
,
error_info
=
error_info
,
data_id
=
data_id
))
data_id
=
data_id
),
output_channels
)
continue
continue
except
TypeError
as
e
:
except
TypeError
as
e
:
# Error type in channeldata.
pbdata.
type
# Error type in channeldata.
data
type
error_info
=
log
(
e
)
error_info
=
log
(
e
)
logging
.
error
(
error_info
)
logging
.
error
(
error_info
)
self
.
_push_to_output_channels
(
self
.
_push_to_output_channels
(
ChannelData
(
ChannelData
(
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
,
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
,
error_info
=
error_info
,
error_info
=
error_info
,
data_id
=
data_id
))
data_id
=
data_id
),
output_channels
)
continue
continue
except
Exception
as
e
:
except
Exception
as
e
:
error_info
=
log
(
e
)
error_info
=
log
(
e
)
logging
.
error
(
error_info
)
logging
.
error
(
error_info
)
self
.
_push_to_output_channels
(
self
.
_push_to_output_channels
(
ChannelData
(
ChannelData
(
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
,
ecode
=
ChannelDataEcode
.
UNKNOW
.
value
,
error_info
=
error_info
,
error_info
=
error_info
,
data_id
=
data_id
))
data_id
=
data_id
),
output_channels
)
continue
continue
# midprocess
# midprocess
call_future
=
None
call_future
=
None
if
self
.
with_serving
()
:
if
self
.
with_serving
:
ecode
=
ChannelDataEcode
.
OK
.
value
ecode
=
ChannelDataEcode
.
OK
.
value
_profiler
.
record
(
"{}-midp_0"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-midp_0"
.
format
(
op_info_prefix
))
if
self
.
_timeout
<=
0
:
if
self
.
_timeout
<=
0
:
...
@@ -620,20 +682,30 @@ class Op(object):
...
@@ -620,20 +682,30 @@ class Op(object):
self
.
_push_to_output_channels
(
self
.
_push_to_output_channels
(
ChannelData
(
ChannelData
(
ecode
=
ecode
,
error_info
=
error_info
,
ecode
=
ecode
,
error_info
=
error_info
,
data_id
=
data_id
))
data_id
=
data_id
),
output_channels
)
continue
continue
_profiler
.
record
(
"{}-midp_1"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-midp_1"
.
format
(
op_info_prefix
))
# postprocess
# postprocess
output_data
=
None
output_data
=
None
_profiler
.
record
(
"{}-postp_0"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-postp_0"
.
format
(
op_info_prefix
))
if
self
.
with_serving
()
:
if
self
.
with_serving
:
# use call_future
# use call_future
output_data
=
ChannelData
(
output_data
=
ChannelData
(
datatype
=
ChannelDataType
.
CHANNEL_FUTURE
.
value
,
datatype
=
ChannelDataType
.
CHANNEL_FUTURE
.
value
,
future
=
call_future
,
future
=
call_future
,
data_id
=
data_id
,
data_id
=
data_id
,
callback_func
=
self
.
postprocess
)
callback_func
=
self
.
postprocess
)
#TODO: for future are not picklable
npdata
=
self
.
postprocess
(
call_future
.
result
())
self
.
_push_to_output_channels
(
ChannelData
(
ChannelDataType
.
CHANNEL_NPDATA
.
value
,
npdata
=
npdata
,
data_id
=
data_id
),
output_channels
)
continue
else
:
else
:
try
:
try
:
postped_data
=
self
.
postprocess
(
preped_data
)
postped_data
=
self
.
postprocess
(
preped_data
)
...
@@ -644,7 +716,8 @@ class Op(object):
...
@@ -644,7 +716,8 @@ class Op(object):
self
.
_push_to_output_channels
(
self
.
_push_to_output_channels
(
ChannelData
(
ChannelData
(
ecode
=
ecode
,
error_info
=
error_info
,
ecode
=
ecode
,
error_info
=
error_info
,
data_id
=
data_id
))
data_id
=
data_id
),
output_channels
)
continue
continue
if
not
isinstance
(
postped_data
,
dict
):
if
not
isinstance
(
postped_data
,
dict
):
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
...
@@ -654,7 +727,8 @@ class Op(object):
...
@@ -654,7 +727,8 @@ class Op(object):
self
.
_push_to_output_channels
(
self
.
_push_to_output_channels
(
ChannelData
(
ChannelData
(
ecode
=
ecode
,
error_info
=
error_info
,
ecode
=
ecode
,
error_info
=
error_info
,
data_id
=
data_id
))
data_id
=
data_id
),
output_channels
)
continue
continue
output_data
=
ChannelData
(
output_data
=
ChannelData
(
...
@@ -665,7 +739,7 @@ class Op(object):
...
@@ -665,7 +739,7 @@ class Op(object):
# push data to channel (if run succ)
# push data to channel (if run succ)
_profiler
.
record
(
"{}-push_0"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-push_0"
.
format
(
op_info_prefix
))
self
.
_push_to_output_channels
(
output_data
)
self
.
_push_to_output_channels
(
output_data
,
output_channels
)
_profiler
.
record
(
"{}-push_1"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-push_1"
.
format
(
op_info_prefix
))
def
_log
(
self
,
info
):
def
_log
(
self
,
info
):
...
@@ -701,22 +775,25 @@ class VirtualOp(Op):
...
@@ -701,22 +775,25 @@ class VirtualOp(Op):
channel
.
add_producer
(
op
.
name
)
channel
.
add_producer
(
op
.
name
)
self
.
_outputs
.
append
(
channel
)
self
.
_outputs
.
append
(
channel
)
def
start
(
self
,
concurrency_idx
):
def
_run
(
self
,
input_channel
,
output_channels
):
op_info_prefix
=
"[{}|{}]"
.
format
(
self
.
name
,
concurrency_idx
)
op_info_prefix
=
"[{}|{}]"
.
format
(
self
.
name
,
concurrency_idx
)
log
=
self
.
_get_log_func
(
op_info_prefix
)
log
=
self
.
_get_log_func
(
op_info_prefix
)
self
.
_run
=
True
self
.
_
is_
run
=
True
while
self
.
_run
:
while
self
.
_
is_
run
:
_profiler
.
record
(
"{}-get_0"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-get_0"
.
format
(
op_info_prefix
))
channeldata
=
self
.
_input
.
front
(
self
.
name
)
channeldata
=
input_channel
.
front
(
self
.
name
)
_profiler
.
record
(
"{}-get_1"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-get_1"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-push_0"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-push_0"
.
format
(
op_info_prefix
))
if
isinstance
(
channeldata
,
dict
):
if
isinstance
(
channeldata
,
dict
):
for
name
,
data
in
channeldata
.
items
():
for
name
,
data
in
channeldata
.
items
():
self
.
_push_to_output_channels
(
data
,
name
=
name
)
self
.
_push_to_output_channels
(
data
,
channels
=
output_channels
,
name
=
name
)
else
:
else
:
self
.
_push_to_output_channels
(
channeldata
,
self
.
_push_to_output_channels
(
self
.
_virtual_pred_ops
[
0
].
name
)
channeldata
,
channels
=
output_channels
,
name
=
self
.
_virtual_pred_ops
[
0
].
name
)
_profiler
.
record
(
"{}-push_1"
.
format
(
op_info_prefix
))
_profiler
.
record
(
"{}-push_1"
.
format
(
op_info_prefix
))
...
@@ -768,7 +845,7 @@ class GeneralPythonService(
...
@@ -768,7 +845,7 @@ class GeneralPythonService(
self
.
_log
(
'data must be ChannelData type, but get {}'
.
self
.
_log
(
'data must be ChannelData type, but get {}'
.
format
(
type
(
channeldata
))))
format
(
type
(
channeldata
))))
with
self
.
_cv
:
with
self
.
_cv
:
data_id
=
channeldata
.
pbdata
.
id
data_id
=
channeldata
.
id
self
.
_globel_resp_dict
[
data_id
]
=
channeldata
self
.
_globel_resp_dict
[
data_id
]
=
channeldata
self
.
_cv
.
notify_all
()
self
.
_cv
.
notify_all
()
...
@@ -788,33 +865,33 @@ class GeneralPythonService(
...
@@ -788,33 +865,33 @@ class GeneralPythonService(
def
_pack_data_for_infer
(
self
,
request
):
def
_pack_data_for_infer
(
self
,
request
):
logging
.
debug
(
self
.
_log
(
'start inferce'
))
logging
.
debug
(
self
.
_log
(
'start inferce'
))
pbdata
=
channel_pb2
.
ChannelData
()
data_id
=
self
.
_get_next_id
()
data_id
=
self
.
_get_next_id
()
pbdata
.
id
=
data_id
npdata
=
{}
pbdata
.
ecode
=
ChannelDataEcode
.
OK
.
value
try
:
try
:
for
idx
,
name
in
enumerate
(
request
.
feed_var_names
):
for
idx
,
name
in
enumerate
(
request
.
feed_var_names
):
logging
.
debug
(
logging
.
debug
(
self
.
_log
(
'name: {}'
.
format
(
request
.
feed_var_names
[
idx
])))
self
.
_log
(
'name: {}'
.
format
(
request
.
feed_var_names
[
idx
])))
logging
.
debug
(
logging
.
debug
(
self
.
_log
(
'data: {}'
.
format
(
request
.
feed_insts
[
idx
])))
self
.
_log
(
'data: {}'
.
format
(
request
.
feed_insts
[
idx
])))
inst
=
channel_pb2
.
Inst
()
npdata
[
name
]
=
np
.
frombuffer
(
inst
.
data
=
request
.
feed_insts
[
idx
]
request
.
feed_insts
[
idx
],
dtype
=
request
.
type
[
idx
])
inst
.
shape
=
request
.
shape
[
idx
]
npdata
[
name
].
shape
=
np
.
frombuffer
(
inst
.
name
=
name
request
.
shape
[
idx
],
dtype
=
"int32"
)
inst
.
type
=
request
.
type
[
idx
]
pbdata
.
insts
.
append
(
inst
)
except
Exception
as
e
:
except
Exception
as
e
:
pbdata
.
ecode
=
ChannelDataEcode
.
RPC_PACKAGE_ERROR
.
value
return
ChannelData
(
pbdata
.
error_info
=
"rpc package error"
ecode
=
ChannelDataEcode
.
RPC_PACKAGE_ERROR
.
value
,
return
ChannelData
(
error_info
=
"rpc package error"
,
datatype
=
ChannelDataType
.
CHANNEL_PBDATA
.
value
,
data_id
=
data_id
),
data_id
pbdata
=
pbdata
),
data_id
else
:
return
ChannelData
(
datatype
=
ChannelDataType
.
CHANNEL_NPDATA
.
value
,
npdata
=
npdata
,
data_id
=
data_id
),
data_id
def
_pack_data_for_resp
(
self
,
channeldata
):
def
_pack_data_for_resp
(
self
,
channeldata
):
logging
.
debug
(
self
.
_log
(
'get channeldata'
))
logging
.
debug
(
self
.
_log
(
'get channeldata'
))
resp
=
pyservice_pb2
.
Response
()
resp
=
pyservice_pb2
.
Response
()
resp
.
ecode
=
channeldata
.
pbdata
.
ecode
resp
.
ecode
=
channeldata
.
ecode
if
resp
.
ecode
==
ChannelDataEcode
.
OK
.
value
:
if
resp
.
ecode
==
ChannelDataEcode
.
OK
.
value
:
if
channeldata
.
datatype
==
ChannelDataType
.
CHANNEL_PBDATA
.
value
:
if
channeldata
.
datatype
==
ChannelDataType
.
CHANNEL_PBDATA
.
value
:
for
inst
in
channeldata
.
pbdata
.
insts
:
for
inst
in
channeldata
.
pbdata
.
insts
:
...
@@ -834,10 +911,10 @@ class GeneralPythonService(
...
@@ -834,10 +911,10 @@ class GeneralPythonService(
resp
.
type
.
append
(
str
(
var
.
dtype
))
resp
.
type
.
append
(
str
(
var
.
dtype
))
else
:
else
:
raise
TypeError
(
raise
TypeError
(
self
.
_log
(
"Error type({}) in
pbdata.
type."
.
format
(
self
.
_log
(
"Error type({}) in
data
type."
.
format
(
channeldata
.
datatype
)))
channeldata
.
datatype
)))
else
:
else
:
resp
.
error_info
=
channeldata
.
pbdata
.
error_info
resp
.
error_info
=
channeldata
.
error_info
return
resp
return
resp
def
inference
(
self
,
request
,
context
):
def
inference
(
self
,
request
,
context
):
...
@@ -857,11 +934,11 @@ class GeneralPythonService(
...
@@ -857,11 +934,11 @@ class GeneralPythonService(
resp_channeldata
=
self
.
_get_data_in_globel_resp_dict
(
data_id
)
resp_channeldata
=
self
.
_get_data_in_globel_resp_dict
(
data_id
)
_profiler
.
record
(
"{}-fetch_1"
.
format
(
self
.
name
))
_profiler
.
record
(
"{}-fetch_1"
.
format
(
self
.
name
))
if
resp_channeldata
.
pbdata
.
ecode
==
ChannelDataEcode
.
OK
.
value
:
if
resp_channeldata
.
ecode
==
ChannelDataEcode
.
OK
.
value
:
break
break
if
i
+
1
<
self
.
_retry
:
if
i
+
1
<
self
.
_retry
:
logging
.
warn
(
"retry({}): {}"
.
format
(
logging
.
warn
(
"retry({}): {}"
.
format
(
i
+
1
,
resp_channeldata
.
pbdata
.
error_info
))
i
+
1
,
resp_channeldata
.
error_info
))
_profiler
.
record
(
"{}-postpack_0"
.
format
(
self
.
name
))
_profiler
.
record
(
"{}-postpack_0"
.
format
(
self
.
name
))
resp
=
self
.
_pack_data_for_resp
(
resp_channeldata
)
resp
=
self
.
_pack_data_for_resp
(
resp_channeldata
)
...
@@ -875,12 +952,12 @@ class PyServer(object):
...
@@ -875,12 +952,12 @@ class PyServer(object):
self
.
_channels
=
[]
self
.
_channels
=
[]
self
.
_user_ops
=
[]
self
.
_user_ops
=
[]
self
.
_actual_ops
=
[]
self
.
_actual_ops
=
[]
self
.
_op_threads
=
[]
self
.
_port
=
None
self
.
_port
=
None
self
.
_worker_num
=
None
self
.
_worker_num
=
None
self
.
_in_channel
=
None
self
.
_in_channel
=
None
self
.
_out_channel
=
None
self
.
_out_channel
=
None
self
.
_retry
=
retry
self
.
_retry
=
retry
self
.
_manager
=
multiprocessing
.
Manager
()
_profiler
.
enable
(
profile
)
_profiler
.
enable
(
profile
)
def
add_channel
(
self
,
channel
):
def
add_channel
(
self
,
channel
):
...
@@ -989,7 +1066,7 @@ class PyServer(object):
...
@@ -989,7 +1066,7 @@ class PyServer(object):
for
o_idx
,
op
in
enumerate
(
actual_next_view
):
for
o_idx
,
op
in
enumerate
(
actual_next_view
):
if
op
.
name
in
processed_op
:
if
op
.
name
in
processed_op
:
continue
continue
channel
=
Channel
(
name
=
channel_name_gen
.
next
())
channel
=
Channel
(
self
.
_manager
,
name
=
channel_name_gen
.
next
())
channels
.
append
(
channel
)
channels
.
append
(
channel
)
logging
.
debug
(
"{} => {}"
.
format
(
channel
.
name
,
op
.
name
))
logging
.
debug
(
"{} => {}"
.
format
(
channel
.
name
,
op
.
name
))
op
.
add_input_channel
(
channel
)
op
.
add_input_channel
(
channel
)
...
@@ -1020,7 +1097,7 @@ class PyServer(object):
...
@@ -1020,7 +1097,7 @@ class PyServer(object):
other_op
.
name
))
other_op
.
name
))
other_op
.
add_input_channel
(
channel
)
other_op
.
add_input_channel
(
channel
)
processed_op
.
add
(
other_op
.
name
)
processed_op
.
add
(
other_op
.
name
)
output_channel
=
Channel
(
name
=
channel_name_gen
.
next
())
output_channel
=
Channel
(
self
.
_manager
,
name
=
channel_name_gen
.
next
())
channels
.
append
(
output_channel
)
channels
.
append
(
output_channel
)
last_op
=
dag_views
[
-
1
][
0
]
last_op
=
dag_views
[
-
1
][
0
]
last_op
.
add_output_channel
(
output_channel
)
last_op
.
add_output_channel
(
output_channel
)
...
@@ -1044,30 +1121,22 @@ class PyServer(object):
...
@@ -1044,30 +1121,22 @@ class PyServer(object):
self
.
_in_channel
=
input_channel
self
.
_in_channel
=
input_channel
self
.
_out_channel
=
output_channel
self
.
_out_channel
=
output_channel
for
op
in
self
.
_actual_ops
:
for
op
in
self
.
_actual_ops
:
if
op
.
with_serving
()
:
if
op
.
with_serving
:
self
.
prepare_serving
(
op
)
self
.
prepare_serving
(
op
)
self
.
gen_desc
()
self
.
gen_desc
()
def
_op_start_wrapper
(
self
,
op
,
concurrency_idx
):
return
op
.
start
(
concurrency_idx
)
def
_run_ops
(
self
):
def
_run_ops
(
self
):
proces
=
[]
for
op
in
self
.
_actual_ops
:
for
op
in
self
.
_actual_ops
:
op_concurrency
=
op
.
get_concurrency
()
proces
.
extend
(
op
.
start
())
logging
.
debug
(
"run op: {}, op_concurrency: {}"
.
format
(
return
proces
op
.
name
,
op_concurrency
))
for
c
in
range
(
op_concurrency
):
th
=
threading
.
Thread
(
target
=
self
.
_op_start_wrapper
,
args
=
(
op
,
c
))
th
.
start
()
self
.
_op_threads
.
append
(
th
)
def
_stop_ops
(
self
):
def
_stop_ops
(
self
):
for
op
in
self
.
_actual_ops
:
for
op
in
self
.
_actual_ops
:
op
.
stop
()
op
.
stop
()
def
run_server
(
self
):
def
run_server
(
self
):
self
.
_run_ops
()
op_proces
=
self
.
_run_ops
()
server
=
grpc
.
server
(
server
=
grpc
.
server
(
futures
.
ThreadPoolExecutor
(
max_workers
=
self
.
_worker_num
))
futures
.
ThreadPoolExecutor
(
max_workers
=
self
.
_worker_num
))
general_python_service_pb2_grpc
.
add_GeneralPythonServiceServicer_to_server
(
general_python_service_pb2_grpc
.
add_GeneralPythonServiceServicer_to_server
(
...
@@ -1077,8 +1146,8 @@ class PyServer(object):
...
@@ -1077,8 +1146,8 @@ class PyServer(object):
server
.
start
()
server
.
start
()
server
.
wait_for_termination
()
server
.
wait_for_termination
()
self
.
_stop_ops
()
# TODO
self
.
_stop_ops
()
# TODO
for
th
in
self
.
_op_thread
s
:
for
p
in
op_proce
s
:
th
.
join
()
p
.
join
()
def
prepare_serving
(
self
,
op
):
def
prepare_serving
(
self
,
op
):
model_path
=
op
.
_server_model
model_path
=
op
.
_server_model
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录