Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2301_76559479
Paddle
提交
a308ff29
P
Paddle
项目概览
2301_76559479
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
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,发现更多精彩内容 >>
提交
a308ff29
编写于
10月 10, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make infershape of feedop and fetchop compatible with compile-time design
上级
975a5129
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
47 deletion
+19
-47
paddle/framework/executor_test.cc
paddle/framework/executor_test.cc
+6
-16
paddle/operators/feed_op.cc
paddle/operators/feed_op.cc
+2
-11
paddle/operators/feed_op.h
paddle/operators/feed_op.h
+2
-1
paddle/operators/fetch_op.cc
paddle/operators/fetch_op.cc
+2
-18
paddle/operators/fetch_op.h
paddle/operators/fetch_op.h
+7
-1
未找到文件。
paddle/framework/executor_test.cc
浏览文件 @
a308ff29
...
...
@@ -116,12 +116,8 @@ class ExecutorTesterRandom : public ::testing::Test {
{{
"dims"
,
std
::
vector
<
int
>
{
input_dim
,
embed_dim
}}},
init_root_block
);
AddOp
(
"gaussian_random"
,
{},
{{
"Out"
,
{
"w2"
}}},
{{
"dims"
,
std
::
vector
<
int
>
{
embed_dim
,
input_dim
}}},
init_root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w1"
}}},
{},
{{
"dims"
,
std
::
vector
<
int
>
{
input_dim
,
embed_dim
}},
{
"col"
,
0
}},
init_root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w2"
}}},
{},
{{
"dims"
,
std
::
vector
<
int
>
{
embed_dim
,
input_dim
}},
{
"col"
,
1
}},
init_root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w1"
}}},
{},
{{
"col"
,
0
}},
init_root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w2"
}}},
{},
{{
"col"
,
1
}},
init_root_block
);
// flush
init_program
.
Proto
();
...
...
@@ -163,12 +159,8 @@ class ExecutorTesterRandom : public ::testing::Test {
{
"Grad"
,
{
"w2@GRAD"
}}},
{{
"ParamOut"
,
{
"w2"
}}},
{},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w1"
}}},
{},
{{
"dims"
,
std
::
vector
<
int
>
{
input_dim
,
embed_dim
}},
{
"col"
,
0
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w2"
}}},
{},
{{
"dims"
,
std
::
vector
<
int
>
{
embed_dim
,
input_dim
}},
{
"col"
,
1
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w1"
}}},
{},
{{
"col"
,
0
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w2"
}}},
{},
{{
"col"
,
1
}},
root_block
);
// flush
program
.
Proto
();
...
...
@@ -197,10 +189,8 @@ class ExecutorTesterFeedAndFetch : public ::testing::Test {
root_block
);
AddOp
(
"feed"
,
{},
{{
"Out"
,
{
"b"
}}},
{{
"dims"
,
dim
},
{
"col"
,
1
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"a"
}}},
{},
{{
"dims"
,
dim
},
{
"col"
,
0
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"b"
}}},
{},
{{
"dims"
,
dim
},
{
"col"
,
1
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"a"
}}},
{},
{{
"col"
,
0
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"b"
}}},
{},
{{
"col"
,
1
}},
root_block
);
// flush
program
.
Proto
();
...
...
paddle/operators/feed_op.cc
浏览文件 @
a308ff29
...
...
@@ -24,15 +24,6 @@ class FeedOp : public framework::OperatorWithKernel {
protected:
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasOutput
(
"Out"
),
"Output should be not null."
);
int
col
=
ctx
->
Attrs
().
Get
<
int
>
(
"col"
);
framework
::
Variable
*
g_feed_variable
=
framework
::
GetGlobalScope
()
->
FindVar
(
"feed_value"
);
const
auto
&
tensors
=
g_feed_variable
->
Get
<
std
::
vector
<
framework
::
Tensor
>>
();
PADDLE_ENFORCE_GT
(
tensors
.
size
(),
static_cast
<
size_t
>
(
col
));
auto
&
shape
=
ctx
->
Attrs
().
Get
<
std
::
vector
<
int
>>
(
"dims"
);
std
::
vector
<
int64_t
>
shape_int64
(
shape
.
size
(),
0
);
std
::
transform
(
shape
.
begin
(),
shape
.
end
(),
shape_int64
.
begin
(),
...
...
@@ -43,7 +34,7 @@ class FeedOp : public framework::OperatorWithKernel {
framework
::
DataType
IndicateDataType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
return
static_cast
<
framework
::
DataType
>
(
Attr
<
int
>
(
"data
_t
ype"
));
return
static_cast
<
framework
::
DataType
>
(
Attr
<
int
>
(
"data
T
ype"
));
}
};
...
...
@@ -51,7 +42,7 @@ class FeedOpMaker : public framework::OpProtoAndCheckerMaker {
public:
FeedOpMaker
(
framework
::
OpProto
*
proto
,
framework
::
OpAttrChecker
*
op_checker
)
:
OpProtoAndCheckerMaker
(
proto
,
op_checker
)
{
AddAttr
<
int
>
(
"data
_t
ype"
,
"output data type"
)
AddAttr
<
int
>
(
"data
T
ype"
,
"output data type"
)
.
SetDefault
(
framework
::
DataType
::
FP32
);
AddAttr
<
int
>
(
"col"
,
"The col in global feed variable"
).
SetDefault
(
0
);
AddAttr
<
std
::
vector
<
int
>>
(
"dims"
,
"The dimension of feed tensor."
);
...
...
paddle/operators/feed_op.h
浏览文件 @
a308ff29
...
...
@@ -27,9 +27,10 @@ class FeedKernel : public framework::OpKernel<T> {
out
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
framework
::
Variable
*
g_feed_variable
=
framework
::
GetGlobalScope
()
->
FindVar
(
"feed_value"
);
int
col
=
ctx
.
template
Attr
<
int
>(
"col"
);
const
auto
&
tensors
=
g_feed_variable
->
Get
<
std
::
vector
<
framework
::
Tensor
>>
();
int
col
=
ctx
.
template
Attr
<
int
>(
"col"
);
PADDLE_ENFORCE_GT
(
tensors
.
size
(),
static_cast
<
size_t
>
(
col
));
out
->
CopyFrom
<
T
>
(
tensors
[
col
],
ctx
.
GetPlace
());
}
};
...
...
paddle/operators/fetch_op.cc
浏览文件 @
a308ff29
...
...
@@ -24,26 +24,11 @@ class FetchOp : public framework::OperatorWithKernel {
protected:
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"Input"
),
"Input should be not null."
);
int
col
=
ctx
->
Attrs
().
Get
<
int
>
(
"col"
);
framework
::
Variable
*
g_fetch_variable
=
framework
::
GetGlobalScope
()
->
FindVar
(
"fetch_value"
);
auto
*
tensors
=
g_fetch_variable
->
GetMutable
<
std
::
vector
<
framework
::
Tensor
>>
();
if
(
tensors
->
size
()
<
static_cast
<
size_t
>
(
col
+
1
))
{
tensors
->
resize
(
col
+
1
);
}
auto
input_dim
=
ctx
->
GetInputDim
(
"Input"
);
PADDLE_ENFORCE_GT
(
tensors
->
size
(),
col
);
(
*
tensors
)[
col
].
Resize
(
input_dim
);
// TODO(qijun): need to handle LodTensor later
}
framework
::
DataType
IndicateDataType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
return
static_cast
<
framework
::
DataType
>
(
Attr
<
int
>
(
"data
_t
ype"
));
return
static_cast
<
framework
::
DataType
>
(
Attr
<
int
>
(
"data
T
ype"
));
}
};
...
...
@@ -51,10 +36,9 @@ class FetchOpMaker : public framework::OpProtoAndCheckerMaker {
public:
FetchOpMaker
(
framework
::
OpProto
*
proto
,
framework
::
OpAttrChecker
*
op_checker
)
:
OpProtoAndCheckerMaker
(
proto
,
op_checker
)
{
AddAttr
<
int
>
(
"data
_t
ype"
,
"output data type"
)
AddAttr
<
int
>
(
"data
T
ype"
,
"output data type"
)
.
SetDefault
(
framework
::
DataType
::
FP32
);
AddAttr
<
int
>
(
"col"
,
"The col in global fetch variable"
).
SetDefault
(
0
);
AddAttr
<
std
::
vector
<
int
>>
(
"dims"
,
"The dimension of fetch tensor."
);
AddInput
(
"Input"
,
"The output of fetch op."
);
AddComment
(
R"DOC(Fetch data to global fetch variable)DOC"
);
}
...
...
paddle/operators/fetch_op.h
浏览文件 @
a308ff29
...
...
@@ -24,13 +24,19 @@ class FetchKernel : public framework::OpKernel<T> {
public:
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
const
framework
::
Tensor
*
input
=
ctx
.
Input
<
framework
::
Tensor
>
(
"Input"
);
int
col
=
ctx
.
template
Attr
<
int
>(
"col"
);
framework
::
Variable
*
g_fetch_variable
=
framework
::
GetGlobalScope
()
->
FindVar
(
"fetch_value"
);
auto
*
tensors
=
g_fetch_variable
->
GetMutable
<
std
::
vector
<
framework
::
Tensor
>>
();
int
col
=
ctx
.
template
Attr
<
int
>(
"col"
);
if
(
tensors
->
size
()
<
static_cast
<
size_t
>
(
col
+
1
))
{
tensors
->
resize
(
col
+
1
);
}
PADDLE_ENFORCE_GT
(
tensors
->
size
(),
static_cast
<
size_t
>
(
col
));
(
*
tensors
)[
col
].
Resize
(
input
->
dims
());
(
*
tensors
)[
col
].
mutable_data
<
T
>
(
platform
::
CPUPlace
());
(
*
tensors
)[
col
].
CopyFrom
<
T
>
(
*
input
,
platform
::
CPUPlace
());
// TODO(qijun): need to handle LodTensor later
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录