Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
67ca0f84
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,发现更多精彩内容 >>
提交
67ca0f84
编写于
6月 11, 2020
作者:
B
barrierye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug
上级
31b11557
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
18 deletion
+16
-18
python/examples/fit_a_line/test_py_server.py
python/examples/fit_a_line/test_py_server.py
+1
-1
python/paddle_serving_server/pyserver.py
python/paddle_serving_server/pyserver.py
+15
-17
未找到文件。
python/examples/fit_a_line/test_py_server.py
浏览文件 @
67ca0f84
...
...
@@ -37,7 +37,7 @@ class CombineOp(Op):
return
data
read_op
=
Op
(
name
=
"read"
,
input
=
None
)
read_op
=
Op
(
name
=
"read"
,
input
s
=
None
)
uci1_op
=
Op
(
name
=
"uci1"
,
inputs
=
[
read_op
],
server_model
=
"./uci_housing_model"
,
...
...
python/paddle_serving_server/pyserver.py
浏览文件 @
67ca0f84
...
...
@@ -686,10 +686,6 @@ class GeneralPythonService(
return
resp
class
VirtualOp
(
Op
):
pass
class
PyServer
(
object
):
def
__init__
(
self
,
retry
=
2
,
profile
=
False
):
self
.
_channels
=
[]
...
...
@@ -710,7 +706,7 @@ class PyServer(object):
self
.
_user_ops
.
append
(
op
)
def
add_ops
(
self
,
ops
):
self
.
_user_ops
.
ex
pa
nd
(
ops
)
self
.
_user_ops
.
ex
te
nd
(
ops
)
def
gen_desc
(
self
):
logging
.
info
(
'here will generate desc for PAAS'
)
...
...
@@ -718,9 +714,9 @@ class PyServer(object):
def
_topo_sort
(
self
):
indeg_num
=
{}
outdegs
=
{}
outdegs
=
{
op
.
name
:
[]
for
op
in
self
.
_user_ops
}
que_idx
=
0
# scroll queue
ques
=
[
Queue
.
Simple
Queue
()
for
_
in
range
(
2
)]
ques
=
[
Queue
.
Queue
()
for
_
in
range
(
2
)]
for
idx
,
op
in
enumerate
(
self
.
_user_ops
):
# check the name of op is globally unique
if
op
.
name
in
indeg_num
:
...
...
@@ -729,10 +725,7 @@ class PyServer(object):
if
indeg_num
[
op
.
name
]
==
0
:
ques
[
que_idx
].
put
(
op
)
for
pred_op
in
op
.
get_input_ops
():
if
op
.
name
in
outdegs
:
outdegs
[
op
.
name
].
append
(
op
)
else
:
outdegs
[
op
.
name
]
=
[
op
]
outdegs
[
pred_op
.
name
].
append
(
op
)
# get dag_views
dag_views
=
[]
...
...
@@ -747,7 +740,7 @@ class PyServer(object):
op_name
=
op
.
name
sorted_op_num
+=
1
for
succ_op
in
outdegs
[
op_name
]:
indeg_num
[
op_
name
]
-=
1
indeg_num
[
succ_op
.
name
]
-=
1
if
indeg_num
[
succ_op
.
name
]
==
0
:
next_que
.
put
(
succ_op
)
dag_views
.
append
(
dag_view
)
...
...
@@ -782,7 +775,7 @@ class PyServer(object):
pred_op_of_next_view_op
[
succ_op
.
name
]
=
[]
pred_op_of_next_view_op
[
succ_op
.
name
].
append
(
op
)
else
:
vop
=
VirtualOp
(
name
=
"vir{}"
.
format
(
virtual_op_idx
)
)
vop
=
Op
(
name
=
"vir{}"
.
format
(
virtual_op_idx
),
inputs
=
[]
)
virtual_op_idx
+=
1
virtual_ops
.
append
(
virtual_op
)
outdegs
[
vop
.
name
]
=
[
succ_op
]
...
...
@@ -826,7 +819,11 @@ class PyServer(object):
last_op
=
dag_views
[
-
1
][
0
]
last_op
.
add_output_channel
(
output_channel
)
self
.
_ops
=
self
.
_user_ops
+
virtual_ops
self
.
_ops
=
virtual_ops
for
op
in
self
.
_user_ops
:
if
len
(
op
.
get_input_ops
())
==
0
:
continue
self
.
_ops
.
append
(
op
)
self
.
_channels
=
channels
return
input_channel
,
output_channel
...
...
@@ -836,7 +833,10 @@ class PyServer(object):
input_channel
,
output_channel
=
self
.
_topo_sort
()
self
.
_in_channel
=
input_channel
self
.
out_channel
=
output_channel
self
.
_out_channel
=
output_channel
for
op
in
self
.
_ops
:
if
op
.
with_serving
():
self
.
prepare_serving
(
op
)
self
.
gen_desc
()
def
_op_start_wrapper
(
self
,
op
,
concurrency_idx
):
...
...
@@ -849,14 +849,12 @@ class PyServer(object):
logging
.
debug
(
"run op: {}, op_concurrency: {}"
.
format
(
op
.
name
,
op_concurrency
))
for
c
in
range
(
op_concurrency
):
# th = multiprocessing.Process(
th
=
threading
.
Thread
(
target
=
self
.
_op_start_wrapper
,
args
=
(
op
,
c
))
th
.
start
()
self
.
_op_threads
.
append
(
th
)
def
_stop_ops
(
self
):
# TODO
for
op
in
self
.
_ops
:
op
.
stop
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录