Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
705a8257
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,发现更多精彩内容 >>
提交
705a8257
编写于
6月 18, 2020
作者:
G
gongweibao
浏览文件
操作
浏览文件
下载
差异文件
add
test=develop
上级
c8e538b7
454cdf64
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
80 addition
and
62 deletion
+80
-62
core/general-client/src/general_model.cpp
core/general-client/src/general_model.cpp
+12
-24
doc/COMPILE.md
doc/COMPILE.md
+4
-4
doc/COMPILE_CN.md
doc/COMPILE_CN.md
+4
-4
doc/LATEST_PACKAGES.md
doc/LATEST_PACKAGES.md
+9
-9
python/examples/fit_a_line/test_multilang_client.py
python/examples/fit_a_line/test_multilang_client.py
+19
-5
python/paddle_serving_app/version.py
python/paddle_serving_app/version.py
+1
-1
python/paddle_serving_client/__init__.py
python/paddle_serving_client/__init__.py
+20
-4
python/paddle_serving_client/version.py
python/paddle_serving_client/version.py
+3
-3
python/paddle_serving_server/version.py
python/paddle_serving_server/version.py
+3
-3
python/paddle_serving_server_gpu/version.py
python/paddle_serving_server_gpu/version.py
+3
-3
tools/python_tag.py
tools/python_tag.py
+2
-2
未找到文件。
core/general-client/src/general_model.cpp
浏览文件 @
705a8257
...
@@ -285,22 +285,16 @@ int PredictorClient::batch_predict(
...
@@ -285,22 +285,16 @@ int PredictorClient::batch_predict(
// int idx = _fetch_name_to_idx[name];
// int idx = _fetch_name_to_idx[name];
if
(
_fetch_name_to_type
[
name
]
==
0
)
{
if
(
_fetch_name_to_type
[
name
]
==
0
)
{
VLOG
(
2
)
<<
"ferch var "
<<
name
<<
"type int"
;
VLOG
(
2
)
<<
"ferch var "
<<
name
<<
"type int"
;
model
.
_int64_value_map
[
name
].
resize
(
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data_size
());
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data_size
();
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data_size
();
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
model
.
_int64_value_map
[
name
]
=
std
::
vector
<
int64_t
>
(
model
.
_int64_value_map
[
name
][
i
]
=
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data
().
begin
(),
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data
(
i
);
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data
().
begin
()
+
size
);
}
}
else
{
}
else
{
VLOG
(
2
)
<<
"fetch var "
<<
name
<<
"type float"
;
VLOG
(
2
)
<<
"fetch var "
<<
name
<<
"type float"
;
model
.
_float_value_map
[
name
].
resize
(
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data_size
());
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data_size
();
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data_size
();
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
model
.
_float_value_map
[
name
]
=
std
::
vector
<
float
>
(
model
.
_float_value_map
[
name
][
i
]
=
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data
().
begin
(),
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data
(
i
);
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data
().
begin
()
+
size
);
}
}
}
idx
+=
1
;
idx
+=
1
;
}
}
...
@@ -564,22 +558,16 @@ int PredictorClient::numpy_predict(
...
@@ -564,22 +558,16 @@ int PredictorClient::numpy_predict(
// int idx = _fetch_name_to_idx[name];
// int idx = _fetch_name_to_idx[name];
if
(
_fetch_name_to_type
[
name
]
==
0
)
{
if
(
_fetch_name_to_type
[
name
]
==
0
)
{
VLOG
(
2
)
<<
"ferch var "
<<
name
<<
"type int"
;
VLOG
(
2
)
<<
"ferch var "
<<
name
<<
"type int"
;
model
.
_int64_value_map
[
name
].
resize
(
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data_size
());
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data_size
();
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data_size
();
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
model
.
_int64_value_map
[
name
]
=
std
::
vector
<
int64_t
>
(
model
.
_int64_value_map
[
name
][
i
]
=
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data
().
begin
(),
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data
(
i
);
output
.
insts
(
0
).
tensor_array
(
idx
).
int64_data
().
begin
()
+
size
);
}
}
else
{
}
else
{
VLOG
(
2
)
<<
"fetch var "
<<
name
<<
"type float"
;
VLOG
(
2
)
<<
"fetch var "
<<
name
<<
"type float"
;
model
.
_float_value_map
[
name
].
resize
(
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data_size
());
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data_size
();
int
size
=
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data_size
();
for
(
int
i
=
0
;
i
<
size
;
++
i
)
{
model
.
_float_value_map
[
name
]
=
std
::
vector
<
float
>
(
model
.
_float_value_map
[
name
][
i
]
=
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data
().
begin
(),
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data
(
i
);
output
.
insts
(
0
).
tensor_array
(
idx
).
float_data
().
begin
()
+
size
);
}
}
}
idx
+=
1
;
idx
+=
1
;
}
}
...
...
doc/COMPILE.md
浏览文件 @
705a8257
...
@@ -43,7 +43,7 @@ In the default centos7 image we provide, the Python path is `/usr/bin/python`. I
...
@@ -43,7 +43,7 @@ In the default centos7 image we provide, the Python path is `/usr/bin/python`. I
### Integrated CPU version paddle inference library
### Integrated CPU version paddle inference library
```
shell
```
shell
mkdir
build
&&
cd
build
mkdir
server-build-cpu
&&
cd
server-build-cpu
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON ..
make
-j10
make
-j10
```
```
...
@@ -53,7 +53,7 @@ you can execute `make install` to put targets under directory `./output`, you ne
...
@@ -53,7 +53,7 @@ you can execute `make install` to put targets under directory `./output`, you ne
### Integrated GPU version paddle inference library
### Integrated GPU version paddle inference library
```
shell
```
shell
mkdir
build
&&
cd
build
mkdir
server-build-gpu
&&
cd
server-build-gpu
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON
-DWITH_GPU
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON
-DWITH_GPU
=
ON ..
make
-j10
make
-j10
```
```
...
@@ -65,7 +65,7 @@ execute `make install` to put targets under directory `./output`
...
@@ -65,7 +65,7 @@ execute `make install` to put targets under directory `./output`
## Compile Client
## Compile Client
```
shell
```
shell
mkdir
build
&&
cd
build
mkdir
client-build
&&
cd
client-
build
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DCLIENT
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DCLIENT
=
ON ..
make
-j10
make
-j10
```
```
...
@@ -75,7 +75,7 @@ execute `make install` to put targets under directory `./output`
...
@@ -75,7 +75,7 @@ execute `make install` to put targets under directory `./output`
## Compile the App
## Compile the App
```
bash
```
bash
mkdir
build
&&
cd
build
mkdir
app-build
&&
cd
app-
build
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DAPP
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DAPP
=
ON ..
make
make
```
```
...
...
doc/COMPILE_CN.md
浏览文件 @
705a8257
...
@@ -43,7 +43,7 @@ export PYTHONROOT=/usr/
...
@@ -43,7 +43,7 @@ export PYTHONROOT=/usr/
### 集成CPU版本Paddle Inference Library
### 集成CPU版本Paddle Inference Library
```
shell
```
shell
mkdir
build
&&
cd
build
mkdir
server-build-cpu
&&
cd
server-build-cpu
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON ..
make
-j10
make
-j10
```
```
...
@@ -53,7 +53,7 @@ make -j10
...
@@ -53,7 +53,7 @@ make -j10
### 集成GPU版本Paddle Inference Library
### 集成GPU版本Paddle Inference Library
```
shell
```
shell
mkdir
build
&&
cd
build
mkdir
server-build-gpu
&&
cd
server-build-gpu
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON
-DWITH_GPU
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DSERVER
=
ON
-DWITH_GPU
=
ON ..
make
-j10
make
-j10
```
```
...
@@ -65,7 +65,7 @@ make -j10
...
@@ -65,7 +65,7 @@ make -j10
## 编译Client部分
## 编译Client部分
```
shell
```
shell
mkdir
build
&&
cd
build
mkdir
client-build
&&
cd
client-
build
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DCLIENT
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DCLIENT
=
ON ..
make
-j10
make
-j10
```
```
...
@@ -75,7 +75,7 @@ make -j10
...
@@ -75,7 +75,7 @@ make -j10
## 编译App部分
## 编译App部分
```
bash
```
bash
mkdir
build
&&
cd
build
mkdir
app-build
&&
cd
app-
build
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DCMAKE_INSTALL_PREFIX
=
./output
-DAPP
=
ON ..
cmake
-DPYTHON_INCLUDE_DIR
=
$PYTHONROOT
/include/python2.7/
-DPYTHON_LIBRARIES
=
$PYTHONROOT
/lib/libpython2.7.so
-DPYTHON_EXECUTABLE
=
$PYTHONROOT
/bin/python
-DCMAKE_INSTALL_PREFIX
=
./output
-DAPP
=
ON ..
make
make
```
```
...
...
doc/LATEST_PACKAGES.md
浏览文件 @
705a8257
...
@@ -3,45 +3,45 @@
...
@@ -3,45 +3,45 @@
## CPU server
## CPU server
### Python 3
### Python 3
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.3.
0
-py3-none-any.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.3.
1
-py3-none-any.whl
```
```
### Python 2
### Python 2
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.3.
0
-py2-none-any.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server-0.3.
1
-py2-none-any.whl
```
```
## GPU server
## GPU server
### Python 3
### Python 3
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.3.
0
-py3-none-any.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.3.
1
-py3-none-any.whl
```
```
### Python 2
### Python 2
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.3.
0
-py2-none-any.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_server_gpu-0.3.
1
-py2-none-any.whl
```
```
## Client
## Client
### Python 3.7
### Python 3.7
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.3.
0-cp37-none-manylinux1_x86_64
.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.3.
1-cp37-none-any
.whl
```
```
### Python 3.6
### Python 3.6
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.3.
0-cp36-none-manylinux1_x86_64
.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.3.
1-cp36-none-any
.whl
```
```
### Python 2.7
### Python 2.7
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.3.
0-cp27-none-manylinux1_x86_64
.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_client-0.3.
1-cp27-none-any
.whl
```
```
## App
## App
### Python 3
### Python 3
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_app-0.1.
0
-py3-none-any.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_app-0.1.
1
-py3-none-any.whl
```
```
### Python 2
### Python 2
```
```
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_app-0.1.
0
-py2-none-any.whl
https://paddle-serving.bj.bcebos.com/whl/paddle_serving_app-0.1.
1
-py2-none-any.whl
```
```
python/examples/fit_a_line/test_multilang_client.py
浏览文件 @
705a8257
...
@@ -14,7 +14,10 @@
...
@@ -14,7 +14,10 @@
# pylint: disable=doc-string-missing
# pylint: disable=doc-string-missing
from
paddle_serving_client
import
MultiLangClient
from
paddle_serving_client
import
MultiLangClient
import
functools
import
sys
import
sys
import
time
import
threading
client
=
MultiLangClient
()
client
=
MultiLangClient
()
#client.load_client_config(sys.argv[1])
#client.load_client_config(sys.argv[1])
...
@@ -26,11 +29,22 @@ test_reader = paddle.batch(
...
@@ -26,11 +29,22 @@ test_reader = paddle.batch(
paddle
.
dataset
.
uci_housing
.
test
(),
buf_size
=
500
),
paddle
.
dataset
.
uci_housing
.
test
(),
buf_size
=
500
),
batch_size
=
1
)
batch_size
=
1
)
ret
=
[]
complete_task_count
=
[
0
]
lock
=
threading
.
Lock
()
def
call_back
(
call_future
,
data
):
fetch_map
=
call_future
.
result
()
print
(
"{} {}"
.
format
(
fetch_map
[
"price"
][
0
],
data
[
0
][
1
][
0
]))
with
lock
:
complete_task_count
[
0
]
+=
1
task_count
=
0
for
data
in
test_reader
():
for
data
in
test_reader
():
future
=
client
.
predict
(
feed
=
{
"x"
:
data
[
0
][
0
]},
fetch
=
[
"price"
],
asyn
=
True
)
future
=
client
.
predict
(
feed
=
{
"x"
:
data
[
0
][
0
]},
fetch
=
[
"price"
],
asyn
=
True
)
ret
.
append
(
future
)
task_count
+=
1
future
.
add_done_callback
(
functools
.
partial
(
call_back
,
data
=
data
))
for
future
in
ret
:
while
complete_task_count
[
0
]
!=
task_count
:
fetch_map
=
future
.
result
()
time
.
sleep
(
0.1
)
print
(
"{} {}"
.
format
(
fetch_map
[
"price"
][
0
],
data
[
0
][
1
][
0
]))
python/paddle_serving_app/version.py
浏览文件 @
705a8257
...
@@ -12,4 +12,4 @@
...
@@ -12,4 +12,4 @@
# 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.
""" Paddle Serving App version string """
""" Paddle Serving App version string """
serving_app_version
=
"0.1.
0
"
serving_app_version
=
"0.1.
1
"
python/paddle_serving_client/__init__.py
浏览文件 @
705a8257
...
@@ -399,11 +399,17 @@ class MultiLangClient(object):
...
@@ -399,11 +399,17 @@ class MultiLangClient(object):
req
=
pb2
.
EmptyRequest
()
req
=
pb2
.
EmptyRequest
()
self
.
_config
=
self
.
stub_
.
get_config
(
req
)
self
.
_config
=
self
.
stub_
.
get_config
(
req
)
self
.
_parse_model_config
(
self
.
_config
.
proto_txt
)
self
.
_parse_model_config
(
self
.
_config
.
proto_txt
)
#print("config:", self._config)
def
connect
(
self
,
endpoint
,
use_remote_config
=
True
):
def
connect
(
self
,
endpoint
,
use_remote_config
=
True
):
self
.
channel_
=
grpc
.
insecure_channel
(
endpoint
[
0
])
#TODO
# https://github.com/tensorflow/serving/issues/1382
self
.
stub_
=
grpc_pb2
.
MultiLangGeneralModelServiceStub
(
self
.
channel_
)
options
=
[(
'grpc.max_receive_message_length'
,
512
*
1024
*
1024
),
(
'grpc.max_send_message_length'
,
512
*
1024
*
1024
),
(
'grpc.max_receive_message_length'
,
512
*
1024
*
1024
)]
self
.
channel_
=
grpc
.
insecure_channel
(
endpoint
[
0
],
options
=
options
)
#TODO
self
.
stub_
=
multi_lang_general_model_service_pb2_grpc
.
MultiLangGeneralModelServiceStub
(
self
.
channel_
)
if
use_remote_config
:
if
use_remote_config
:
self
.
_load_client_config
()
self
.
_load_client_config
()
...
@@ -442,7 +448,6 @@ class MultiLangClient(object):
...
@@ -442,7 +448,6 @@ class MultiLangClient(object):
def
_pack_feed_data
(
self
,
feed
,
fetch
,
is_python
):
def
_pack_feed_data
(
self
,
feed
,
fetch
,
is_python
):
req
=
multi_lang_general_model_service_pb2
.
Request
()
req
=
multi_lang_general_model_service_pb2
.
Request
()
req
.
fetch_var_names
.
extend
(
fetch
)
req
.
fetch_var_names
.
extend
(
fetch
)
req
.
feed_var_names
.
extend
(
feed
.
keys
())
req
.
is_python
=
is_python
req
.
is_python
=
is_python
feed_batch
=
None
feed_batch
=
None
if
isinstance
(
feed
,
dict
):
if
isinstance
(
feed
,
dict
):
...
@@ -451,6 +456,7 @@ class MultiLangClient(object):
...
@@ -451,6 +456,7 @@ class MultiLangClient(object):
feed_batch
=
feed
feed_batch
=
feed
else
:
else
:
raise
Exception
(
"{} not support"
.
format
(
type
(
feed
)))
raise
Exception
(
"{} not support"
.
format
(
type
(
feed
)))
req
.
feed_var_names
.
extend
(
feed_batch
[
0
].
keys
())
init_feed_names
=
False
init_feed_names
=
False
for
feed_data
in
feed_batch
:
for
feed_data
in
feed_batch
:
inst
=
multi_lang_general_model_service_pb2
.
FeedInst
()
inst
=
multi_lang_general_model_service_pb2
.
FeedInst
()
...
@@ -527,6 +533,9 @@ class MultiLangClient(object):
...
@@ -527,6 +533,9 @@ class MultiLangClient(object):
return
unpack_resp
return
unpack_resp
def
get_feed_names
(
self
):
return
self
.
feed_names_
def
predict
(
self
,
def
predict
(
self
,
feed
,
feed
,
fetch
,
fetch
,
...
@@ -559,3 +568,10 @@ class MultiLangPredictFuture(object):
...
@@ -559,3 +568,10 @@ class MultiLangPredictFuture(object):
def
result
(
self
):
def
result
(
self
):
resp
=
self
.
call_future_
.
result
()
resp
=
self
.
call_future_
.
result
()
return
self
.
callback_func_
(
resp
)
return
self
.
callback_func_
(
resp
)
def
add_done_callback
(
self
,
fn
):
def
__fn__
(
call_future
):
assert
call_future
==
self
.
call_future_
fn
(
self
)
self
.
call_future_
.
add_done_callback
(
__fn__
)
python/paddle_serving_client/version.py
浏览文件 @
705a8257
...
@@ -12,6 +12,6 @@
...
@@ -12,6 +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.
""" Paddle Serving Client version string """
""" Paddle Serving Client version string """
serving_client_version
=
"0.3.
0
"
serving_client_version
=
"0.3.
1
"
serving_server_version
=
"0.3.
0
"
serving_server_version
=
"0.3.
1
"
module_proto_version
=
"0.3.
0
"
module_proto_version
=
"0.3.
1
"
python/paddle_serving_server/version.py
浏览文件 @
705a8257
...
@@ -12,6 +12,6 @@
...
@@ -12,6 +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.
""" Paddle Serving Client version string """
""" Paddle Serving Client version string """
serving_client_version
=
"0.3.
0
"
serving_client_version
=
"0.3.
1
"
serving_server_version
=
"0.3.
0
"
serving_server_version
=
"0.3.
1
"
module_proto_version
=
"0.3.
0
"
module_proto_version
=
"0.3.
1
"
python/paddle_serving_server_gpu/version.py
浏览文件 @
705a8257
...
@@ -12,6 +12,6 @@
...
@@ -12,6 +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.
""" Paddle Serving Client version string """
""" Paddle Serving Client version string """
serving_client_version
=
"0.3.
0
"
serving_client_version
=
"0.3.
1
"
serving_server_version
=
"0.3.
0
"
serving_server_version
=
"0.3.
1
"
module_proto_version
=
"0.3.
0
"
module_proto_version
=
"0.3.
1
"
tools/python_tag.py
浏览文件 @
705a8257
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
from
wheel.pep425tags
import
get_abbr_impl
,
get_impl_ver
,
get_abi_tag
from
wheel.pep425tags
import
get_abbr_impl
,
get_impl_ver
,
get_abi_tag
import
re
import
re
with
open
(
"setup.cfg"
,
"w"
)
as
f
:
with
open
(
"setup.cfg"
,
"w"
)
as
f
:
line
=
"[bdist_wheel]
\n
python-tag={0}{1}
\n
plat-name=manylinux1_x86_64"
.
format
(
line
=
"[bdist_wheel]
\n
python-tag={0}{1}
"
.
format
(
get_abbr_impl
(),
get_abbr_impl
(),
get_impl_ver
())
get_impl_ver
())
f
.
write
(
line
)
f
.
write
(
line
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录