Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
d48e1cfd
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看板
未验证
提交
d48e1cfd
编写于
4月 26, 2020
作者:
M
MRXLT
提交者:
GitHub
4月 26, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #467 from MRXLT/web-service
find available port automatically && add run_flask
上级
464ad4af
8b721192
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
104 addition
and
28 deletion
+104
-28
python/examples/bert/bert_web_service.py
python/examples/bert/bert_web_service.py
+1
-0
python/examples/imagenet/image_classification_service.py
python/examples/imagenet/image_classification_service.py
+3
-2
python/examples/imagenet/image_classification_service_gpu.py
python/examples/imagenet/image_classification_service_gpu.py
+4
-3
python/examples/imagenet/image_http_client.py
python/examples/imagenet/image_http_client.py
+1
-1
python/examples/imagenet/image_rpc_client.py
python/examples/imagenet/image_rpc_client.py
+1
-1
python/examples/imdb/text_classify_service.py
python/examples/imdb/text_classify_service.py
+1
-0
python/paddle_serving_server/__init__.py
python/paddle_serving_server/__init__.py
+1
-0
python/paddle_serving_server/web_service.py
python/paddle_serving_server/web_service.py
+45
-10
python/paddle_serving_server_gpu/web_service.py
python/paddle_serving_server_gpu/web_service.py
+47
-11
未找到文件。
python/examples/bert/bert_web_service.py
浏览文件 @
d48e1cfd
...
@@ -36,3 +36,4 @@ bert_service.set_gpus(gpu_ids)
...
@@ -36,3 +36,4 @@ bert_service.set_gpus(gpu_ids)
bert_service
.
prepare_server
(
bert_service
.
prepare_server
(
workdir
=
"workdir"
,
port
=
int
(
sys
.
argv
[
2
]),
device
=
"gpu"
)
workdir
=
"workdir"
,
port
=
int
(
sys
.
argv
[
2
]),
device
=
"gpu"
)
bert_service
.
run_server
()
bert_service
.
run_server
()
bert_service
.
run_flask
()
python/examples/imagenet/image_classification_service.py
浏览文件 @
d48e1cfd
...
@@ -31,14 +31,14 @@ class ImageService(WebService):
...
@@ -31,14 +31,14 @@ class ImageService(WebService):
sample
=
base64
.
b64decode
(
image
)
sample
=
base64
.
b64decode
(
image
)
img
=
reader
.
process_image
(
sample
)
img
=
reader
.
process_image
(
sample
)
res_feed
=
{}
res_feed
=
{}
res_feed
[
"image"
]
=
img
.
reshape
(
-
1
)
res_feed
[
"image"
]
=
img
feed_batch
.
append
(
res_feed
)
feed_batch
.
append
(
res_feed
)
return
feed_batch
,
fetch
return
feed_batch
,
fetch
else
:
else
:
sample
=
base64
.
b64decode
(
feed
[
"image"
])
sample
=
base64
.
b64decode
(
feed
[
"image"
])
img
=
reader
.
process_image
(
sample
)
img
=
reader
.
process_image
(
sample
)
res_feed
=
{}
res_feed
=
{}
res_feed
[
"image"
]
=
img
.
reshape
(
-
1
)
res_feed
[
"image"
]
=
img
return
res_feed
,
fetch
return
res_feed
,
fetch
...
@@ -47,3 +47,4 @@ image_service.load_model_config(sys.argv[1])
...
@@ -47,3 +47,4 @@ image_service.load_model_config(sys.argv[1])
image_service
.
prepare_server
(
image_service
.
prepare_server
(
workdir
=
sys
.
argv
[
2
],
port
=
int
(
sys
.
argv
[
3
]),
device
=
"cpu"
)
workdir
=
sys
.
argv
[
2
],
port
=
int
(
sys
.
argv
[
3
]),
device
=
"cpu"
)
image_service
.
run_server
()
image_service
.
run_server
()
image_service
.
run_flask
()
python/examples/imagenet/image_classification_service_gpu.py
浏览文件 @
d48e1cfd
...
@@ -12,12 +12,12 @@
...
@@ -12,12 +12,12 @@
# 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
paddle_serving_server_gpu.web_service
import
WebService
import
sys
import
sys
import
cv2
import
cv2
import
base64
import
base64
import
numpy
as
np
import
numpy
as
np
from
image_reader
import
ImageReader
from
image_reader
import
ImageReader
from
paddle_serving_server_gpu.web_service
import
WebService
class
ImageService
(
WebService
):
class
ImageService
(
WebService
):
...
@@ -32,14 +32,14 @@ class ImageService(WebService):
...
@@ -32,14 +32,14 @@ class ImageService(WebService):
sample
=
base64
.
b64decode
(
image
)
sample
=
base64
.
b64decode
(
image
)
img
=
reader
.
process_image
(
sample
)
img
=
reader
.
process_image
(
sample
)
res_feed
=
{}
res_feed
=
{}
res_feed
[
"image"
]
=
img
.
reshape
(
-
1
)
res_feed
[
"image"
]
=
img
feed_batch
.
append
(
res_feed
)
feed_batch
.
append
(
res_feed
)
return
feed_batch
,
fetch
return
feed_batch
,
fetch
else
:
else
:
sample
=
base64
.
b64decode
(
feed
[
"image"
])
sample
=
base64
.
b64decode
(
feed
[
"image"
])
img
=
reader
.
process_image
(
sample
)
img
=
reader
.
process_image
(
sample
)
res_feed
=
{}
res_feed
=
{}
res_feed
[
"image"
]
=
img
.
reshape
(
-
1
)
res_feed
[
"image"
]
=
img
return
res_feed
,
fetch
return
res_feed
,
fetch
...
@@ -49,3 +49,4 @@ image_service.set_gpus("0,1")
...
@@ -49,3 +49,4 @@ image_service.set_gpus("0,1")
image_service
.
prepare_server
(
image_service
.
prepare_server
(
workdir
=
sys
.
argv
[
2
],
port
=
int
(
sys
.
argv
[
3
]),
device
=
"gpu"
)
workdir
=
sys
.
argv
[
2
],
port
=
int
(
sys
.
argv
[
3
]),
device
=
"gpu"
)
image_service
.
run_server
()
image_service
.
run_server
()
image_service
.
run_flask
()
python/examples/imagenet/image_http_client.py
浏览文件 @
d48e1cfd
...
@@ -31,7 +31,7 @@ def predict(image_path, server):
...
@@ -31,7 +31,7 @@ def predict(image_path, server):
r
=
requests
.
post
(
r
=
requests
.
post
(
server
,
data
=
req
,
headers
=
{
"Content-Type"
:
"application/json"
})
server
,
data
=
req
,
headers
=
{
"Content-Type"
:
"application/json"
})
try
:
try
:
print
(
r
.
json
()[
"
score"
][
0
])
print
(
r
.
json
()[
"
result"
][
"score"
])
except
ValueError
:
except
ValueError
:
print
(
r
.
text
)
print
(
r
.
text
)
return
r
return
r
...
...
python/examples/imagenet/image_rpc_client.py
浏览文件 @
d48e1cfd
...
@@ -26,7 +26,7 @@ start = time.time()
...
@@ -26,7 +26,7 @@ start = time.time()
for
i
in
range
(
1000
):
for
i
in
range
(
1000
):
with
open
(
"./data/n01440764_10026.JPEG"
,
"rb"
)
as
f
:
with
open
(
"./data/n01440764_10026.JPEG"
,
"rb"
)
as
f
:
img
=
f
.
read
()
img
=
f
.
read
()
img
=
reader
.
process_image
(
img
)
.
reshape
(
-
1
)
img
=
reader
.
process_image
(
img
)
fetch_map
=
client
.
predict
(
feed
=
{
"image"
:
img
},
fetch
=
[
"score"
])
fetch_map
=
client
.
predict
(
feed
=
{
"image"
:
img
},
fetch
=
[
"score"
])
end
=
time
.
time
()
end
=
time
.
time
()
print
(
end
-
start
)
print
(
end
-
start
)
...
...
python/examples/imdb/text_classify_service.py
浏览文件 @
d48e1cfd
...
@@ -39,3 +39,4 @@ imdb_service.prepare_server(
...
@@ -39,3 +39,4 @@ imdb_service.prepare_server(
workdir
=
sys
.
argv
[
2
],
port
=
int
(
sys
.
argv
[
3
]),
device
=
"cpu"
)
workdir
=
sys
.
argv
[
2
],
port
=
int
(
sys
.
argv
[
3
]),
device
=
"cpu"
)
imdb_service
.
prepare_dict
({
"dict_file_path"
:
sys
.
argv
[
4
]})
imdb_service
.
prepare_dict
({
"dict_file_path"
:
sys
.
argv
[
4
]})
imdb_service
.
run_server
()
imdb_service
.
run_server
()
imdb_service
.
run_flask
()
python/paddle_serving_server/__init__.py
浏览文件 @
d48e1cfd
...
@@ -351,6 +351,7 @@ class Server(object):
...
@@ -351,6 +351,7 @@ class Server(object):
self
.
_prepare_resource
(
workdir
)
self
.
_prepare_resource
(
workdir
)
self
.
_prepare_engine
(
self
.
model_config_paths
,
device
)
self
.
_prepare_engine
(
self
.
model_config_paths
,
device
)
self
.
_prepare_infer_service
(
port
)
self
.
_prepare_infer_service
(
port
)
self
.
port
=
port
self
.
workdir
=
workdir
self
.
workdir
=
workdir
infer_service_fn
=
"{}/{}"
.
format
(
workdir
,
self
.
infer_service_fn
)
infer_service_fn
=
"{}/{}"
.
format
(
workdir
,
self
.
infer_service_fn
)
...
...
python/paddle_serving_server/web_service.py
浏览文件 @
d48e1cfd
...
@@ -18,6 +18,8 @@ from flask import Flask, request, abort
...
@@ -18,6 +18,8 @@ from flask import Flask, request, abort
from
multiprocessing
import
Pool
,
Process
from
multiprocessing
import
Pool
,
Process
from
paddle_serving_server
import
OpMaker
,
OpSeqMaker
,
Server
from
paddle_serving_server
import
OpMaker
,
OpSeqMaker
,
Server
from
paddle_serving_client
import
Client
from
paddle_serving_client
import
Client
from
contextlib
import
closing
import
socket
class
WebService
(
object
):
class
WebService
(
object
):
...
@@ -41,19 +43,34 @@ class WebService(object):
...
@@ -41,19 +43,34 @@ class WebService(object):
server
.
set_num_threads
(
16
)
server
.
set_num_threads
(
16
)
server
.
load_model_config
(
self
.
model_config
)
server
.
load_model_config
(
self
.
model_config
)
server
.
prepare_server
(
server
.
prepare_server
(
workdir
=
self
.
workdir
,
port
=
self
.
port
+
1
,
device
=
self
.
device
)
workdir
=
self
.
workdir
,
port
=
self
.
port
_list
[
0
]
,
device
=
self
.
device
)
server
.
run_server
()
server
.
run_server
()
def
port_is_available
(
self
,
port
):
with
closing
(
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
))
as
sock
:
sock
.
settimeout
(
2
)
result
=
sock
.
connect_ex
((
'0.0.0.0'
,
port
))
if
result
!=
0
:
return
True
else
:
return
False
def
prepare_server
(
self
,
workdir
=
""
,
port
=
9393
,
device
=
"cpu"
):
def
prepare_server
(
self
,
workdir
=
""
,
port
=
9393
,
device
=
"cpu"
):
self
.
workdir
=
workdir
self
.
workdir
=
workdir
self
.
port
=
port
self
.
port
=
port
self
.
device
=
device
self
.
device
=
device
default_port
=
12000
self
.
port_list
=
[]
for
i
in
range
(
1000
):
if
self
.
port_is_available
(
default_port
+
i
):
self
.
port_list
.
append
(
default_port
+
i
)
break
def
_launch_web_service
(
self
):
def
_launch_web_service
(
self
):
self
.
client
_service
=
Client
()
self
.
client
=
Client
()
self
.
client
_service
.
load_client_config
(
self
.
client
.
load_client_config
(
"{}/serving_server_conf.prototxt"
.
format
(
"{}/serving_server_conf.prototxt"
.
format
(
self
.
model_config
))
self
.
model_config
))
self
.
client
_service
.
connect
([
"0.0.0.0:{}"
.
format
(
self
.
port
+
1
)])
self
.
client
.
connect
([
"0.0.0.0:{}"
.
format
(
self
.
port_list
[
0
]
)])
def
get_prediction
(
self
,
request
):
def
get_prediction
(
self
,
request
):
if
not
request
.
json
:
if
not
request
.
json
:
...
@@ -64,12 +81,12 @@ class WebService(object):
...
@@ -64,12 +81,12 @@ class WebService(object):
feed
,
fetch
=
self
.
preprocess
(
request
.
json
,
request
.
json
[
"fetch"
])
feed
,
fetch
=
self
.
preprocess
(
request
.
json
,
request
.
json
[
"fetch"
])
if
isinstance
(
feed
,
dict
)
and
"fetch"
in
feed
:
if
isinstance
(
feed
,
dict
)
and
"fetch"
in
feed
:
del
feed
[
"fetch"
]
del
feed
[
"fetch"
]
fetch_map
=
self
.
client_service
.
predict
(
feed
=
feed
,
fetch
=
fetch
)
fetch_map
=
self
.
client
.
predict
(
feed
=
feed
,
fetch
=
fetch
)
for
key
in
fetch_map
:
fetch_map
=
self
.
postprocess
(
fetch_map
[
key
]
=
fetch_map
[
key
][
0
].
tolist
()
result
=
self
.
postprocess
(
feed
=
request
.
json
,
fetch
=
fetch
,
fetch_map
=
fetch_map
)
feed
=
request
.
json
,
fetch
=
fetch
,
fetch_map
=
fetch_map
)
result
=
{
"result"
:
result
}
for
key
in
fetch_map
:
fetch_map
[
key
]
=
fetch_map
[
key
].
tolist
()
result
=
{
"result"
:
fetch_map
}
except
ValueError
:
except
ValueError
:
result
=
{
"result"
:
"Request Value Error"
}
result
=
{
"result"
:
"Request Value Error"
}
return
result
return
result
...
@@ -83,6 +100,24 @@ class WebService(object):
...
@@ -83,6 +100,24 @@ class WebService(object):
p_rpc
=
Process
(
target
=
self
.
_launch_rpc_service
)
p_rpc
=
Process
(
target
=
self
.
_launch_rpc_service
)
p_rpc
.
start
()
p_rpc
.
start
()
def
run_flask
(
self
):
app_instance
=
Flask
(
__name__
)
@
app_instance
.
before_first_request
def
init
():
self
.
_launch_web_service
()
service_name
=
"/"
+
self
.
name
+
"/prediction"
@
app_instance
.
route
(
service_name
,
methods
=
[
"POST"
])
def
run
():
return
self
.
get_prediction
(
request
)
app_instance
.
run
(
host
=
"0.0.0.0"
,
port
=
self
.
port
,
threaded
=
False
,
processes
=
4
)
def
preprocess
(
self
,
feed
=
{},
fetch
=
[]):
def
preprocess
(
self
,
feed
=
{},
fetch
=
[]):
return
feed
,
fetch
return
feed
,
fetch
...
...
python/paddle_serving_server_gpu/web_service.py
浏览文件 @
d48e1cfd
...
@@ -14,14 +14,15 @@
...
@@ -14,14 +14,15 @@
# pylint: disable=doc-string-missing
# pylint: disable=doc-string-missing
from
flask
import
Flask
,
request
,
abort
from
flask
import
Flask
,
request
,
abort
from
paddle_serving_server_gpu
import
OpMaker
,
OpSeqMaker
,
Server
from
contextlib
import
closing
import
paddle_serving_server_gpu
as
serving
from
multiprocessing
import
Pool
,
Process
,
Queue
from
multiprocessing
import
Pool
,
Process
,
Queue
from
paddle_serving_client
import
Client
from
paddle_serving_client
import
Client
from
paddle_serving_server_gpu
import
OpMaker
,
OpSeqMaker
,
Server
from
paddle_serving_server_gpu.serve
import
start_multi_card
from
paddle_serving_server_gpu.serve
import
start_multi_card
import
socket
import
sys
import
sys
import
numpy
as
np
import
numpy
as
np
import
paddle_serving_server_gpu
as
serving
class
WebService
(
object
):
class
WebService
(
object
):
...
@@ -67,22 +68,39 @@ class WebService(object):
...
@@ -67,22 +68,39 @@ class WebService(object):
def
_launch_rpc_service
(
self
,
service_idx
):
def
_launch_rpc_service
(
self
,
service_idx
):
self
.
rpc_service_list
[
service_idx
].
run_server
()
self
.
rpc_service_list
[
service_idx
].
run_server
()
def
port_is_available
(
self
,
port
):
with
closing
(
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
))
as
sock
:
sock
.
settimeout
(
2
)
result
=
sock
.
connect_ex
((
'0.0.0.0'
,
port
))
if
result
!=
0
:
return
True
else
:
return
False
def
prepare_server
(
self
,
workdir
=
""
,
port
=
9393
,
device
=
"gpu"
,
gpuid
=
0
):
def
prepare_server
(
self
,
workdir
=
""
,
port
=
9393
,
device
=
"gpu"
,
gpuid
=
0
):
self
.
workdir
=
workdir
self
.
workdir
=
workdir
self
.
port
=
port
self
.
port
=
port
self
.
device
=
device
self
.
device
=
device
self
.
gpuid
=
gpuid
self
.
gpuid
=
gpuid
self
.
port_list
=
[]
default_port
=
12000
for
i
in
range
(
1000
):
if
self
.
port_is_available
(
default_port
+
i
):
self
.
port_list
.
append
(
default_port
+
i
)
if
len
(
self
.
port_list
)
>
len
(
self
.
gpus
):
break
if
len
(
self
.
gpus
)
==
0
:
if
len
(
self
.
gpus
)
==
0
:
# init cpu service
# init cpu service
self
.
rpc_service_list
.
append
(
self
.
rpc_service_list
.
append
(
self
.
default_rpc_service
(
self
.
default_rpc_service
(
self
.
workdir
,
self
.
port
+
1
,
-
1
,
thread_num
=
10
))
self
.
workdir
,
self
.
port
_list
[
0
]
,
-
1
,
thread_num
=
10
))
else
:
else
:
for
i
,
gpuid
in
enumerate
(
self
.
gpus
):
for
i
,
gpuid
in
enumerate
(
self
.
gpus
):
self
.
rpc_service_list
.
append
(
self
.
rpc_service_list
.
append
(
self
.
default_rpc_service
(
self
.
default_rpc_service
(
"{}_{}"
.
format
(
self
.
workdir
,
i
),
"{}_{}"
.
format
(
self
.
workdir
,
i
),
self
.
port
+
1
+
i
,
self
.
port
_list
[
i
]
,
gpuid
,
gpuid
,
thread_num
=
10
))
thread_num
=
10
))
...
@@ -94,9 +112,9 @@ class WebService(object):
...
@@ -94,9 +112,9 @@ class WebService(object):
endpoints
=
""
endpoints
=
""
if
gpu_num
>
0
:
if
gpu_num
>
0
:
for
i
in
range
(
gpu_num
):
for
i
in
range
(
gpu_num
):
endpoints
+=
"127.0.0.1:{},"
.
format
(
self
.
port
+
i
+
1
)
endpoints
+=
"127.0.0.1:{},"
.
format
(
self
.
port
_list
[
i
]
)
else
:
else
:
endpoints
=
"127.0.0.1:{}"
.
format
(
self
.
port
+
1
)
endpoints
=
"127.0.0.1:{}"
.
format
(
self
.
port
_list
[
0
]
)
self
.
client
.
connect
([
endpoints
])
self
.
client
.
connect
([
endpoints
])
def
get_prediction
(
self
,
request
):
def
get_prediction
(
self
,
request
):
...
@@ -109,11 +127,11 @@ class WebService(object):
...
@@ -109,11 +127,11 @@ class WebService(object):
if
isinstance
(
feed
,
dict
)
and
"fetch"
in
feed
:
if
isinstance
(
feed
,
dict
)
and
"fetch"
in
feed
:
del
feed
[
"fetch"
]
del
feed
[
"fetch"
]
fetch_map
=
self
.
client
.
predict
(
feed
=
feed
,
fetch
=
fetch
)
fetch_map
=
self
.
client
.
predict
(
feed
=
feed
,
fetch
=
fetch
)
for
key
in
fetch_map
:
fetch_map
=
self
.
postprocess
(
fetch_map
[
key
]
=
fetch_map
[
key
][
0
].
tolist
()
result
=
self
.
postprocess
(
feed
=
request
.
json
,
fetch
=
fetch
,
fetch_map
=
fetch_map
)
feed
=
request
.
json
,
fetch
=
fetch
,
fetch_map
=
fetch_map
)
result
=
{
"result"
:
result
}
for
key
in
fetch_map
:
fetch_map
[
key
]
=
fetch_map
[
key
].
tolist
()
result
=
{
"result"
:
fetch_map
}
except
ValueError
:
except
ValueError
:
result
=
{
"result"
:
"Request Value Error"
}
result
=
{
"result"
:
"Request Value Error"
}
return
result
return
result
...
@@ -131,6 +149,24 @@ class WebService(object):
...
@@ -131,6 +149,24 @@ class WebService(object):
for
p
in
server_pros
:
for
p
in
server_pros
:
p
.
start
()
p
.
start
()
def
run_flask
(
self
):
app_instance
=
Flask
(
__name__
)
@
app_instance
.
before_first_request
def
init
():
self
.
_launch_web_service
()
service_name
=
"/"
+
self
.
name
+
"/prediction"
@
app_instance
.
route
(
service_name
,
methods
=
[
"POST"
])
def
run
():
return
self
.
get_prediction
(
request
)
app_instance
.
run
(
host
=
"0.0.0.0"
,
port
=
self
.
port
,
threaded
=
False
,
processes
=
4
)
def
preprocess
(
self
,
feed
=
{},
fetch
=
[]):
def
preprocess
(
self
,
feed
=
{},
fetch
=
[]):
return
feed
,
fetch
return
feed
,
fetch
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录