Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
skywalk8163
Paddle
提交
062ff4d7
P
Paddle
项目概览
skywalk8163
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
062ff4d7
编写于
10月 10, 2017
作者:
Y
Yang Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clean up
上级
293a7d1e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
18 deletion
+4
-18
paddle/framework/executor.cc
paddle/framework/executor.cc
+1
-13
paddle/framework/executor_test.cc
paddle/framework/executor_test.cc
+3
-5
未找到文件。
paddle/framework/executor.cc
浏览文件 @
062ff4d7
...
...
@@ -72,7 +72,7 @@ void Executor::Run(const ProgramDesc& pdesc, Scope* scope, int block_id) {
Scope
&
local_scope
=
scope
->
NewScope
();
std
::
vector
<
bool
>
should_run
=
Prune
(
pdesc
,
block_id
);
PADDLE_ENFORCE_EQ
(
should_run
.
size
(),
block
.
ops_size
(
));
PADDLE_ENFORCE_EQ
(
should_run
.
size
(),
static_cast
<
size_t
>
(
block
.
ops_size
()
));
for
(
size_t
i
=
0
;
i
<
should_run
.
size
();
++
i
)
{
if
(
should_run
[
i
])
{
for
(
auto
&
var
:
block
.
ops
(
i
).
outputs
())
{
...
...
@@ -82,17 +82,7 @@ void Executor::Run(const ProgramDesc& pdesc, Scope* scope, int block_id) {
}
}
}
LOG
(
INFO
)
<<
block
.
ops
(
i
).
type
();
if
(
block
.
ops
(
i
).
type
()
==
"sum"
)
{
LOG
(
INFO
)
<<
"Here"
;
for
(
auto
&
var
:
block
.
ops
(
i
).
inputs
())
{
for
(
auto
&
argu
:
var
.
arguments
())
{
LOG
(
INFO
)
<<
var
.
parameter
()
<<
" "
<<
argu
;
}
}
}
auto
op
=
paddle
::
framework
::
OpRegistry
::
CreateOp
(
block
.
ops
(
i
));
LOG
(
INFO
)
<<
op
->
DebugString
();
op
->
Run
(
local_scope
,
*
device
);
}
}
...
...
@@ -152,10 +142,8 @@ std::vector<bool> Executor::Prune(const ProgramDesc& pdesc, int block_id) {
}
}
LOG
(
INFO
)
<<
"1 "
<<
op_desc
.
type
();
should_run
.
push_back
(
true
);
}
else
{
LOG
(
INFO
)
<<
"0 "
<<
op_desc
.
type
();
should_run
.
push_back
(
false
);
}
}
...
...
paddle/framework/executor_test.cc
浏览文件 @
062ff4d7
...
...
@@ -131,15 +131,13 @@ class ExecutorTesterRandom : public ::testing::Test {
paddle
::
framework
::
BlockDescBind
*
root_block
=
program
.
Block
(
0
);
// feed data
inputs_
.
push_back
({
1.0
,
2.0
,
3.0
,
4.0
,
5.0
,
6
.0
});
inputs_
.
push_back
({
1.0
,
1.0
,
1.0
,
1.0
,
1.0
,
1
.0
});
dims_
.
push_back
({
batch_size
,
input_dim
});
AddOp
(
"feed"
,
{},
{{
"Out"
,
{
"a"
}}},
{{
"dims"
,
std
::
vector
<
int
>
{
batch_size
,
input_dim
}},
{
"col"
,
0
}},
root_block
);
// forward
// AddOp("gaussian_random", {}, {{"Out", {"a"}}},
// {{"dims", std::vector<int>{batch_size, input_dim}}}, root_block);
AddOp
(
"mul"
,
{{
"X"
,
{
"a"
}},
{
"Y"
,
{
"w1"
}}},
{{
"Out"
,
{
"b"
}}},
{},
root_block
);
AddOp
(
"mul"
,
{{
"X"
,
{
"b"
}},
{
"Y"
,
{
"w2"
}}},
{{
"Out"
,
{
"a_out"
}}},
{},
...
...
@@ -156,7 +154,8 @@ class ExecutorTesterRandom : public ::testing::Test {
// update
AddOp
(
"fill_constant"
,
{},
{{
"Out"
,
{
"learning_rate"
}}},
{{
"shape"
,
std
::
vector
<
int
>
{
1
}},
{
"value"
,
float
(
1.0
)}},
root_block
);
{{
"shape"
,
std
::
vector
<
int
>
{
1
}},
{
"value"
,
float
(
0.001
)}},
root_block
);
AddOp
(
"sgd"
,
{{
"Param"
,
{
"w1"
}},
{
"LearningRate"
,
{
"learning_rate"
}},
{
"Grad"
,
{
"w1@GRAD"
}}},
...
...
@@ -285,7 +284,6 @@ TEST_F(ExecutorTesterRandom, GPU) {
for
(
int
batch_id
=
0
;
batch_id
<
3
;
batch_id
++
)
{
SetFeedVariable
<
float
>
(
inputs_
,
dims_
);
executor
->
Run
(
pdesc_
,
GetGlobalScope
(),
0
);
std
::
vector
<
std
::
vector
<
float
>>
result
=
GetFetchVariable
<
float
>
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录