Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wk1234123
Paddle
提交
32d50864
P
Paddle
项目概览
wk1234123
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
32d50864
编写于
5月 30, 2018
作者:
F
fengjiayi
提交者:
GitHub
5月 30, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11042 from JiayiFeng/fix_two_bugs
fix two bugs
上级
109ee924
32c0e82c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
7 deletion
+8
-7
paddle/fluid/operators/reader/create_custom_reader_op.cc
paddle/fluid/operators/reader/create_custom_reader_op.cc
+6
-6
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+2
-1
未找到文件。
paddle/fluid/operators/reader/create_custom_reader_op.cc
浏览文件 @
32d50864
...
@@ -23,13 +23,12 @@ namespace reader {
...
@@ -23,13 +23,12 @@ namespace reader {
class
CustomReader
:
public
framework
::
DecoratedReader
{
class
CustomReader
:
public
framework
::
DecoratedReader
{
public:
public:
CustomReader
(
ReaderBase
*
reader
,
const
framework
::
BlockDesc
&
sub_block
,
CustomReader
(
ReaderBase
*
reader
,
const
framework
::
BlockDesc
&
sub_block
,
const
platform
::
Place
&
dev_place
,
const
std
::
vector
<
std
::
string
>&
source_var_names
,
const
std
::
vector
<
std
::
string
>&
source_var_names
,
const
std
::
vector
<
std
::
string
>&
sink_var_names
)
const
std
::
vector
<
std
::
string
>&
sink_var_names
)
:
DecoratedReader
(
reader
),
:
DecoratedReader
(
reader
),
program_
(
*
sub_block
.
Program
()),
program_
(
*
sub_block
.
Program
()),
sub_block_id_
(
sub_block
.
ID
()),
sub_block_id_
(
sub_block
.
ID
()),
exe_
(
framework
::
Executor
(
dev_place
)),
exe_
(
framework
::
Executor
(
platform
::
CPUPlace
()
)),
source_var_names_
(
source_var_names
),
source_var_names_
(
source_var_names
),
sink_var_names_
(
sink_var_names
)
{}
sink_var_names_
(
sink_var_names
)
{}
...
@@ -60,7 +59,7 @@ class CreateCustomReaderOp : public framework::OperatorBase {
...
@@ -60,7 +59,7 @@ class CreateCustomReaderOp : public framework::OperatorBase {
const
auto
&
underlying_reader
=
scope
.
FindVar
(
Input
(
"UnderlyingReader"
))
const
auto
&
underlying_reader
=
scope
.
FindVar
(
Input
(
"UnderlyingReader"
))
->
Get
<
framework
::
ReaderHolder
>
();
->
Get
<
framework
::
ReaderHolder
>
();
out
->
Reset
(
out
->
Reset
(
new
CustomReader
(
underlying_reader
.
Get
(),
*
sub_block
,
dev_place
,
new
CustomReader
(
underlying_reader
.
Get
(),
*
sub_block
,
Attr
<
std
::
vector
<
std
::
string
>>
(
"source_var_names"
),
Attr
<
std
::
vector
<
std
::
string
>>
(
"source_var_names"
),
Attr
<
std
::
vector
<
std
::
string
>>
(
"sink_var_names"
)));
Attr
<
std
::
vector
<
std
::
string
>>
(
"sink_var_names"
)));
}
}
...
@@ -85,9 +84,10 @@ class CreateCustomReaderOpMaker : public DecoratedReaderMakerBase {
...
@@ -85,9 +84,10 @@ class CreateCustomReaderOpMaker : public DecoratedReaderMakerBase {
CreateCustomReader Operator
CreateCustomReader Operator
A custom reader can be used for input data preprocessing.
A custom reader can be used for input data preprocessing.
A custom reader holds its own sub-block, which will be executed in its
A custom reader holds its own sub-block, which will be executed in CPU
'ReadNext()' function. Users can configurate their own preprocessing
in its 'ReadNext()' function. Users can configurate their own
pipelines by inserting operators into custom reader's sub-block.
preprocessing pipelines by inserting operators into custom reader's
sub-block.
)DOC"
);
)DOC"
);
}
}
};
};
...
...
python/paddle/fluid/layers/nn.py
浏览文件 @
32d50864
...
@@ -4009,7 +4009,8 @@ def random_crop(input, shape, seed=1):
...
@@ -4009,7 +4009,8 @@ def random_crop(input, shape, seed=1):
attrs
=
{
attrs
=
{
"dtype"
:
seed
.
dtype
,
"dtype"
:
seed
.
dtype
,
"shape"
:
[
1
],
"shape"
:
[
1
],
"value"
:
float
(
seed_value
)
"value"
:
float
(
seed_value
),
"force_cpu"
:
True
})
})
elif
not
isinstance
(
seed
,
Variable
):
elif
not
isinstance
(
seed
,
Variable
):
raise
ValueError
(
"'seed' must be a Variable or an int."
)
raise
ValueError
(
"'seed' must be a Variable or an int."
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录