Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
3f9e247a
P
Paddle
项目概览
wmsofts
/
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,发现更多精彩内容 >>
提交
3f9e247a
编写于
10月 10, 2017
作者:
Y
Yang Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
set variable support dim
上级
a308ff29
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
10 deletion
+23
-10
paddle/framework/executor.cc
paddle/framework/executor.cc
+1
-2
paddle/framework/executor_test.cc
paddle/framework/executor_test.cc
+22
-8
未找到文件。
paddle/framework/executor.cc
浏览文件 @
3f9e247a
...
...
@@ -74,8 +74,7 @@ void Executor::Run(const ProgramDesc& pdesc, Scope* scope, int block_id) {
std
::
vector
<
bool
>
should_run
=
Prune
(
pdesc
,
block_id
);
PADDLE_ENFORCE_EQ
(
should_run
.
size
(),
block
.
ops_size
());
for
(
size_t
i
=
0
;
i
<
should_run
.
size
();
++
i
)
{
// if (should_run[i]) {
if
(
true
)
{
if
(
should_run
[
i
])
{
for
(
auto
&
var
:
block
.
ops
(
i
).
outputs
())
{
for
(
auto
&
argu
:
var
.
arguments
())
{
if
(
local_scope
.
FindVar
(
argu
)
==
nullptr
)
{
...
...
paddle/framework/executor_test.cc
浏览文件 @
3f9e247a
...
...
@@ -65,15 +65,15 @@ void AddOp(const std::string& type, const VariableNameMap& inputs,
// Tensors in feed value variable will only be in CPUPlace
// So we can memcpy the data from vector<T> to feed_value
template
<
typename
T
>
void
SetFeedVariable
(
const
std
::
vector
<
std
::
vector
<
T
>>&
inputs
)
{
void
SetFeedVariable
(
const
std
::
vector
<
std
::
vector
<
T
>>&
inputs
,
const
std
::
vector
<
std
::
vector
<
int64_t
>>&
dims
)
{
Variable
*
g_feed_value
=
GetGlobalScope
()
->
FindVar
(
"feed_value"
);
auto
&
feed_inputs
=
*
(
g_feed_value
->
GetMutable
<
std
::
vector
<
paddle
::
framework
::
Tensor
>>
());
size_t
size
=
inputs
.
size
();
feed_inputs
.
resize
(
size
);
for
(
size_t
i
=
0
;
i
<
size
;
i
++
)
{
T
*
dst
=
feed_inputs
[
i
].
mutable_data
<
T
>
(
make_ddim
({
static_cast
<
int64_t
>
(
inputs
[
i
].
size
())}),
CPUPlace
());
T
*
dst
=
feed_inputs
[
i
].
mutable_data
<
T
>
(
make_ddim
(
dims
[
i
]),
CPUPlace
());
memcpy
(
dst
,
inputs
[
i
].
data
(),
inputs
[
i
].
size
()
*
sizeof
(
T
));
}
}
...
...
@@ -103,7 +103,7 @@ std::vector<std::vector<T>> GetFetchVariable() {
class
ExecutorTesterRandom
:
public
::
testing
::
Test
{
public:
virtual
void
SetUp
()
override
{
int
input_dim
=
5
,
batch_size
=
2
,
embed_dim
=
5
;
int
input_dim
=
3
,
batch_size
=
2
,
embed_dim
=
5
;
auto
temp_init_root_block
=
init_pdesc_
.
add_blocks
();
temp_init_root_block
->
set_idx
(
0
);
...
...
@@ -130,9 +130,16 @@ class ExecutorTesterRandom : public ::testing::Test {
paddle
::
framework
::
ProgramDescBind
::
Instance
(
&
pdesc_
);
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
});
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("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"
}}},
{},
...
...
@@ -161,6 +168,7 @@ class ExecutorTesterRandom : public ::testing::Test {
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w1"
}}},
{},
{{
"col"
,
0
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w2"
}}},
{},
{{
"col"
,
1
}},
root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"l2_distance"
}}},
{},
{{
"col"
,
0
}},
root_block
);
// flush
program
.
Proto
();
...
...
@@ -169,6 +177,8 @@ class ExecutorTesterRandom : public ::testing::Test {
protected:
ProgramDesc
init_pdesc_
;
ProgramDesc
pdesc_
;
std
::
vector
<
std
::
vector
<
float
>>
inputs_
;
std
::
vector
<
std
::
vector
<
int64_t
>>
dims_
;
};
class
ExecutorTesterFeedAndFetch
:
public
::
testing
::
Test
{
...
...
@@ -199,11 +209,14 @@ class ExecutorTesterFeedAndFetch : public ::testing::Test {
std
::
vector
<
float
>
vec2
=
{
4.0
,
5.0
,
6.0
,
7.0
,
8.0
,
9.0
};
inputs_
.
push_back
(
vec1
);
inputs_
.
push_back
(
vec2
);
dims_
.
push_back
({
static_cast
<
int64_t
>
(
vec1
.
size
())});
dims_
.
push_back
({
static_cast
<
int64_t
>
(
vec2
.
size
())});
}
protected:
ProgramDesc
pdesc_
;
std
::
vector
<
std
::
vector
<
float
>>
inputs_
;
std
::
vector
<
std
::
vector
<
int64_t
>>
dims_
;
};
#ifndef PADDLE_WITH_CUDA
...
...
@@ -239,7 +252,7 @@ TEST_F(ExecutorTesterFeedAndFetch, CPU) {
std
::
unique_ptr
<
Executor
>
executor
(
new
Executor
(
places
));
for
(
int
batch_id
=
0
;
batch_id
<
3
;
batch_id
++
)
{
SetFeedVariable
<
float
>
(
inputs_
);
SetFeedVariable
<
float
>
(
inputs_
,
dims_
);
executor
->
Run
(
pdesc_
,
GetGlobalScope
(),
0
);
std
::
vector
<
std
::
vector
<
float
>>
result
=
GetFetchVariable
<
float
>
();
PADDLE_ENFORCE_EQ
(
result
.
size
(),
inputs_
.
size
());
...
...
@@ -270,6 +283,7 @@ TEST_F(ExecutorTesterRandom, GPU) {
executor
->
Run
(
init_pdesc_
,
GetGlobalScope
(),
0
);
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
>
();
}
...
...
@@ -291,7 +305,7 @@ TEST_F(ExecutorTesterFeedAndFetch, GPU) {
std
::
unique_ptr
<
Executor
>
executor
(
new
Executor
(
places
));
for
(
int
batch_id
=
0
;
batch_id
<
3
;
batch_id
++
)
{
SetFeedVariable
<
float
>
(
inputs_
);
SetFeedVariable
<
float
>
(
inputs_
,
dims_
);
executor
->
Run
(
pdesc_
,
GetGlobalScope
(),
0
);
std
::
vector
<
std
::
vector
<
float
>>
result
=
GetFetchVariable
<
float
>
();
PADDLE_ENFORCE_EQ
(
result
.
size
(),
inputs_
.
size
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录