Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
8d930195
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8d930195
编写于
11月 06, 2018
作者:
Z
Zeng Jinle
提交者:
GitHub
11月 06, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14238 from sneaxiy/fix_read_lod_level_bug
Fix lod_level share bug in read_op
上级
306236c2
46d4829d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
57 addition
and
0 deletion
+57
-0
paddle/fluid/operators/read_op.cc
paddle/fluid/operators/read_op.cc
+13
-0
python/paddle/fluid/layers/io.py
python/paddle/fluid/layers/io.py
+1
-0
python/paddle/fluid/tests/unittests/test_py_reader_lod_level_share.py
...e/fluid/tests/unittests/test_py_reader_lod_level_share.py
+43
-0
未找到文件。
paddle/fluid/operators/read_op.cc
浏览文件 @
8d930195
...
...
@@ -33,6 +33,19 @@ class ReadInferShape : public framework::InferShapeBase {
reader_dims
.
size
(),
out_names
.
size
(),
"The reader's dim number doesn't match the output number."
);
ctx
->
SetOutputsDim
(
"Out"
,
reader_dims
);
if
(
!
ctx
->
IsRuntime
())
{
auto
in_desc
=
boost
::
get
<
framework
::
VarDesc
*>
(
ctx
->
GetInputVarPtrs
(
"Reader"
)[
0
]);
auto
in_lod_levels
=
in_desc
->
GetLoDLevels
();
auto
out_var_ptrs
=
ctx
->
GetOutputVarPtrs
(
"Out"
);
PADDLE_ENFORCE_EQ
(
in_lod_levels
.
size
(),
out_var_ptrs
.
size
(),
"LoDLevels of Input(Reader) must be the same as the "
"number of Outputs(Out)."
);
for
(
size_t
i
=
0
;
i
<
out_var_ptrs
.
size
();
++
i
)
{
auto
*
out_desc
=
boost
::
get
<
framework
::
VarDesc
*>
(
out_var_ptrs
[
i
]);
out_desc
->
SetLoDLevel
(
in_lod_levels
[
i
]);
}
}
}
};
...
...
python/paddle/fluid/layers/io.py
浏览文件 @
8d930195
...
...
@@ -315,6 +315,7 @@ def _copy_reader_var_(block, var):
new_var
=
block
.
create_var
(
name
=
var
.
name
,
type
=
core
.
VarDesc
.
VarType
.
READER
)
new_var
.
desc
.
set_shapes
(
var
.
desc
.
shapes
())
new_var
.
desc
.
set_dtypes
(
var
.
desc
.
dtypes
())
new_var
.
desc
.
set_lod_levels
(
var
.
desc
.
lod_levels
())
new_var
.
persistable
=
True
return
new_var
...
...
python/paddle/fluid/tests/unittests/test_py_reader_lod_level_share.py
0 → 100644
浏览文件 @
8d930195
# Copyright (c) 2018 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.
import
paddle.fluid
as
fluid
import
unittest
class
TestLoDLevelShare
(
unittest
.
TestCase
):
def
setUp
(
self
):
self
.
use_double_buffer
=
False
def
test_lod_level_share
(
self
):
reader
=
fluid
.
layers
.
py_reader
(
capacity
=
16
,
shapes
=
([
-
1
,
256
],
[
-
1
,
512
],
[
-
1
,
100
]),
dtypes
=
(
'float32'
,
'int64'
,
'double'
),
lod_levels
=
(
1
,
2
,
0
),
use_double_buffer
=
self
.
use_double_buffer
)
x
,
y
,
z
=
fluid
.
layers
.
read_file
(
reader
)
self
.
assertEqual
(
x
.
lod_level
,
1
)
self
.
assertEqual
(
y
.
lod_level
,
2
)
self
.
assertEqual
(
z
.
lod_level
,
0
)
class
TestLoDLevelShare2
(
TestLoDLevelShare
):
def
setUp
(
self
):
self
.
use_double_buffer
=
True
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录