Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Serving
提交
d7b53704
S
Serving
项目概览
PaddlePaddle
/
Serving
1 年多 前同步成功
通知
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看板
提交
d7b53704
编写于
8月 11, 2020
作者:
B
barrierye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix batch input
上级
9f963bb4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
37 addition
and
7 deletion
+37
-7
python/pipeline/operator.py
python/pipeline/operator.py
+37
-7
未找到文件。
python/pipeline/operator.py
浏览文件 @
d7b53704
...
...
@@ -345,7 +345,29 @@ class Op(object):
" we selected logid={} (from batch: {}) as a "
"representative for logging."
.
format
(
data_id
,
op_info_prefix
,
typical_logid
,
data_ids
))
feed_batch
=
[
preped_data_dict
[
data_id
]
for
data_id
in
data_ids
]
# combine samples to batch
one_input
=
preped_data_dict
[
data_ids
[
0
]]
feed_batch
=
[]
input_offset
=
None
if
isinstance
(
one_input
,
dict
):
# sample input
feed_batch
=
[
preped_data_dict
[
data_id
]
for
data_id
in
data_ids
]
input_offset
=
list
(
range
(
len
(
data_ids
)
+
1
))
elif
isinstance
(
one_input
,
list
):
# batch input
input_offset
=
[
0
]
for
data_id
in
data_ids
:
batch_input
=
preped_data_dict
[
data_id
]
offset
=
input_offset
[
-
1
]
+
len
(
batch_input
)
feed_batch
+=
batch_input
input_offset
.
append
(
offset
)
else
:
_LOGGER
.
critical
(
"{} Failed to process: expect input type is dict or listi"
", but get {}"
.
format
(
op_info_prefix
,
type
(
one_input
)))
os
.
_exit
(
-
1
)
midped_batch
=
None
ecode
=
ChannelDataEcode
.
OK
.
value
if
self
.
_timeout
<=
0
:
...
...
@@ -414,20 +436,28 @@ class Op(object):
for
idx
,
data_id
in
enumerate
(
data_ids
):
midped_data_dict
[
data_id
]
=
{}
for
name
,
value
in
midped_batch
.
items
():
if
name
in
lod_offset_names
:
continue
if
name
in
lod_var_names
:
# lodtensor
lod_offset_name
=
"{}.lod"
.
format
(
name
)
lod_offset
=
midped_batch
[
lod_offset_name
]
for
idx
,
data_id
in
enumerate
(
data_ids
):
left
=
midped_batch
[
lod_offset_name
][
idx
]
right
=
midped_batch
[
lod_offset_name
][
idx
+
1
]
midped_data_dict
[
data_id
][
name
]
=
value
[
left
:
right
]
data_offset_left
=
input_offset
[
idx
]
data_offset_right
=
input_offset
[
idx
+
1
]
lod_offset_left
=
lod_offset
[
data_offset_left
]
lod_offset_right
=
lod_offset
[
data_offset_right
]
midped_data_dict
[
data_id
][
name
]
=
value
[
lod_offset_left
:
lod_offset_right
]
midped_data_dict
[
data_id
][
lod_offset_name
]
=
\
lod_offset
[
data_offset_left
:
data_offset_right
+
1
]
-
lod_offset
[
data_offset_left
]
else
:
# normal tensor
for
idx
,
data_id
in
enumerate
(
data_ids
):
midped_data_dict
[
data_id
][
name
]
=
value
[
idx
]
left
=
input_offset
[
idx
]
right
=
input_offset
[
idx
+
1
]
midped_data_dict
[
data_id
][
name
]
=
value
[
left
:
right
]
else
:
midped_data_dict
=
preped_data_dict
_LOGGER
.
debug
(
"{} Succ process"
.
format
(
op_info_prefix
))
...
...
@@ -772,7 +802,7 @@ class ResponseOp(Op):
feed
=
channeldata
.
parse
()
# ndarray to string:
# https://stackoverflow.com/questions/30167538/convert-a-numpy-ndarray-to-stringor-bytes-and-convert-it-back-to-numpy-ndarray
np
.
set_printoptions
(
threshold
=
np
.
nan
)
np
.
set_printoptions
(
threshold
=
sys
.
maxsize
)
for
name
,
var
in
feed
.
items
():
resp
.
value
.
append
(
var
.
__repr__
())
resp
.
key
.
append
(
name
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录