Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
c2109108
S
Serving
项目概览
PaddlePaddle
/
Serving
接近 2 年 前同步成功
通知
186
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看板
提交
c2109108
编写于
6月 28, 2020
作者:
B
barrierye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor pipeline server
上级
b3acf1d3
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
358 addition
and
575 deletion
+358
-575
core/configure/CMakeLists.txt
core/configure/CMakeLists.txt
+0
-36
core/configure/proto/general_python_service.proto
core/configure/proto/general_python_service.proto
+0
-36
core/configure/proto/pyserving_channel.proto
core/configure/proto/pyserving_channel.proto
+0
-30
python/CMakeLists.txt
python/CMakeLists.txt
+7
-0
python/examples/imdb/test_client.py
python/examples/imdb/test_client.py
+2
-2
python/examples/pipeline/imdb_model_ensemble/config.yml
python/examples/pipeline/imdb_model_ensemble/config.yml
+6
-0
python/examples/pipeline/imdb_model_ensemble/test_pipeline_client.py
...ples/pipeline/imdb_model_ensemble/test_pipeline_client.py
+2
-6
python/examples/pipeline/imdb_model_ensemble/test_pipeline_server.py
...ples/pipeline/imdb_model_ensemble/test_pipeline_server.py
+46
-36
python/paddle_serving_client/pipeline.py
python/paddle_serving_client/pipeline.py
+0
-62
python/pipeline/__init__.py
python/pipeline/__init__.py
+2
-1
python/pipeline/channel.py
python/pipeline/channel.py
+33
-74
python/pipeline/operator.py
python/pipeline/operator.py
+110
-93
python/pipeline/pipeline_server.py
python/pipeline/pipeline_server.py
+120
-174
python/pipeline/profiler.py
python/pipeline/profiler.py
+0
-15
python/pipeline/proto/pipeline_service.proto
python/pipeline/proto/pipeline_service.proto
+3
-0
python/setup.py.client.in
python/setup.py.client.in
+13
-6
python/setup.py.server.in
python/setup.py.server.in
+7
-2
python/setup.py.server_gpu.in
python/setup.py.server_gpu.in
+7
-2
未找到文件。
core/configure/CMakeLists.txt
浏览文件 @
c2109108
...
@@ -39,9 +39,6 @@ py_grpc_proto_compile(multi_lang_general_model_service_py_proto SRCS proto/multi
...
@@ -39,9 +39,6 @@ py_grpc_proto_compile(multi_lang_general_model_service_py_proto SRCS proto/multi
add_custom_target
(
multi_lang_general_model_service_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_custom_target
(
multi_lang_general_model_service_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_dependencies
(
multi_lang_general_model_service_py_proto multi_lang_general_model_service_py_proto_init
)
add_dependencies
(
multi_lang_general_model_service_py_proto multi_lang_general_model_service_py_proto_init
)
py_grpc_proto_compile
(
general_python_service_py_proto SRCS proto/general_python_service.proto
)
add_custom_target
(
general_python_service_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_dependencies
(
general_python_service_py_proto general_python_service_py_proto_init
)
if
(
CLIENT
)
if
(
CLIENT
)
py_proto_compile
(
sdk_configure_py_proto SRCS proto/sdk_configure.proto
)
py_proto_compile
(
sdk_configure_py_proto SRCS proto/sdk_configure.proto
)
add_custom_target
(
sdk_configure_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_custom_target
(
sdk_configure_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
...
@@ -65,11 +62,6 @@ add_custom_command(TARGET multi_lang_general_model_service_py_proto POST_BUILD
...
@@ -65,11 +62,6 @@ add_custom_command(TARGET multi_lang_general_model_service_py_proto POST_BUILD
COMMENT
"Copy generated multi_lang_general_model_service proto file into directory paddle_serving_client/proto."
COMMENT
"Copy generated multi_lang_general_model_service proto file into directory paddle_serving_client/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET general_python_service_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_client/proto
COMMAND cp general_python_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_client/proto
COMMENT
"Copy generated general_python_service proto file into directory paddle_serving_client/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
endif
()
endif
()
if
(
APP
)
if
(
APP
)
...
@@ -85,10 +77,6 @@ py_proto_compile(server_config_py_proto SRCS proto/server_configure.proto)
...
@@ -85,10 +77,6 @@ py_proto_compile(server_config_py_proto SRCS proto/server_configure.proto)
add_custom_target
(
server_config_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_custom_target
(
server_config_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_dependencies
(
server_config_py_proto server_config_py_proto_init
)
add_dependencies
(
server_config_py_proto server_config_py_proto_init
)
py_proto_compile
(
pyserving_channel_py_proto SRCS proto/pyserving_channel.proto
)
add_custom_target
(
pyserving_channel_py_proto_init ALL COMMAND
${
CMAKE_COMMAND
}
-E touch __init__.py
)
add_dependencies
(
pyserving_channel_py_proto pyserving_channel_py_proto_init
)
if
(
NOT WITH_GPU
)
if
(
NOT WITH_GPU
)
add_custom_command
(
TARGET server_config_py_proto POST_BUILD
add_custom_command
(
TARGET server_config_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
...
@@ -103,18 +91,6 @@ add_custom_command(TARGET general_model_config_py_proto POST_BUILD
...
@@ -103,18 +91,6 @@ add_custom_command(TARGET general_model_config_py_proto POST_BUILD
COMMENT
"Copy generated general_model_config proto file into directory paddle_serving_server/proto."
COMMENT
"Copy generated general_model_config proto file into directory paddle_serving_server/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET general_python_service_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMAND cp general_python_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMENT
"Copy generated general_python_service proto file into directory paddle_serving_server/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET pyserving_channel_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMAND cp pyserving_channel*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMENT
"Copy generated pyserving_channel proto file into directory paddle_serving_server/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET multi_lang_general_model_service_py_proto POST_BUILD
add_custom_command
(
TARGET multi_lang_general_model_service_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMAND cp multi_lang_general_model_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
COMMAND cp multi_lang_general_model_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server/proto
...
@@ -141,18 +117,6 @@ add_custom_command(TARGET general_model_config_py_proto POST_BUILD
...
@@ -141,18 +117,6 @@ add_custom_command(TARGET general_model_config_py_proto POST_BUILD
paddle_serving_server_gpu/proto."
paddle_serving_server_gpu/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET general_python_service_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMAND cp general_python_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMENT
"Copy generated general_python_service proto file into directory paddle_serving_server_gpu/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET pyserving_channel_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMAND cp pyserving_channel*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMENT
"Copy generated pyserving_channel proto file into directory paddle_serving_server_gpu/proto."
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET multi_lang_general_model_service_py_proto POST_BUILD
add_custom_command
(
TARGET multi_lang_general_model_service_py_proto POST_BUILD
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMAND
${
CMAKE_COMMAND
}
-E make_directory
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMAND cp multi_lang_general_model_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
COMMAND cp multi_lang_general_model_service*.py
${
PADDLE_SERVING_BINARY_DIR
}
/python/paddle_serving_server_gpu/proto
...
...
core/configure/proto/general_python_service.proto
已删除
100644 → 0
浏览文件 @
b3acf1d3
// Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
syntax
=
"proto2"
;
package
baidu
.
paddle_serving.pyserving
;
service
GeneralPythonService
{
rpc
inference
(
Request
)
returns
(
Response
)
{}
}
message
Request
{
repeated
bytes
feed_insts
=
1
;
repeated
string
feed_var_names
=
2
;
repeated
bytes
shape
=
3
;
repeated
string
type
=
4
;
}
message
Response
{
repeated
bytes
fetch_insts
=
1
;
repeated
string
fetch_var_names
=
2
;
required
int32
ecode
=
3
;
optional
string
error_info
=
4
;
repeated
bytes
shape
=
5
;
repeated
string
type
=
6
;
}
core/configure/proto/pyserving_channel.proto
已删除
100644 → 0
浏览文件 @
b3acf1d3
// Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
syntax
=
"proto2"
;
package
baidu
.
paddle_serving.pyserving
;
message
ChannelData
{
repeated
Inst
insts
=
1
;
required
int32
id
=
2
;
required
int32
ecode
=
4
;
optional
string
error_info
=
5
;
}
message
Inst
{
required
bytes
data
=
1
;
required
string
name
=
2
;
required
bytes
shape
=
3
;
required
string
type
=
4
;
}
python/CMakeLists.txt
浏览文件 @
c2109108
if
(
CLIENT
)
if
(
CLIENT
)
file
(
INSTALL pipeline DESTINATION paddle_serving_client
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
run_codegen.py
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/paddle_serving_client/pipeline/proto
)
file
(
GLOB_RECURSE SERVING_CLIENT_PY_FILES paddle_serving_client/*.py
)
file
(
GLOB_RECURSE SERVING_CLIENT_PY_FILES paddle_serving_client/*.py
)
set
(
PY_FILES
${
SERVING_CLIENT_PY_FILES
}
)
set
(
PY_FILES
${
SERVING_CLIENT_PY_FILES
}
)
SET
(
PACKAGE_NAME
"serving_client"
)
SET
(
PACKAGE_NAME
"serving_client"
)
...
@@ -8,9 +11,13 @@ endif()
...
@@ -8,9 +11,13 @@ endif()
if
(
SERVER
)
if
(
SERVER
)
if
(
NOT WITH_GPU
)
if
(
NOT WITH_GPU
)
file
(
INSTALL pipeline DESTINATION paddle_serving_server
)
file
(
INSTALL pipeline DESTINATION paddle_serving_server
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
run_codegen.py
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/paddle_serving_server/pipeline/proto
)
file
(
GLOB_RECURSE SERVING_SERVER_PY_FILES paddle_serving_server/*.py
)
file
(
GLOB_RECURSE SERVING_SERVER_PY_FILES paddle_serving_server/*.py
)
else
()
else
()
file
(
INSTALL pipeline DESTINATION paddle_serving_server_gpu
)
file
(
INSTALL pipeline DESTINATION paddle_serving_server_gpu
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
run_codegen.py
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/paddle_serving_server_gpu/pipeline/proto
)
file
(
GLOB_RECURSE SERVING_SERVER_PY_FILES paddle_serving_server_gpu/*.py
)
file
(
GLOB_RECURSE SERVING_SERVER_PY_FILES paddle_serving_server_gpu/*.py
)
endif
()
endif
()
set
(
PY_FILES
${
SERVING_SERVER_PY_FILES
}
)
set
(
PY_FILES
${
SERVING_SERVER_PY_FILES
}
)
...
...
python/examples/imdb/test_client.py
浏览文件 @
c2109108
...
@@ -18,7 +18,7 @@ import sys
...
@@ -18,7 +18,7 @@ import sys
client
=
Client
()
client
=
Client
()
client
.
load_client_config
(
sys
.
argv
[
1
])
client
.
load_client_config
(
sys
.
argv
[
1
])
client
.
connect
([
"127.0.0.1:9
292
"
])
client
.
connect
([
"127.0.0.1:9
393
"
])
# you can define any english sentence or dataset here
# you can define any english sentence or dataset here
# This example reuses imdb reader in training, you
# This example reuses imdb reader in training, you
...
@@ -29,6 +29,6 @@ imdb_dataset.load_resource(sys.argv[2])
...
@@ -29,6 +29,6 @@ imdb_dataset.load_resource(sys.argv[2])
for
line
in
sys
.
stdin
:
for
line
in
sys
.
stdin
:
word_ids
,
label
=
imdb_dataset
.
get_words_and_label
(
line
)
word_ids
,
label
=
imdb_dataset
.
get_words_and_label
(
line
)
feed
=
{
"words"
:
word_ids
}
feed
=
{
"words"
:
word_ids
}
fetch
=
[
"
acc"
,
"cost"
,
"
prediction"
]
fetch
=
[
"prediction"
]
fetch_map
=
client
.
predict
(
feed
=
feed
,
fetch
=
fetch
)
fetch_map
=
client
.
predict
(
feed
=
feed
,
fetch
=
fetch
)
print
(
"{} {}"
.
format
(
fetch_map
[
"prediction"
][
0
],
label
[
0
]))
print
(
"{} {}"
.
format
(
fetch_map
[
"prediction"
][
0
],
label
[
0
]))
python/examples/pipeline/imdb_model_ensemble/config.yml
0 → 100644
浏览文件 @
c2109108
use_multithread
:
true
client_type
:
brpc
retry
:
2
profile
:
false
prot
:
8080
worker_num
:
2
python/examples/pipeline/imdb_model_ensemble/test_pipeline_client.py
浏览文件 @
c2109108
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
# limitations under the License.
# limitations under the License.
from
paddle_serving_client.pipeline
import
PipelineClient
from
paddle_serving_client.pipeline
import
PipelineClient
import
numpy
as
np
import
numpy
as
np
from
paddle_serving_app.reader
import
IMDBDataset
from
line_profiler
import
LineProfiler
from
line_profiler
import
LineProfiler
client
=
PipelineClient
()
client
=
PipelineClient
()
...
@@ -23,12 +22,9 @@ lp = LineProfiler()
...
@@ -23,12 +22,9 @@ lp = LineProfiler()
lp_wrapper
=
lp
(
client
.
predict
)
lp_wrapper
=
lp
(
client
.
predict
)
words
=
'i am very sad | 0'
words
=
'i am very sad | 0'
imdb_dataset
=
IMDBDataset
()
imdb_dataset
.
load_resource
(
'imdb.vocab'
)
for
i
in
range
(
1
):
for
i
in
range
(
10
):
word_ids
,
label
=
imdb_dataset
.
get_words_and_label
(
words
)
fetch_map
=
lp_wrapper
(
feed_dict
=
{
"words"
:
words
},
fetch
=
[
"prediction"
])
fetch_map
=
lp_wrapper
(
feed
=
{
"words"
:
word_ids
},
fetch
=
[
"prediction"
])
print
(
fetch_map
)
print
(
fetch_map
)
#lp.print_stats()
#lp.print_stats()
python/examples/pipeline/imdb_model_ensemble/test_pipeline_server.py
浏览文件 @
c2109108
...
@@ -13,18 +13,31 @@
...
@@ -13,18 +13,31 @@
# limitations under the License.
# limitations under the License.
# pylint: disable=doc-string-missing
# pylint: disable=doc-string-missing
from
paddle_serving_server.pipeline
import
Op
from
paddle_serving_server.pipeline
import
Op
,
ReadOp
from
paddle_serving_server.pipeline
import
PipelineServer
from
paddle_serving_server.pipeline
import
PipelineServer
import
numpy
as
np
import
numpy
as
np
import
logging
import
logging
from
paddle_serving_app.reader
import
IMDBDataset
logging
.
basicConfig
(
logging
.
basicConfig
(
format
=
'%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s'
,
format
=
'%(asctime)s %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s'
,
datefmt
=
'%Y-%m-%d %H:%M'
,
datefmt
=
'%Y-%m-%d %H:%M'
,
#level=logging.DEBUG)
#
level=logging.DEBUG)
level
=
logging
.
INFO
)
level
=
logging
.
INFO
)
class
ImdbOp
(
Op
):
def
preprocess
(
self
,
input_data
):
data
=
input_data
.
parse
()
imdb_dataset
=
IMDBDataset
()
imdb_dataset
.
load_resource
(
'imdb.vocab'
)
word_ids
,
_
=
imdb_dataset
.
get_words_and_label
(
data
[
'words'
])
return
{
"words"
:
word_ids
}
# def postprocess(self, fetch_data):
# return {key: str(value) for key, value in fetch_data.items()}
class
CombineOp
(
Op
):
class
CombineOp
(
Op
):
def
preprocess
(
self
,
input_data
):
def
preprocess
(
self
,
input_data
):
combined_prediction
=
0
combined_prediction
=
0
...
@@ -32,42 +45,39 @@ class CombineOp(Op):
...
@@ -32,42 +45,39 @@ class CombineOp(Op):
data
=
channeldata
.
parse
()
data
=
channeldata
.
parse
()
logging
.
info
(
"{}: {}"
.
format
(
op_name
,
data
[
"prediction"
]))
logging
.
info
(
"{}: {}"
.
format
(
op_name
,
data
[
"prediction"
]))
combined_prediction
+=
data
[
"prediction"
]
combined_prediction
+=
data
[
"prediction"
]
data
=
{
"prediction"
:
combined_prediction
/
2
}
data
=
{
"prediction"
:
str
(
combined_prediction
/
2
)
}
return
data
return
data
read_op
=
Op
(
name
=
"read"
,
inputs
=
None
)
read_op
=
ReadOp
()
bow_op
=
Op
(
name
=
"bow"
,
bow_op
=
ImdbOp
(
inputs
=
[
read_op
],
name
=
"bow"
,
server_model
=
"imdb_bow_model"
,
input_ops
=
[
read_op
],
server_port
=
"9393"
,
server_endpoints
=
[
"127.0.0.1:9393"
],
device
=
"cpu"
,
fetch_list
=
[
"prediction"
],
client_config
=
"imdb_bow_client_conf/serving_client_conf.prototxt"
,
client_config
=
"imdb_bow_client_conf/serving_client_conf.prototxt"
,
server_name
=
"127.0.0.1:9393"
,
concurrency
=
1
,
fetch_names
=
[
"prediction"
],
timeout
=-
1
,
concurrency
=
1
,
retry
=
1
)
timeout
=
0.1
,
cnn_op
=
ImdbOp
(
retry
=
2
)
name
=
"cnn"
,
cnn_op
=
Op
(
name
=
"cnn"
,
input_ops
=
[
read_op
],
inputs
=
[
read_op
],
server_endpoints
=
[
"127.0.0.1:9292"
],
server_model
=
"imdb_cnn_model"
,
fetch_list
=
[
"prediction"
],
server_port
=
"9292"
,
client_config
=
"imdb_cnn_client_conf/serving_client_conf.prototxt"
,
device
=
"cpu"
,
concurrency
=
1
,
client_config
=
"imdb_cnn_client_conf/serving_client_conf.prototxt"
,
timeout
=-
1
,
server_name
=
"127.0.0.1:9292"
,
retry
=
1
)
fetch_names
=
[
"prediction"
],
concurrency
=
1
,
timeout
=-
1
,
retry
=
1
)
combine_op
=
CombineOp
(
combine_op
=
CombineOp
(
name
=
"combine"
,
inputs
=
[
bow_op
,
cnn_op
],
concurrency
=
1
,
timeout
=-
1
,
retry
=
1
)
name
=
"combine"
,
input_ops
=
[
bow_op
,
cnn_op
],
pyserver
=
PipelineServer
(
concurrency
=
1
,
use_multithread
=
True
,
timeout
=-
1
,
client_type
=
'grpc'
,
use_future
=
False
,
profile
=
False
,
retry
=
1
)
retry
=
1
)
pyserver
.
add_ops
([
read_op
,
bow_op
,
cnn_op
,
combine_op
])
pyserver
.
prepare_server
(
port
=
8080
,
worker_num
=
2
)
server
=
PipelineServer
()
pyserver
.
run_server
()
server
.
add_ops
([
read_op
,
bow_op
,
cnn_op
,
combine_op
])
# server.set_response_op(bow_op)
server
.
set_response_op
(
combine_op
)
server
.
prepare_server
(
'config.yml'
)
server
.
run_server
()
python/paddle_serving_client/pipeline.py
已删除
100644 → 0
浏览文件 @
b3acf1d3
# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# pylint: disable=doc-string-missing
import
grpc
from
.proto
import
general_python_service_pb2
from
.proto
import
general_python_service_pb2_grpc
import
numpy
as
np
class
PipelineClient
(
object
):
def
__init__
(
self
):
self
.
_channel
=
None
def
connect
(
self
,
endpoint
):
self
.
_channel
=
grpc
.
insecure_channel
(
endpoint
)
self
.
_stub
=
general_python_service_pb2_grpc
.
GeneralPythonServiceStub
(
self
.
_channel
)
def
_pack_data_for_infer
(
self
,
feed_data
):
req
=
general_python_service_pb2
.
Request
()
for
name
,
data
in
feed_data
.
items
():
if
isinstance
(
data
,
list
):
data
=
np
.
array
(
data
)
elif
not
isinstance
(
data
,
np
.
ndarray
):
raise
TypeError
(
"only list and numpy array type is supported."
)
req
.
feed_var_names
.
append
(
name
)
req
.
feed_insts
.
append
(
data
.
tobytes
())
req
.
shape
.
append
(
np
.
array
(
data
.
shape
,
dtype
=
"int32"
).
tobytes
())
req
.
type
.
append
(
str
(
data
.
dtype
))
return
req
def
predict
(
self
,
feed
,
fetch
):
if
not
isinstance
(
feed
,
dict
):
raise
TypeError
(
"feed must be dict type with format: {name: value}."
)
if
not
isinstance
(
fetch
,
list
):
raise
TypeError
(
"fetch_with_type must be list type with format: [name]."
)
req
=
self
.
_pack_data_for_infer
(
feed
)
resp
=
self
.
_stub
.
inference
(
req
)
if
resp
.
ecode
!=
0
:
return
{
"ecode"
:
resp
.
ecode
,
"error_info"
:
resp
.
error_info
}
fetch_map
=
{
"ecode"
:
resp
.
ecode
}
for
idx
,
name
in
enumerate
(
resp
.
fetch_var_names
):
if
name
not
in
fetch
:
continue
fetch_map
[
name
]
=
np
.
frombuffer
(
resp
.
fetch_insts
[
idx
],
dtype
=
resp
.
type
[
idx
])
fetch_map
[
name
].
shape
=
np
.
frombuffer
(
resp
.
shape
[
idx
],
dtype
=
"int32"
)
return
fetch_map
python/pipeline/__init__.py
浏览文件 @
c2109108
...
@@ -12,5 +12,6 @@
...
@@ -12,5 +12,6 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
from
operator
import
Op
from
operator
import
Op
,
ReadOp
from
pipeline_server
import
PipelineServer
from
pipeline_server
import
PipelineServer
from
pipeline_client
import
PipelineClient
python/pipeline/channel.py
浏览文件 @
c2109108
...
@@ -22,15 +22,10 @@ elif sys.version_info.major == 3:
...
@@ -22,15 +22,10 @@ elif sys.version_info.major == 3:
import
queue
as
Queue
import
queue
as
Queue
else
:
else
:
raise
Exception
(
"Error Python version"
)
raise
Exception
(
"Error Python version"
)
<<<<<<<
HEAD
=======
from
concurrent
import
futures
import
numpy
as
np
import
numpy
as
np
from
..proto
import
pyserving_channel_pb2
as
channel_pb2
import
logging
import
logging
import
enum
import
enum
import
copy
import
copy
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
class
ChannelDataEcode
(
enum
.
Enum
):
class
ChannelDataEcode
(
enum
.
Enum
):
...
@@ -43,48 +38,25 @@ class ChannelDataEcode(enum.Enum):
...
@@ -43,48 +38,25 @@ class ChannelDataEcode(enum.Enum):
class
ChannelDataType
(
enum
.
Enum
):
class
ChannelDataType
(
enum
.
Enum
):
<<<<<<<
HEAD
DICT
=
0
DICT
=
0
CHANNEL_NPDATA
=
1
CHANNEL_NPDATA
=
1
ERROR
=
2
ERROR
=
2
class
ChannelData
(
object
):
pass
class
ThreadChannel
(
Queue
.
Queue
):
pass
class
ProcessChannel
(
multiprocessing
.
queues
.
Queue
):
pass
=======
CHANNEL_PBDATA
=
0
CHANNEL_FUTURE
=
1
CHANNEL_NPDATA
=
2
ERROR
=
3
class
ChannelData
(
object
):
class
ChannelData
(
object
):
def
__init__
(
self
,
def
__init__
(
self
,
datatype
=
None
,
datatype
=
None
,
future
=
None
,
pbdata
=
None
,
npdata
=
None
,
npdata
=
None
,
dictdata
=
None
,
data_id
=
None
,
data_id
=
None
,
callback_func
=
None
,
ecode
=
None
,
ecode
=
None
,
error_info
=
None
):
error_info
=
None
):
'''
'''
There are several ways to use it:
There are several ways to use it:
1. ChannelData(ChannelDataType.CHANNEL_FUTURE.value, future, pbdata[, callback_func])
1. ChannelData(ChannelDataType.CHANNEL_NPDATA.value, npdata, data_id)
2. ChannelData(ChannelDataType.CHANNEL_FUTURE.value, future, data_id[, callback_func])
2. ChannelData(ChannelDataType.DICT.value, dictdata, data_id)
3. ChannelData(ChannelDataType.CHANNEL_PBDATA.value, pbdata)
3. ChannelData(ecode, error_info, data_id)
4. ChannelData(ChannelDataType.CHANNEL_PBDATA.value, npdata, data_id)
5. ChannelData(ChannelDataType.CHANNEL_NPDATA.value, npdata, data_id)
6. ChannelData(ecode, error_info, data_id)
Protobufs are not pickle-able:
Protobufs are not pickle-able:
https://stackoverflow.com/questions/55344376/how-to-import-protobuf-module
https://stackoverflow.com/questions/55344376/how-to-import-protobuf-module
...
@@ -94,67 +66,55 @@ class ChannelData(object):
...
@@ -94,67 +66,55 @@ class ChannelData(object):
raise
ValueError
(
"data_id and error_info cannot be None"
)
raise
ValueError
(
"data_id and error_info cannot be None"
)
datatype
=
ChannelDataType
.
ERROR
.
value
datatype
=
ChannelDataType
.
ERROR
.
value
else
:
else
:
if
datatype
==
ChannelDataType
.
CHANNEL_FUTURE
.
value
:
if
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
if
data_id
is
None
:
ecode
,
error_info
=
ChannelData
.
check_npdata
(
npdata
)
raise
ValueError
(
"data_id cannot be None"
)
ecode
=
ChannelDataEcode
.
OK
.
value
elif
datatype
==
ChannelDataType
.
CHANNEL_PBDATA
.
value
:
if
pbdata
is
None
:
if
data_id
is
None
:
raise
ValueError
(
"data_id cannot be None"
)
pbdata
=
channel_pb2
.
ChannelData
()
ecode
,
error_info
=
self
.
_check_npdata
(
npdata
)
if
ecode
!=
ChannelDataEcode
.
OK
.
value
:
logging
.
error
(
error_info
)
else
:
for
name
,
value
in
npdata
.
items
():
inst
=
channel_pb2
.
Inst
()
inst
.
data
=
value
.
tobytes
()
inst
.
name
=
name
inst
.
shape
=
np
.
array
(
value
.
shape
,
dtype
=
"int32"
).
tobytes
()
inst
.
type
=
str
(
value
.
dtype
)
pbdata
.
insts
.
append
(
inst
)
elif
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
ecode
,
error_info
=
self
.
_check_npdata
(
npdata
)
if
ecode
!=
ChannelDataEcode
.
OK
.
value
:
if
ecode
!=
ChannelDataEcode
.
OK
.
value
:
datatype
=
ChannelDataType
.
ERROR
.
value
logging
.
error
(
error_info
)
elif
datatype
==
ChannelDataType
.
DICT
.
value
:
ecode
,
error_info
=
ChannelData
.
check_dictdata
(
dictdata
)
if
ecode
!=
ChannelDataEcode
.
OK
.
value
:
datatype
=
ChannelDataType
.
ERROR
.
value
logging
.
error
(
error_info
)
logging
.
error
(
error_info
)
else
:
else
:
raise
ValueError
(
"datatype not match"
)
raise
ValueError
(
"datatype not match"
)
self
.
future
=
future
self
.
pbdata
=
pbdata
self
.
npdata
=
npdata
self
.
datatype
=
datatype
self
.
datatype
=
datatype
self
.
npdata
=
npdata
self
.
dictdata
=
dictdata
self
.
id
=
data_id
self
.
id
=
data_id
self
.
ecode
=
ecode
self
.
ecode
=
ecode
self
.
error_info
=
error_info
self
.
error_info
=
error_info
self
.
callback_func
=
callback_func
def
_check_npdata
(
self
,
npdata
):
@
staticmethod
def
check_dictdata
(
dictdata
):
ecode
=
ChannelDataEcode
.
OK
.
value
error_info
=
None
if
not
isinstance
(
dictdata
,
dict
):
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
error_info
=
"the value of postped_data must "
\
"be dict, but get {}"
.
format
(
type
(
dictdata
))
return
ecode
,
error_info
@
staticmethod
def
check_npdata
(
npdata
):
ecode
=
ChannelDataEcode
.
OK
.
value
ecode
=
ChannelDataEcode
.
OK
.
value
error_info
=
None
error_info
=
None
for
_
,
value
in
npdata
.
items
():
for
_
,
value
in
npdata
.
items
():
if
not
isinstance
(
value
,
np
.
ndarray
):
if
not
isinstance
(
value
,
np
.
ndarray
):
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
error_info
=
log
(
"the value of postped_data must "
\
error_info
=
"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
def
parse
(
self
):
def
parse
(
self
):
# return narray
feed
=
None
feed
=
None
if
self
.
datatype
==
ChannelDataType
.
CHANNEL_PBDATA
.
value
:
if
self
.
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
feed
=
{}
# return narray
for
inst
in
self
.
pbdata
.
insts
:
feed
[
inst
.
name
]
=
np
.
frombuffer
(
inst
.
data
,
dtype
=
inst
.
type
)
feed
[
inst
.
name
].
shape
=
np
.
frombuffer
(
inst
.
shape
,
dtype
=
"int32"
)
elif
self
.
datatype
==
ChannelDataType
.
CHANNEL_FUTURE
.
value
:
feed
=
self
.
future
.
result
()
if
self
.
callback_func
is
not
None
:
feed
=
self
.
callback_func
(
feed
)
elif
self
.
datatype
==
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
feed
=
self
.
npdata
feed
=
self
.
npdata
elif
self
.
datatype
==
ChannelDataType
.
DICT
.
value
:
# return dict
feed
=
self
.
dictdata
else
:
else
:
raise
TypeError
(
"Error type({}) in datatype."
.
format
(
self
.
datatype
))
raise
TypeError
(
"Error type({}) in datatype."
.
format
(
self
.
datatype
))
return
feed
return
feed
...
@@ -609,4 +569,3 @@ class ThreadChannel(Queue.Queue):
...
@@ -609,4 +569,3 @@ class ThreadChannel(Queue.Queue):
self
.
close
()
self
.
close
()
self
.
_stop
=
True
self
.
_stop
=
True
self
.
_cv
.
notify_all
()
self
.
_cv
.
notify_all
()
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
python/pipeline/operator.py
浏览文件 @
c2109108
...
@@ -23,35 +23,33 @@ import func_timeout
...
@@ -23,35 +23,33 @@ import func_timeout
from
.channel
import
ThreadChannel
,
ProcessChannel
,
ChannelDataEcode
,
ChannelData
,
ChannelDataType
from
.channel
import
ThreadChannel
,
ProcessChannel
,
ChannelDataEcode
,
ChannelData
,
ChannelDataType
from
.util
import
NameGenerator
from
.util
import
NameGenerator
_name_gen
=
NameGenerator
(
"Op"
)
_op_name_gen
=
NameGenerator
(
"Op"
)
class
Op
(
object
):
class
Op
(
object
):
def
__init__
(
self
,
def
__init__
(
self
,
name
=
None
,
name
=
None
,
input_ops
=
[],
input_ops
=
[],
server_endpoints
=
[],
server_endpoints
=
[],
fetch_list
=
[],
client_config
=
None
,
concurrency
=
1
,
concurrency
=
1
,
timeout
=-
1
,
timeout
=-
1
,
retry
=
1
):
retry
=
1
):
if
name
is
None
:
if
name
is
None
:
name
=
_name_gen
.
next
()
name
=
_
op_
name_gen
.
next
()
self
.
_is_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
(
input_ops
)
self
.
set_input_ops
(
input_ops
)
self
.
_server_endpoints
=
server_endpoints
self
.
with_serving
=
False
self
.
with_serving
=
False
'''
if
len
(
self
.
_server_endpoints
)
!=
0
:
self._client_config = client_config
self._server_name = server_name
self._fetch_names = fetch_names
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:
self
.
with_serving
=
True
self
.
with_serving
=
True
'''
self
.
_client_config
=
client_config
self
.
_fetch_names
=
fetch_list
self
.
_timeout
=
timeout
self
.
_timeout
=
timeout
self
.
_retry
=
max
(
1
,
retry
)
self
.
_retry
=
max
(
1
,
retry
)
self
.
_input
=
None
self
.
_input
=
None
...
@@ -66,12 +64,12 @@ class Op(object):
...
@@ -66,12 +64,12 @@ class Op(object):
return
return
self
.
_profiler
.
record
(
string
)
self
.
_profiler
.
record
(
string
)
def
init_client
(
self
,
client_type
,
client_config
,
server_name
,
fetch_names
):
def
init_client
(
self
,
client_type
,
client_config
,
server_endpoints
,
fetch_names
):
if
self
.
with_serving
==
False
:
if
self
.
with_serving
==
False
:
logging
.
debug
(
"{} no client"
.
format
(
self
.
name
))
logging
.
debug
(
"{} no client"
.
format
(
self
.
name
))
return
return
logging
.
debug
(
"{} client_config: {}"
.
format
(
self
.
name
,
client_config
))
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
))
logging
.
debug
(
"{} fetch_names: {}"
.
format
(
self
.
name
,
fetch_names
))
if
client_type
==
'brpc'
:
if
client_type
==
'brpc'
:
self
.
_client
=
Client
()
self
.
_client
=
Client
()
...
@@ -80,10 +78,10 @@ class Op(object):
...
@@ -80,10 +78,10 @@ class Op(object):
else
:
else
:
raise
ValueError
(
"unknow client type: {}"
.
format
(
client_type
))
raise
ValueError
(
"unknow client type: {}"
.
format
(
client_type
))
self
.
_client
.
load_client_config
(
client_config
)
self
.
_client
.
load_client_config
(
client_config
)
self
.
_client
.
connect
(
[
server_name
]
)
self
.
_client
.
connect
(
server_endpoints
)
self
.
_fetch_names
=
fetch_names
self
.
_fetch_names
=
fetch_names
def
get_input_channel
(
self
):
def
_
get_input_channel
(
self
):
return
self
.
_input
return
self
.
_input
def
get_input_ops
(
self
):
def
get_input_ops
(
self
):
...
@@ -108,7 +106,7 @@ class Op(object):
...
@@ -108,7 +106,7 @@ class Op(object):
channel
.
add_consumer
(
self
.
name
)
channel
.
add_consumer
(
self
.
name
)
self
.
_input
=
channel
self
.
_input
=
channel
def
get_output_channels
(
self
):
def
_
get_output_channels
(
self
):
return
self
.
_outputs
return
self
.
_outputs
def
add_output_channel
(
self
,
channel
):
def
add_output_channel
(
self
,
channel
):
...
@@ -120,32 +118,41 @@ class Op(object):
...
@@ -120,32 +118,41 @@ class Op(object):
self
.
_outputs
.
append
(
channel
)
self
.
_outputs
.
append
(
channel
)
def
preprocess
(
self
,
channeldata
):
def
preprocess
(
self
,
channeldata
):
# multiple previous Op
if
isinstance
(
channeldata
,
dict
):
if
isinstance
(
channeldata
,
dict
):
raise
NotImplementedError
(
raise
NotImplementedError
(
'this Op has multiple previous inputs. Please override this method'
'this Op has multiple previous inputs. Please override this method'
)
)
feed
=
channeldata
.
parse
()
return
feed
def
midprocess
(
self
,
data
,
use_future
=
True
):
if
channeldata
.
datatype
is
not
ChannelDataType
.
CHANNEL_NPDATA
.
value
:
if
not
isinstance
(
data
,
dict
):
raise
NotImplementedError
(
'datatype in channeldata is not CHANNEL_NPDATA({}). '
'Please override this method'
.
format
(
channeldata
.
datatype
))
# get numpy dict
feed_data
=
channeldata
.
parse
()
return
feed_data
def
process
(
self
,
feed_dict
):
if
not
isinstance
(
feed_dict
,
dict
):
raise
Exception
(
raise
Exception
(
self
.
_log
(
self
.
_log
(
'
data
must be dict type(the output of preprocess()), but get {}'
.
'
feed_dict
must be dict type(the output of preprocess()), but get {}'
.
format
(
type
(
data
))))
format
(
type
(
feed_dict
))))
logging
.
debug
(
self
.
_log
(
'
data: {}'
.
format
(
data
)))
logging
.
debug
(
self
.
_log
(
'
feed_dict: {}'
.
format
(
feed_dict
)))
logging
.
debug
(
self
.
_log
(
'fetch: {}'
.
format
(
self
.
_fetch_names
)))
logging
.
debug
(
self
.
_log
(
'fetch: {}'
.
format
(
self
.
_fetch_names
)))
if
isinstance
(
self
.
_client
,
MultiLangClient
):
if
isinstance
(
self
.
_client
,
MultiLangClient
):
call_result
=
self
.
_client
.
predict
(
call_result
=
self
.
_client
.
predict
(
feed
=
data
,
fetch
=
self
.
_fetch_names
,
asyn
=
use_future
)
feed
=
feed_dict
,
fetch
=
self
.
_fetch_names
)
logging
.
debug
(
self
.
_log
(
"get call_result"
))
else
:
else
:
call_result
=
self
.
_client
.
predict
(
call_result
=
self
.
_client
.
predict
(
feed
=
data
,
fetch
=
self
.
_fetch_names
)
feed
=
feed_dict
,
fetch
=
self
.
_fetch_names
)
logging
.
debug
(
self
.
_log
(
"get call_resul
t"
))
logging
.
debug
(
self
.
_log
(
"get fetch_dic
t"
))
return
call_result
return
call_result
def
postprocess
(
self
,
output_data
):
def
postprocess
(
self
,
fetch_dict
):
return
output_data
return
fetch_dict
def
stop
(
self
):
def
stop
(
self
):
self
.
_input
.
stop
()
self
.
_input
.
stop
()
...
@@ -175,37 +182,45 @@ class Op(object):
...
@@ -175,37 +182,45 @@ class Op(object):
for
channel
in
channels
:
for
channel
in
channels
:
channel
.
push
(
data
,
name
)
channel
.
push
(
data
,
name
)
def
start_with_process
(
self
,
client_type
,
use_future
):
def
start_with_process
(
self
,
client_type
):
proces
=
[]
proces
=
[]
for
concurrency_idx
in
range
(
self
.
_
concurrency
):
for
concurrency_idx
in
range
(
self
.
concurrency
):
p
=
multiprocessing
.
Process
(
p
=
multiprocessing
.
Process
(
target
=
self
.
_run
,
target
=
self
.
_run
,
args
=
(
concurrency_idx
,
self
.
get_input_channel
(),
args
=
(
concurrency_idx
,
self
.
_
get_input_channel
(),
self
.
get_output_channels
(),
client_type
,
use_futur
e
))
self
.
_get_output_channels
(),
client_typ
e
))
p
.
start
()
p
.
start
()
proces
.
append
(
p
)
proces
.
append
(
p
)
return
proces
return
proces
def
start_with_thread
(
self
,
client_type
,
use_future
):
def
start_with_thread
(
self
,
client_type
):
threads
=
[]
threads
=
[]
for
concurrency_idx
in
range
(
self
.
_
concurrency
):
for
concurrency_idx
in
range
(
self
.
concurrency
):
t
=
threading
.
Thread
(
t
=
threading
.
Thread
(
target
=
self
.
_run
,
target
=
self
.
_run
,
args
=
(
concurrency_idx
,
self
.
get_input_channel
(),
args
=
(
concurrency_idx
,
self
.
_
get_input_channel
(),
self
.
get_output_channels
(),
client_type
,
use_futur
e
))
self
.
_get_output_channels
(),
client_typ
e
))
t
.
start
()
t
.
start
()
threads
.
append
(
t
)
threads
.
append
(
t
)
return
threads
return
threads
def
_run
(
self
,
concurrency_idx
,
input_channel
,
output_channels
,
client_type
,
def
_run
(
self
,
concurrency_idx
,
input_channel
,
output_channels
,
use_future
):
client_type
):
# create client based on client_type
def
get_log_func
(
op_info_prefix
):
self
.
init_client
(
client_type
,
self
.
_client_config
,
self
.
_server_name
,
def
log_func
(
info_str
):
self
.
_fetch_names
)
return
"{} {}"
.
format
(
op_info_prefix
,
info_str
)
return
log_func
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
=
get_log_func
(
op_info_prefix
)
self
.
_is_run
=
True
tid
=
threading
.
current_thread
().
ident
tid
=
threading
.
current_thread
().
ident
# create client based on client_type
self
.
init_client
(
client_type
,
self
.
_client_config
,
self
.
_server_endpoints
,
self
.
_fetch_names
)
self
.
_is_run
=
True
while
self
.
_is_run
:
while
self
.
_is_run
:
self
.
_profiler_record
(
"{}-get#{}_0"
.
format
(
op_info_prefix
,
tid
))
self
.
_profiler_record
(
"{}-get#{}_0"
.
format
(
op_info_prefix
,
tid
))
channeldata
=
input_channel
.
front
(
self
.
name
)
channeldata
=
input_channel
.
front
(
self
.
name
)
...
@@ -260,7 +275,7 @@ class Op(object):
...
@@ -260,7 +275,7 @@ class Op(object):
output_channels
)
output_channels
)
continue
continue
#
mid
process
# process
midped_data
=
None
midped_data
=
None
if
self
.
with_serving
:
if
self
.
with_serving
:
ecode
=
ChannelDataEcode
.
OK
.
value
ecode
=
ChannelDataEcode
.
OK
.
value
...
@@ -268,7 +283,7 @@ class Op(object):
...
@@ -268,7 +283,7 @@ class Op(object):
tid
))
tid
))
if
self
.
_timeout
<=
0
:
if
self
.
_timeout
<=
0
:
try
:
try
:
midped_data
=
self
.
midprocess
(
preped_data
,
use_future
)
midped_data
=
self
.
process
(
preped_data
)
except
Exception
as
e
:
except
Exception
as
e
:
ecode
=
ChannelDataEcode
.
UNKNOW
.
value
ecode
=
ChannelDataEcode
.
UNKNOW
.
value
error_info
=
log
(
e
)
error_info
=
log
(
e
)
...
@@ -278,8 +293,8 @@ class Op(object):
...
@@ -278,8 +293,8 @@ class Op(object):
try
:
try
:
midped_data
=
func_timeout
.
func_timeout
(
midped_data
=
func_timeout
.
func_timeout
(
self
.
_timeout
,
self
.
_timeout
,
self
.
mid
process
,
self
.
process
,
args
=
(
preped_data
,
use_future
))
args
=
(
preped_data
,
))
except
func_timeout
.
FunctionTimedOut
as
e
:
except
func_timeout
.
FunctionTimedOut
as
e
:
if
i
+
1
>=
self
.
_retry
:
if
i
+
1
>=
self
.
_retry
:
ecode
=
ChannelDataEcode
.
TIMEOUT
.
value
ecode
=
ChannelDataEcode
.
TIMEOUT
.
value
...
@@ -310,42 +325,39 @@ class Op(object):
...
@@ -310,42 +325,39 @@ class Op(object):
# postprocess
# postprocess
output_data
=
None
output_data
=
None
self
.
_profiler_record
(
"{}-postp#{}_0"
.
format
(
op_info_prefix
,
tid
))
self
.
_profiler_record
(
"{}-postp#{}_0"
.
format
(
op_info_prefix
,
tid
))
if
self
.
with_serving
and
client_type
==
'grpc'
and
use_future
:
try
:
# use call_future
postped_data
=
self
.
postprocess
(
midped_data
)
output_data
=
ChannelData
(
except
Exception
as
e
:
datatype
=
ChannelDataType
.
CHANNEL_FUTURE
.
value
,
ecode
=
ChannelDataEcode
.
UNKNOW
.
value
future
=
midped_data
,
error_info
=
log
(
e
)
data_id
=
data_id
,
logging
.
error
(
error_info
)
callback_func
=
self
.
postprocess
)
self
.
_push_to_output_channels
(
else
:
ChannelData
(
try
:
ecode
=
ecode
,
error_info
=
error_info
,
data_id
=
data_id
),
postped_data
=
self
.
postprocess
(
midped_data
)
output_channels
)
except
Exception
as
e
:
continue
ecode
=
ChannelDataEcode
.
UNKNOW
.
value
if
not
isinstance
(
postped_data
,
dict
):
error_info
=
log
(
e
)
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
logging
.
error
(
error_info
)
error_info
=
log
(
"output of postprocess funticon must be "
\
self
.
_push_to_output_channels
(
"dict type, but get {}"
.
format
(
type
(
postped_data
)))
ChannelData
(
logging
.
error
(
error_info
)
ecode
=
ecode
,
error_info
=
error_info
,
self
.
_push_to_output_channels
(
data_id
=
data_id
),
ChannelData
(
output_channels
)
ecode
=
ecode
,
error_info
=
error_info
,
data_id
=
data_id
),
continue
output_channels
)
if
not
isinstance
(
postped_data
,
dict
):
continue
ecode
=
ChannelDataEcode
.
TYPE_ERROR
.
value
error_info
=
log
(
"output of postprocess funticon must be "
\
"dict type, but get {}"
.
format
(
type
(
postped_data
)))
logging
.
error
(
error_info
)
self
.
_push_to_output_channels
(
ChannelData
(
ecode
=
ecode
,
error_info
=
error_info
,
data_id
=
data_id
),
output_channels
)
continue
err
,
_
=
ChannelData
.
check_npdata
(
postped_data
)
if
err
==
0
:
output_data
=
ChannelData
(
output_data
=
ChannelData
(
ChannelDataType
.
CHANNEL_NPDATA
.
value
,
ChannelDataType
.
CHANNEL_NPDATA
.
value
,
npdata
=
postped_data
,
npdata
=
postped_data
,
data_id
=
data_id
)
data_id
=
data_id
)
else
:
output_data
=
ChannelData
(
ChannelDataType
.
DICT
.
value
,
dictdata
=
postped_data
,
data_id
=
data_id
)
self
.
_profiler_record
(
"{}-postp#{}_1"
.
format
(
op_info_prefix
,
tid
))
self
.
_profiler_record
(
"{}-postp#{}_1"
.
format
(
op_info_prefix
,
tid
))
# push data to channel (if run succ)
# push data to channel (if run succ)
...
@@ -356,14 +368,12 @@ class Op(object):
...
@@ -356,14 +368,12 @@ class Op(object):
def
_log
(
self
,
info
):
def
_log
(
self
,
info
):
return
"{} {}"
.
format
(
self
.
name
,
info
)
return
"{} {}"
.
format
(
self
.
name
,
info
)
def
_get_log_func
(
self
,
op_info_prefix
):
def
log_func
(
info_str
):
return
"{} {}"
.
format
(
op_info_prefix
,
info_str
)
return
log_func
def
get_concurrency
(
self
):
class
ReadOp
(
Op
):
return
self
.
_concurrency
def
__init__
(
self
,
concurrency
=
1
):
# PipelineService.name = "#G"
super
(
ReadOp
,
self
).
__init__
(
name
=
"#G"
,
input_ops
=
[],
concurrency
=
concurrency
)
class
VirtualOp
(
Op
):
class
VirtualOp
(
Op
):
...
@@ -371,7 +381,7 @@ class VirtualOp(Op):
...
@@ -371,7 +381,7 @@ class VirtualOp(Op):
def
__init__
(
self
,
name
,
concurrency
=
1
):
def
__init__
(
self
,
name
,
concurrency
=
1
):
super
(
VirtualOp
,
self
).
__init__
(
super
(
VirtualOp
,
self
).
__init__
(
name
=
name
,
inputs
=
None
,
concurrency
=
concurrency
)
name
=
name
,
input
_op
s
=
None
,
concurrency
=
concurrency
)
self
.
_virtual_pred_ops
=
[]
self
.
_virtual_pred_ops
=
[]
def
add_virtual_pred_op
(
self
,
op
):
def
add_virtual_pred_op
(
self
,
op
):
...
@@ -386,10 +396,18 @@ class VirtualOp(Op):
...
@@ -386,10 +396,18 @@ class VirtualOp(Op):
channel
.
add_producer
(
op
.
name
)
channel
.
add_producer
(
op
.
name
)
self
.
_outputs
.
append
(
channel
)
self
.
_outputs
.
append
(
channel
)
def
_run
(
self
,
concurrency_idx
,
input_channel
,
output_channels
,
client_type
,
def
_run
(
self
,
concurrency_idx
,
input_channel
,
output_channels
,
use_future
):
client_type
):
def
get_log_func
(
op_info_prefix
):
def
log_func
(
info_str
):
return
"{} {}"
.
format
(
op_info_prefix
,
info_str
)
return
log_func
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
=
get_log_func
(
op_info_prefix
)
tid
=
threading
.
current_thread
().
ident
self
.
_is_run
=
True
self
.
_is_run
=
True
while
self
.
_is_run
:
while
self
.
_is_run
:
self
.
_profiler_record
(
"{}-get#{}_0"
.
format
(
op_info_prefix
,
tid
))
self
.
_profiler_record
(
"{}-get#{}_0"
.
format
(
op_info_prefix
,
tid
))
...
@@ -407,4 +425,3 @@ class VirtualOp(Op):
...
@@ -407,4 +425,3 @@ class VirtualOp(Op):
channels
=
output_channels
,
channels
=
output_channels
,
name
=
self
.
_virtual_pred_ops
[
0
].
name
)
name
=
self
.
_virtual_pred_ops
[
0
].
name
)
self
.
_profiler_record
(
"{}-push#{}_1"
.
format
(
op_info_prefix
,
tid
))
self
.
_profiler_record
(
"{}-push#{}_1"
.
format
(
op_info_prefix
,
tid
))
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
python/pipeline/pipeline_server.py
浏览文件 @
c2109108
...
@@ -12,28 +12,6 @@
...
@@ -12,28 +12,6 @@
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
# pylint: disable=doc-string-missing
# pylint: disable=doc-string-missing
<<<<<<<
HEAD
class
PipelineService
(
pipeline_service_pb2_grpc
.
PipelineServiceServicer
):
def
__init__
(
self
,
in_channel
,
out_channel
,
retry
=
2
):
super
(
PipelineService
,
self
).
__init__
()
pass
class
PipelineServer
(
object
):
def
__init__
(
self
):
pass
def
set_response_op
(
self
,
response_op
):
pass
def
prepare_server
(
self
,
yml_file
):
pass
def
run_server
(
self
):
pass
=======
import
threading
import
threading
import
multiprocessing
import
multiprocessing
import
multiprocessing.queues
import
multiprocessing.queues
...
@@ -49,9 +27,6 @@ from paddle_serving_client import MultiLangClient, Client
...
@@ -49,9 +27,6 @@ from paddle_serving_client import MultiLangClient, Client
from
concurrent
import
futures
from
concurrent
import
futures
import
numpy
as
np
import
numpy
as
np
import
grpc
import
grpc
from
..proto
import
general_python_service_pb2
as
pyservice_pb2
from
..proto
import
pyserving_channel_pb2
as
channel_pb2
from
..proto
import
general_python_service_pb2_grpc
import
logging
import
logging
import
random
import
random
import
time
import
time
...
@@ -59,18 +34,23 @@ import func_timeout
...
@@ -59,18 +34,23 @@ import func_timeout
import
enum
import
enum
import
collections
import
collections
import
copy
import
copy
import
socket
from
contextlib
import
closing
import
yaml
from
.operator
import
Op
,
VirtualOp
from
.proto
import
pipeline_service_pb2
from
.proto
import
pipeline_service_pb2_grpc
from
.operator
import
Op
,
ReadOp
,
VirtualOp
from
.channel
import
ThreadChannel
,
ProcessChannel
,
ChannelData
,
ChannelDataEcode
,
ChannelDataType
from
.channel
import
ThreadChannel
,
ProcessChannel
,
ChannelData
,
ChannelDataEcode
,
ChannelDataType
from
.profiler
import
TimeProfiler
from
.profiler
import
TimeProfiler
from
.util
import
NameGenerator
_profiler
=
TimeProfiler
()
_profiler
=
TimeProfiler
()
class
GeneralPythonService
(
class
PipelineService
(
pipeline_service_pb2_grpc
.
PipelineServiceServicer
):
general_python_service_pb2_grpc
.
GeneralPythonServiceServicer
):
def
__init__
(
self
,
in_channel
,
out_channel
,
retry
=
2
):
def
__init__
(
self
,
in_channel
,
out_channel
,
retry
=
2
):
super
(
GeneralPython
Service
,
self
).
__init__
()
super
(
Pipeline
Service
,
self
).
__init__
()
self
.
name
=
"#G"
self
.
name
=
"#G"
self
.
set_in_channel
(
in_channel
)
self
.
set_in_channel
(
in_channel
)
self
.
set_out_channel
(
out_channel
)
self
.
set_out_channel
(
out_channel
)
...
@@ -85,7 +65,7 @@ class GeneralPythonService(
...
@@ -85,7 +65,7 @@ class GeneralPythonService(
self
.
_id_counter
=
0
self
.
_id_counter
=
0
self
.
_retry
=
retry
self
.
_retry
=
retry
self
.
_recive_func
=
threading
.
Thread
(
self
.
_recive_func
=
threading
.
Thread
(
target
=
GeneralPython
Service
.
_recive_out_channel_func
,
args
=
(
self
,
))
target
=
Pipeline
Service
.
_recive_out_channel_func
,
args
=
(
self
,
))
self
.
_recive_func
.
start
()
self
.
_recive_func
.
start
()
def
_log
(
self
,
info_str
):
def
_log
(
self
,
info_str
):
...
@@ -136,17 +116,12 @@ class GeneralPythonService(
...
@@ -136,17 +116,12 @@ 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'
))
data_id
=
self
.
_get_next_id
()
data_id
=
self
.
_get_next_id
()
np
data
=
{}
dict
data
=
{}
try
:
try
:
for
idx
,
name
in
enumerate
(
request
.
feed_var_names
):
for
idx
,
key
in
enumerate
(
request
.
key
):
logging
.
debug
(
logging
.
debug
(
self
.
_log
(
'key: {}'
.
format
(
key
)))
self
.
_log
(
'name: {}'
.
format
(
request
.
feed_var_names
[
idx
])))
logging
.
debug
(
self
.
_log
(
'value: {}'
.
format
(
request
.
value
[
idx
])))
logging
.
debug
(
dictdata
[
key
]
=
request
.
value
[
idx
]
self
.
_log
(
'data: {}'
.
format
(
request
.
feed_insts
[
idx
])))
npdata
[
name
]
=
np
.
frombuffer
(
request
.
feed_insts
[
idx
],
dtype
=
request
.
type
[
idx
])
npdata
[
name
].
shape
=
np
.
frombuffer
(
request
.
shape
[
idx
],
dtype
=
"int32"
)
except
Exception
as
e
:
except
Exception
as
e
:
return
ChannelData
(
return
ChannelData
(
ecode
=
ChannelDataEcode
.
RPC_PACKAGE_ERROR
.
value
,
ecode
=
ChannelDataEcode
.
RPC_PACKAGE_ERROR
.
value
,
...
@@ -154,31 +129,25 @@ class GeneralPythonService(
...
@@ -154,31 +129,25 @@ class GeneralPythonService(
data_id
=
data_id
),
data_id
data_id
=
data_id
),
data_id
else
:
else
:
return
ChannelData
(
return
ChannelData
(
datatype
=
ChannelDataType
.
CHANNEL_NPDATA
.
value
,
datatype
=
ChannelDataType
.
DICT
.
value
,
npdata
=
np
data
,
dictdata
=
dict
data
,
data_id
=
data_id
),
data_id
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
=
p
y
service_pb2
.
Response
()
resp
=
p
ipeline_
service_pb2
.
Response
()
resp
.
ecode
=
channeldata
.
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_NPDATA
.
value
:
for
inst
in
channeldata
.
pbdata
.
insts
:
feed
=
channeldata
.
parse
()
resp
.
fetch_insts
.
append
(
inst
.
data
)
for
name
,
var
in
feed
.
items
():
resp
.
fetch_var_names
.
append
(
inst
.
name
)
resp
.
value
.
append
(
var
.
tostring
())
#TODO: no shape and type
resp
.
shape
.
append
(
inst
.
shape
)
resp
.
key
.
append
(
name
)
resp
.
type
.
append
(
inst
.
type
)
elif
channeldata
.
datatype
==
ChannelDataType
.
DICT
.
value
:
elif
channeldata
.
datatype
in
(
ChannelDataType
.
CHANNEL_FUTURE
.
value
,
ChannelDataType
.
CHANNEL_NPDATA
.
value
):
feed
=
channeldata
.
parse
()
feed
=
channeldata
.
parse
()
for
name
,
var
in
feed
.
items
():
for
name
,
var
in
feed
.
items
():
resp
.
fetch_insts
.
append
(
var
.
tobytes
())
resp
.
value
.
append
(
str
(
var
))
resp
.
fetch_var_names
.
append
(
name
)
resp
.
key
.
append
(
name
)
resp
.
shape
.
append
(
np
.
array
(
var
.
shape
,
dtype
=
"int32"
).
tobytes
())
resp
.
type
.
append
(
str
(
var
.
dtype
))
else
:
else
:
raise
TypeError
(
raise
TypeError
(
self
.
_log
(
"Error type({}) in datatype."
.
format
(
self
.
_log
(
"Error type({}) in datatype."
.
format
(
...
@@ -218,12 +187,7 @@ class GeneralPythonService(
...
@@ -218,12 +187,7 @@ class GeneralPythonService(
class
PipelineServer
(
object
):
class
PipelineServer
(
object
):
def
__init__
(
self
,
def
__init__
(
self
):
use_multithread
=
True
,
client_type
=
'brpc'
,
use_future
=
False
,
retry
=
2
,
profile
=
False
):
self
.
_channels
=
[]
self
.
_channels
=
[]
self
.
_user_ops
=
[]
self
.
_user_ops
=
[]
self
.
_actual_ops
=
[]
self
.
_actual_ops
=
[]
...
@@ -231,20 +195,7 @@ class PipelineServer(object):
...
@@ -231,20 +195,7 @@ class PipelineServer(object):
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
.
_response_op
=
None
self
.
_use_multithread
=
use_multithread
self
.
_client_type
=
client_type
self
.
_use_future
=
use_future
if
not
self
.
_use_multithread
:
self
.
_manager
=
multiprocessing
.
Manager
()
if
profile
:
raise
Exception
(
"profile cannot be used in multiprocess version temporarily"
)
if
self
.
_use_future
:
raise
Exception
(
"cannot use future in multiprocess"
)
if
self
.
_client_type
==
'brpc'
and
self
.
_use_future
:
logging
.
warn
(
"brpc impl cannot use future"
)
_profiler
.
enable
(
profile
)
def
add_channel
(
self
,
channel
):
def
add_channel
(
self
,
channel
):
self
.
_channels
.
append
(
channel
)
self
.
_channels
.
append
(
channel
)
...
@@ -259,33 +210,55 @@ class PipelineServer(object):
...
@@ -259,33 +210,55 @@ class PipelineServer(object):
logging
.
info
(
'here will generate desc for PAAS'
)
logging
.
info
(
'here will generate desc for PAAS'
)
pass
pass
def
_topo_sort
(
self
):
def
set_response_op
(
self
,
response_op
):
indeg_num
=
{}
if
not
isinstance
(
response_op
,
Op
):
raise
Exception
(
"response_op must be Op type."
)
self
.
_response_op
=
response_op
def
_topo_sort
(
self
,
response_op
):
if
response_op
is
None
:
raise
Exception
(
"response_op has not been set."
)
def
get_use_ops
(
root
):
unique_names
=
set
()
use_ops
=
set
()
succ_ops_of_use_op
=
{}
# {op_name: succ_ops}
que
=
Queue
.
Queue
()
que
.
put
(
root
)
use_ops
.
add
(
root
)
unique_names
.
add
(
root
.
name
)
while
que
.
qsize
()
!=
0
:
op
=
que
.
get
()
for
pred_op
in
op
.
get_input_ops
():
if
pred_op
.
name
not
in
succ_ops_of_use_op
:
succ_ops_of_use_op
[
pred_op
.
name
]
=
[]
succ_ops_of_use_op
[
pred_op
.
name
].
append
(
op
)
if
pred_op
not
in
use_ops
:
que
.
put
(
pred_op
)
use_ops
.
add
(
pred_op
)
# check the name of op is globally unique
if
pred_op
.
name
in
unique_names
:
raise
Exception
(
"the name of Op must be unique: {}"
.
format
(
pred_op
.
name
))
unique_names
.
add
(
pred_op
.
name
)
return
use_ops
,
succ_ops_of_use_op
use_ops
,
out_degree_ops
=
get_use_ops
(
response_op
)
name2op
=
{
op
.
name
:
op
for
op
in
use_ops
}
out_degree_num
=
{
name
:
len
(
ops
)
for
name
,
ops
in
out_degree_ops
.
items
()
}
que_idx
=
0
# scroll queue
que_idx
=
0
# scroll queue
ques
=
[
Queue
.
Queue
()
for
_
in
range
(
2
)]
ques
=
[
Queue
.
Queue
()
for
_
in
range
(
2
)]
for
op
in
self
.
_user_ops
:
zero_indegree_num
=
0
for
op
in
use_ops
:
if
len
(
op
.
get_input_ops
())
==
0
:
if
len
(
op
.
get_input_ops
())
==
0
:
op
.
name
=
"#G"
# update read_op.name
zero_indegree_num
+=
1
break
if
zero_indegree_num
!=
1
:
outdegs
=
{
op
.
name
:
[]
for
op
in
self
.
_user_ops
}
zero_indeg_num
,
zero_outdeg_num
=
0
,
0
for
idx
,
op
in
enumerate
(
self
.
_user_ops
):
# check the name of op is globally unique
if
op
.
name
in
indeg_num
:
raise
Exception
(
"the name of Op must be unique"
)
indeg_num
[
op
.
name
]
=
len
(
op
.
get_input_ops
())
if
indeg_num
[
op
.
name
]
==
0
:
ques
[
que_idx
].
put
(
op
)
zero_indeg_num
+=
1
for
pred_op
in
op
.
get_input_ops
():
outdegs
[
pred_op
.
name
].
append
(
op
)
if
zero_indeg_num
!=
1
:
raise
Exception
(
"DAG contains multiple input Ops"
)
raise
Exception
(
"DAG contains multiple input Ops"
)
for
_
,
succ_list
in
outdegs
.
items
():
ques
[
que_idx
].
put
(
response_op
)
if
len
(
succ_list
)
==
0
:
zero_outdeg_num
+=
1
if
zero_outdeg_num
!=
1
:
raise
Exception
(
"DAG contains multiple output Ops"
)
# topo sort to get dag_views
# topo sort to get dag_views
dag_views
=
[]
dag_views
=
[]
...
@@ -298,63 +271,36 @@ class PipelineServer(object):
...
@@ -298,63 +271,36 @@ class PipelineServer(object):
op
=
que
.
get
()
op
=
que
.
get
()
dag_view
.
append
(
op
)
dag_view
.
append
(
op
)
sorted_op_num
+=
1
sorted_op_num
+=
1
for
succ_op
in
outdegs
[
op
.
name
]
:
for
pred_op
in
op
.
get_input_ops
()
:
indeg_num
[
succ
_op
.
name
]
-=
1
out_degree_num
[
pred
_op
.
name
]
-=
1
if
indeg_num
[
succ
_op
.
name
]
==
0
:
if
out_degree_num
[
pred
_op
.
name
]
==
0
:
next_que
.
put
(
succ
_op
)
next_que
.
put
(
pred
_op
)
dag_views
.
append
(
dag_view
)
dag_views
.
append
(
dag_view
)
if
next_que
.
qsize
()
==
0
:
if
next_que
.
qsize
()
==
0
:
break
break
que_idx
=
(
que_idx
+
1
)
%
2
que_idx
=
(
que_idx
+
1
)
%
2
if
sorted_op_num
<
len
(
self
.
_user
_ops
):
if
sorted_op_num
<
len
(
use
_ops
):
raise
Exception
(
"not legal DAG"
)
raise
Exception
(
"not legal DAG"
)
# create channels and virtual ops
# create channels and virtual ops
def
name_generator
(
prefix
):
def
number_generator
():
idx
=
0
while
True
:
yield
"{}{}"
.
format
(
prefix
,
idx
)
idx
+=
1
return
number_generator
()
def
gen_channel
(
name_gen
):
def
gen_channel
(
name_gen
):
channel
=
None
channel
=
None
if
self
.
_use_multithread
:
if
self
.
_use_multithread
:
if
sys
.
version_info
.
major
==
2
:
channel
=
ThreadChannel
(
name
=
name_gen
.
next
())
channel
=
ThreadChannel
(
name
=
name_gen
.
next
())
elif
sys
.
version_info
.
major
==
3
:
channel
=
ThreadChannel
(
name
=
name_gen
.
__next__
())
else
:
raise
Exception
(
"Error Python version"
)
else
:
else
:
if
sys
.
version_info
.
major
==
2
:
channel
=
ProcessChannel
(
self
.
_manager
,
name
=
name_gen
.
next
())
channel
=
ProcessChannel
(
self
.
_manager
,
name
=
name_gen
.
next
())
elif
sys
.
version_info
.
major
==
3
:
channel
=
ProcessChannel
(
self
.
_manager
,
name
=
name_gen
.
__next__
())
else
:
raise
Exception
(
"Error Python version"
)
return
channel
return
channel
def
gen_virtual_op
(
name_gen
):
def
gen_virtual_op
(
name_gen
):
virtual_op
=
None
return
VirtualOp
(
name
=
name_gen
.
next
())
if
sys
.
version_info
.
major
==
2
:
virtual_op
=
VirtualOp
(
name
=
name_gen
.
next
())
elif
sys
.
version_info
.
major
==
3
:
virtual_op
=
VirtualOp
(
name
=
op_name_gen
.
__next__
())
else
:
raise
Exception
(
"Error Python version"
)
return
virtual_op
virtual_op_name_gen
=
name_g
enerator
(
"vir"
)
virtual_op_name_gen
=
NameG
enerator
(
"vir"
)
channel_name_gen
=
name_g
enerator
(
"chl"
)
channel_name_gen
=
NameG
enerator
(
"chl"
)
virtual_ops
=
[]
virtual_ops
=
[]
channels
=
[]
channels
=
[]
input_channel
=
None
input_channel
=
None
actual_view
=
None
actual_view
=
None
dag_views
=
list
(
reversed
(
dag_views
))
for
v_idx
,
view
in
enumerate
(
dag_views
):
for
v_idx
,
view
in
enumerate
(
dag_views
):
if
v_idx
+
1
>=
len
(
dag_views
):
if
v_idx
+
1
>=
len
(
dag_views
):
break
break
...
@@ -365,7 +311,7 @@ class PipelineServer(object):
...
@@ -365,7 +311,7 @@ class PipelineServer(object):
pred_op_of_next_view_op
=
{}
pred_op_of_next_view_op
=
{}
for
op
in
actual_view
:
for
op
in
actual_view
:
# find actual succ op in next view and create virtual op
# find actual succ op in next view and create virtual op
for
succ_op
in
out
deg
s
[
op
.
name
]:
for
succ_op
in
out
_degree_op
s
[
op
.
name
]:
if
succ_op
in
next_view
:
if
succ_op
in
next_view
:
if
succ_op
not
in
actual_next_view
:
if
succ_op
not
in
actual_next_view
:
actual_next_view
.
append
(
succ_op
)
actual_next_view
.
append
(
succ_op
)
...
@@ -376,7 +322,7 @@ class PipelineServer(object):
...
@@ -376,7 +322,7 @@ class PipelineServer(object):
# create virtual op
# create virtual op
virtual_op
=
gen_virtual_op
(
virtual_op_name_gen
)
virtual_op
=
gen_virtual_op
(
virtual_op_name_gen
)
virtual_ops
.
append
(
virtual_op
)
virtual_ops
.
append
(
virtual_op
)
out
deg
s
[
virtual_op
.
name
]
=
[
succ_op
]
out
_degree_op
s
[
virtual_op
.
name
]
=
[
succ_op
]
actual_next_view
.
append
(
virtual_op
)
actual_next_view
.
append
(
virtual_op
)
pred_op_of_next_view_op
[
virtual_op
.
name
]
=
[
op
]
pred_op_of_next_view_op
[
virtual_op
.
name
]
=
[
op
]
virtual_op
.
add_virtual_pred_op
(
op
)
virtual_op
.
add_virtual_pred_op
(
op
)
...
@@ -419,11 +365,10 @@ class PipelineServer(object):
...
@@ -419,11 +365,10 @@ class PipelineServer(object):
processed_op
.
add
(
other_op
.
name
)
processed_op
.
add
(
other_op
.
name
)
output_channel
=
gen_channel
(
channel_name_gen
)
output_channel
=
gen_channel
(
channel_name_gen
)
channels
.
append
(
output_channel
)
channels
.
append
(
output_channel
)
last_op
=
dag_views
[
-
1
][
0
]
response_op
.
add_output_channel
(
output_channel
)
last_op
.
add_output_channel
(
output_channel
)
self
.
_actual_ops
=
virtual_ops
self
.
_actual_ops
=
virtual_ops
for
op
in
self
.
_user
_ops
:
for
op
in
use
_ops
:
if
len
(
op
.
get_input_ops
())
==
0
:
if
len
(
op
.
get_input_ops
())
==
0
:
# pass read op
# pass read op
continue
continue
...
@@ -433,11 +378,33 @@ class PipelineServer(object):
...
@@ -433,11 +378,33 @@ class PipelineServer(object):
logging
.
debug
(
c
.
debug
())
logging
.
debug
(
c
.
debug
())
return
input_channel
,
output_channel
return
input_channel
,
output_channel
def
prepare_server
(
self
,
port
,
worker_num
):
def
_port_is_available
(
self
,
port
):
self
.
_port
=
port
with
closing
(
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
))
as
sock
:
self
.
_worker_num
=
worker_num
sock
.
settimeout
(
2
)
result
=
sock
.
connect_ex
((
'0.0.0.0'
,
port
))
return
result
!=
0
def
prepare_server
(
self
,
yml_file
):
with
open
(
yml_file
)
as
f
:
yml_config
=
yaml
.
load
(
f
.
read
())
self
.
_port
=
yml_config
.
get
(
'port'
,
8080
)
if
not
self
.
_port_is_available
(
self
.
_port
):
raise
SystemExit
(
"Prot {} is already used"
.
format
(
self
.
_port
))
self
.
_worker_num
=
yml_config
.
get
(
'worker_num'
,
2
)
self
.
_retry
=
yml_config
.
get
(
'retry'
,
1
)
self
.
_client_type
=
yml_config
.
get
(
'client_type'
,
'brpc'
)
self
.
_use_multithread
=
yml_config
.
get
(
'use_multithread'
,
True
)
profile
=
yml_config
.
get
(
'profile'
,
False
)
input_channel
,
output_channel
=
self
.
_topo_sort
()
if
not
self
.
_use_multithread
:
self
.
_manager
=
multiprocessing
.
Manager
()
if
profile
:
raise
Exception
(
"profile cannot be used in multiprocess version temporarily"
)
_profiler
.
enable
(
profile
)
input_channel
,
output_channel
=
self
.
_topo_sort
(
self
.
_response_op
)
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
:
...
@@ -451,10 +418,10 @@ class PipelineServer(object):
...
@@ -451,10 +418,10 @@ class PipelineServer(object):
op
.
init_profiler
(
_profiler
)
op
.
init_profiler
(
_profiler
)
if
self
.
_use_multithread
:
if
self
.
_use_multithread
:
threads_or_proces
.
extend
(
threads_or_proces
.
extend
(
op
.
start_with_thread
(
self
.
_client_type
,
self
.
_use_future
))
op
.
start_with_thread
(
self
.
_client_type
))
else
:
else
:
threads_or_proces
.
extend
(
threads_or_proces
.
extend
(
op
.
start_with_process
(
self
.
_client_type
,
self
.
_use_future
))
op
.
start_with_process
(
self
.
_client_type
))
return
threads_or_proces
return
threads_or_proces
def
_stop_ops
(
self
):
def
_stop_ops
(
self
):
...
@@ -465,9 +432,9 @@ class PipelineServer(object):
...
@@ -465,9 +432,9 @@ class PipelineServer(object):
op_threads_or_proces
=
self
.
_run_ops
()
op_threads_or_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_GeneralPython
ServiceServicer_to_server
(
pipeline_service_pb2_grpc
.
add_Pipeline
ServiceServicer_to_server
(
GeneralPythonService
(
self
.
_in_channel
,
self
.
_out_channel
,
PipelineService
(
self
.
_in_channel
,
self
.
_out_channel
,
self
.
_retry
)
,
self
.
_retry
),
server
)
server
)
server
.
add_insecure_port
(
'[::]:{}'
.
format
(
self
.
_port
))
server
.
add_insecure_port
(
'[::]:{}'
.
format
(
self
.
_port
))
server
.
start
()
server
.
start
()
server
.
wait_for_termination
()
server
.
wait_for_termination
()
...
@@ -476,26 +443,5 @@ class PipelineServer(object):
...
@@ -476,26 +443,5 @@ class PipelineServer(object):
x
.
join
()
x
.
join
()
def
prepare_serving
(
self
,
op
):
def
prepare_serving
(
self
,
op
):
model_path
=
op
.
_server_model
port
=
op
.
_server_port
device
=
op
.
_device
if
self
.
_client_type
==
"grpc"
:
if
device
==
"cpu"
:
cmd
=
"(Use grpc impl) python -m paddle_serving_server.serve"
\
" --model {} --thread 4 --port {} --use_multilang &>/dev/null &"
.
format
(
model_path
,
port
)
else
:
cmd
=
"(Use grpc impl) python -m paddle_serving_server_gpu.serve"
\
" --model {} --thread 4 --port {} --use_multilang &>/dev/null &"
.
format
(
model_path
,
port
)
elif
self
.
_client_type
==
"brpc"
:
if
device
==
"cpu"
:
cmd
=
"(Use brpc impl) python -m paddle_serving_server.serve"
\
" --model {} --thread 4 --port {} &>/dev/null &"
.
format
(
model_path
,
port
)
else
:
cmd
=
"(Use brpc impl) python -m paddle_serving_server_gpu.serve"
\
" --model {} --thread 4 --port {} &>/dev/null &"
.
format
(
model_path
,
port
)
else
:
raise
Exception
(
"unknow client type: {}"
.
format
(
self
.
_client_type
))
# run a server (not in PyServing)
# run a server (not in PyServing)
logging
.
info
(
"run a server (not in PyServing): {}"
.
format
(
cmd
))
logging
.
info
(
"run a server (not in PyServing)"
)
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
python/pipeline/profiler.py
浏览文件 @
c2109108
...
@@ -13,8 +13,6 @@
...
@@ -13,8 +13,6 @@
# limitations under the License.
# limitations under the License.
# pylint: disable=doc-string-missing
# pylint: disable=doc-string-missing
<<<<<<<
HEAD
=======
import
os
import
os
import
sys
import
sys
if
sys
.
version_info
.
major
==
2
:
if
sys
.
version_info
.
major
==
2
:
...
@@ -25,7 +23,6 @@ else:
...
@@ -25,7 +23,6 @@ else:
raise
Exception
(
"Error Python version"
)
raise
Exception
(
"Error Python version"
)
import
time
import
time
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
class
TimeProfiler
(
object
):
class
TimeProfiler
(
object
):
def
__init__
(
self
):
def
__init__
(
self
):
...
@@ -48,30 +45,18 @@ class TimeProfiler(object):
...
@@ -48,30 +45,18 @@ class TimeProfiler(object):
def
print_profile
(
self
):
def
print_profile
(
self
):
if
self
.
_enable
is
False
:
if
self
.
_enable
is
False
:
return
return
<<<<<<<
HEAD
print_str
=
self
.
_print_head
print_str
=
self
.
_print_head
=======
sys
.
stderr
.
write
(
self
.
_print_head
)
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
tmp
=
{}
tmp
=
{}
while
not
self
.
_time_record
.
empty
():
while
not
self
.
_time_record
.
empty
():
name
,
tag
,
timestamp
=
self
.
_time_record
.
get
()
name
,
tag
,
timestamp
=
self
.
_time_record
.
get
()
if
name
in
tmp
:
if
name
in
tmp
:
ptag
,
ptimestamp
=
tmp
.
pop
(
name
)
ptag
,
ptimestamp
=
tmp
.
pop
(
name
)
<<<<<<<
HEAD
print_str
+=
"{}_{}:{} "
.
format
(
name
,
ptag
,
ptimestamp
)
print_str
+=
"{}_{}:{} "
.
format
(
name
,
ptag
,
ptimestamp
)
print_str
+=
"{}_{}:{} "
.
format
(
name
,
tag
,
timestamp
)
print_str
+=
"{}_{}:{} "
.
format
(
name
,
tag
,
timestamp
)
else
:
else
:
tmp
[
name
]
=
(
tag
,
timestamp
)
tmp
[
name
]
=
(
tag
,
timestamp
)
print_str
+=
"
\n
"
print_str
+=
"
\n
"
sys
.
stderr
.
write
(
print_str
)
sys
.
stderr
.
write
(
print_str
)
=======
sys
.
stderr
.
write
(
"{}_{}:{} "
.
format
(
name
,
ptag
,
ptimestamp
))
sys
.
stderr
.
write
(
"{}_{}:{} "
.
format
(
name
,
tag
,
timestamp
))
else
:
tmp
[
name
]
=
(
tag
,
timestamp
)
sys
.
stderr
.
write
(
'
\n
'
)
>>>>>>>
d84910a1180061b57c51824e35e3ca5c857eb3b5
for
name
,
item
in
tmp
.
items
():
for
name
,
item
in
tmp
.
items
():
tag
,
timestamp
=
item
tag
,
timestamp
=
item
self
.
_time_record
.
put
((
name
,
tag
,
timestamp
))
self
.
_time_record
.
put
((
name
,
tag
,
timestamp
))
python/pipeline/proto/pipeline_service.proto
浏览文件 @
c2109108
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
// limitations under the License.
// limitations under the License.
syntax
=
"proto2"
;
syntax
=
"proto2"
;
package
baidu
.
paddle_serving.pipeline_serving
;
message
Request
{
message
Request
{
repeated
string
key
=
1
;
repeated
string
key
=
1
;
...
@@ -22,6 +23,8 @@ message Request {
...
@@ -22,6 +23,8 @@ message Request {
message
Response
{
message
Response
{
repeated
string
key
=
1
;
repeated
string
key
=
1
;
repeated
string
value
=
2
;
repeated
string
value
=
2
;
required
int32
ecode
=
3
;
optional
string
error_info
=
4
;
};
};
service
PipelineService
{
service
PipelineService
{
...
...
python/setup.py.client.in
浏览文件 @
c2109108
...
@@ -65,11 +65,14 @@ REQUIRED_PACKAGES = [
...
@@ -65,11 +65,14 @@ REQUIRED_PACKAGES = [
if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"):
if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"):
REQUIRED_PACKAGES.append("paddlepaddle")
REQUIRED_PACKAGES.append("paddlepaddle")
packages=['paddle_serving_client',
packages=['paddle_serving_client',
'paddle_serving_client.proto',
'paddle_serving_client.proto',
'paddle_serving_client.io',
'paddle_serving_client.io',
'paddle_serving_client.metric',
'paddle_serving_client.metric',
'paddle_serving_client.utils',]
'paddle_serving_client.utils',
'paddle_serving_client.pipeline',
'paddle_serving_client.pipeline.proto']
package_data={'paddle_serving_client': ['serving_client.so','lib/*'],}
package_data={'paddle_serving_client': ['serving_client.so','lib/*'],}
package_dir={'paddle_serving_client':
package_dir={'paddle_serving_client':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client',
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client',
...
@@ -77,10 +80,14 @@ package_dir={'paddle_serving_client':
...
@@ -77,10 +80,14 @@ package_dir={'paddle_serving_client':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/proto',
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/proto',
'paddle_serving_client.io':
'paddle_serving_client.io':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/io',
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/io',
'paddle_serving_client.metric':
'paddle_serving_client.metric':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/metric',
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/metric',
'paddle_serving_client.utils':
'paddle_serving_client.utils':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/utils',}
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/utils',
'paddle_serving_client.pipeline':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/pipeline',
'paddle_serving_client.pipeline.proto':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_client/pipeline/proto'}
setup(
setup(
name='paddle-serving-client',
name='paddle-serving-client',
...
...
python/setup.py.server.in
浏览文件 @
c2109108
...
@@ -43,12 +43,17 @@ REQUIRED_PACKAGES = [
...
@@ -43,12 +43,17 @@ REQUIRED_PACKAGES = [
packages=['paddle_serving_server',
packages=['paddle_serving_server',
'paddle_serving_server.proto',
'paddle_serving_server.proto',
'paddle_serving_server.pipeline']
'paddle_serving_server.pipeline',
'paddle_serving_server.pipeline.proto']
package_dir={'paddle_serving_server':
package_dir={'paddle_serving_server':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server',
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server',
'paddle_serving_server.proto':
'paddle_serving_server.proto':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server/proto'}
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server/proto',
'paddle_serving_server.pipeline':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server/pipeline',
'paddle_serving_server.pipeline.proto':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server/pipeline/proto'}
setup(
setup(
name='paddle-serving-server',
name='paddle-serving-server',
...
...
python/setup.py.server_gpu.in
浏览文件 @
c2109108
...
@@ -44,12 +44,17 @@ REQUIRED_PACKAGES = [
...
@@ -44,12 +44,17 @@ REQUIRED_PACKAGES = [
packages=['paddle_serving_server_gpu',
packages=['paddle_serving_server_gpu',
'paddle_serving_server_gpu.proto',
'paddle_serving_server_gpu.proto',
'paddle_serving_server.pipeline']
'paddle_serving_server_gpu.pipeline',
'paddle_serving_server_gpu.pipeline.proto']
package_dir={'paddle_serving_server_gpu':
package_dir={'paddle_serving_server_gpu':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server_gpu',
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server_gpu',
'paddle_serving_server_gpu.proto':
'paddle_serving_server_gpu.proto':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server_gpu/proto'}
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server_gpu/proto',
'paddle_serving_server_gpu.pipeline':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server_gpu/pipeline',
'paddle_serving_server_gpu.pipeline.proto':
'${PADDLE_SERVING_BINARY_DIR}/python/paddle_serving_server_gpu/pipeline/proto'}
setup(
setup(
name='paddle-serving-server-gpu',
name='paddle-serving-server-gpu',
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录