Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
7cb306e5
S
Serving
项目概览
PaddlePaddle
/
Serving
大约 1 年 前同步成功
通知
185
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7cb306e5
编写于
7月 08, 2020
作者:
B
barrierye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove client_predict_handler
上级
710f7042
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
31 deletion
+23
-31
python/pipeline/operator.py
python/pipeline/operator.py
+23
-31
未找到文件。
python/pipeline/operator.py
浏览文件 @
7cb306e5
...
...
@@ -139,12 +139,12 @@ class Op(object):
(
_
,
input_dict
),
=
input_dicts
.
items
()
return
input_dict
def
process
(
self
,
client_predict_handler
,
feed_dict
):
def
process
(
self
,
feed_dict
):
err
,
err_info
=
ChannelData
.
check_npdata
(
feed_dict
)
if
err
!=
0
:
raise
NotImplementedError
(
"{} Please override preprocess func."
.
format
(
err_info
))
call_result
=
client_predict_handler
(
call_result
=
self
.
client
.
predict
(
feed
=
feed_dict
,
fetch
=
self
.
_fetch_names
)
_LOGGER
.
debug
(
self
.
_log
(
"get call_result"
))
return
call_result
...
...
@@ -229,15 +229,13 @@ class Op(object):
data_id
=
data_id
)
return
preped_data
,
error_channeldata
def
_run_process
(
self
,
client_predict_handler
,
preped_data
,
data_id
,
log_func
):
def
_run_process
(
self
,
preped_data
,
data_id
,
log_func
):
midped_data
,
error_channeldata
=
None
,
None
if
self
.
with_serving
:
ecode
=
ChannelDataEcode
.
OK
.
value
if
self
.
_timeout
<=
0
:
try
:
midped_data
=
self
.
process
(
client_predict_handler
,
preped_data
)
midped_data
=
self
.
process
(
preped_data
)
except
Exception
as
e
:
ecode
=
ChannelDataEcode
.
UNKNOW
.
value
error_info
=
log_func
(
e
)
...
...
@@ -246,9 +244,7 @@ class Op(object):
for
i
in
range
(
self
.
_retry
):
try
:
midped_data
=
func_timeout
.
func_timeout
(
self
.
_timeout
,
self
.
process
,
args
=
(
client_predict_handler
,
preped_data
))
self
.
_timeout
,
self
.
process
,
args
=
(
preped_data
,
))
except
func_timeout
.
FunctionTimedOut
as
e
:
if
i
+
1
>=
self
.
_retry
:
ecode
=
ChannelDataEcode
.
TIMEOUT
.
value
...
...
@@ -326,36 +322,36 @@ class Op(object):
log
=
get_log_func
(
op_info_prefix
)
tid
=
threading
.
current_thread
().
ident
client
=
None
client_predict_handler
=
None
# create client based on client_type
try
:
client
=
self
.
init_client
(
client_type
,
self
.
_client_config
,
self
.
_server_endpoints
,
self
.
_fetch_names
)
if
client
is
not
None
:
client_predict_handler
=
client
.
predict
except
Exception
as
e
:
_LOGGER
.
error
(
log
(
e
))
os
.
_exit
(
-
1
)
# init op
self
.
concurrency_idx
=
concurrency_idx
try
:
if
use_multithread
:
with
self
.
_for_init_op_lock
:
if
not
self
.
_succ_init_op
:
# init profiler
self
.
_profiler
=
TimeProfiler
()
self
.
_profiler
.
enable
(
self
.
_use_profile
)
# init client
self
.
client
=
self
.
init_client
(
client_type
,
self
.
_client_config
,
self
.
_server_endpoints
,
self
.
_fetch_names
)
# user defined
self
.
init_op
()
self
.
_succ_init_op
=
True
else
:
# init profiler
self
.
_profiler
=
TimeProfiler
()
self
.
_profiler
.
enable
(
self
.
_use_profile
)
# init client
self
.
client
=
self
.
init_client
(
client_type
,
self
.
_client_config
,
self
.
_server_endpoints
,
self
.
_fetch_names
)
# user defined
self
.
init_op
()
except
Exception
as
e
:
_LOGGER
.
error
(
log
(
e
))
os
.
_exit
(
-
1
)
# init profiler
self
.
_profiler
=
TimeProfiler
()
self
.
_profiler
.
enable
(
self
.
_use_profile
)
self
.
_is_run
=
True
while
self
.
_is_run
:
#self._profiler_record("get#{}_0".format(op_info_prefix))
...
...
@@ -383,8 +379,8 @@ class Op(object):
# process
self
.
_profiler_record
(
"midp#{}_0"
.
format
(
op_info_prefix
))
midped_data
,
error_channeldata
=
self
.
_run_process
(
client_predict_handler
,
preped_data
,
data_id
,
log
)
midped_data
,
error_channeldata
=
self
.
_run_process
(
preped_data
,
data_id
,
log
)
self
.
_profiler_record
(
"midp#{}_1"
.
format
(
op_info_prefix
))
if
error_channeldata
is
not
None
:
self
.
_push_to_output_channels
(
error_channeldata
,
...
...
@@ -531,12 +527,8 @@ class VirtualOp(Op):
self
.
_is_run
=
True
while
self
.
_is_run
:
#self._profiler_record("get#{}_0".format(op_info_prefix))
channeldata_dict
=
input_channel
.
front
(
self
.
name
)
#self._profiler_record("get#{}_1".format(op_info_prefix))
#self._profiler_record("push#{}_0".format(op_info_prefix))
for
name
,
data
in
channeldata_dict
.
items
():
self
.
_push_to_output_channels
(
data
,
channels
=
output_channels
,
name
=
name
)
#self._profiler_record("push#{}_1".format(op_info_prefix))
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录