Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
a67e8ea3
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a67e8ea3
编写于
10月 08, 2017
作者:
Y
Yang Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add AddOp
上级
005f15b4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
125 addition
and
22 deletion
+125
-22
paddle/framework/executor_test.cc
paddle/framework/executor_test.cc
+125
-22
未找到文件。
paddle/framework/executor_test.cc
浏览文件 @
a67e8ea3
...
...
@@ -16,7 +16,9 @@ limitations under the License. */
#include <vector>
#include "gtest/gtest.h"
#include "paddle/framework/attribute.h"
#include "paddle/framework/block_desc.h"
#include "paddle/framework/grad_op_builder.h"
#include "paddle/framework/op_desc.h"
#include "paddle/framework/op_registry.h"
#include "paddle/framework/operator.h"
...
...
@@ -24,6 +26,7 @@ USE_OP(elementwise_add);
USE_OP
(
gaussian_random
);
USE_OP
(
feed
);
USE_OP
(
fetch
);
USE_OP
(
mul
);
using
std
::
string
;
using
namespace
paddle
::
platform
;
...
...
@@ -32,7 +35,71 @@ using namespace paddle::framework;
typedef
paddle
::
framework
::
BlockDesc
proto_block
;
typedef
paddle
::
framework
::
OpDesc
proto_op
;
void
add_gaussian_random_op
(
string
var_name
,
std
::
vector
<
int
>&
dim
,
struct
SetAttrDescVisitor
:
public
boost
::
static_visitor
<
void
>
{
explicit
SetAttrDescVisitor
(
OpDesc
::
Attr
*
attr
)
:
attr_
(
attr
)
{}
mutable
OpDesc
::
Attr
*
attr_
;
void
operator
()(
int
v
)
const
{
attr_
->
set_i
(
v
);
}
void
operator
()(
float
v
)
const
{
attr_
->
set_f
(
v
);
}
void
operator
()(
const
std
::
string
&
v
)
const
{
attr_
->
set_s
(
v
);
}
void
operator
()(
bool
b
)
const
{
attr_
->
set_b
(
b
);
}
void
operator
()(
const
std
::
vector
<
int
>&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_ints
());
}
void
operator
()(
const
std
::
vector
<
float
>&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_floats
());
}
void
operator
()(
const
std
::
vector
<
std
::
string
>&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_strings
());
}
void
operator
()(
const
std
::
vector
<
bool
>&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_bools
());
}
void
operator
()(
BlockDesc
*
desc
)
const
{
attr_
->
set_block_idx
(
desc
->
idx
());
}
void
operator
()(
boost
::
blank
)
const
{
PADDLE_THROW
(
"Unexpected branch"
);
}
};
void
AddOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
AttributeMap
attrs
,
proto_block
*
block
)
{
// insert output
for
(
auto
kv
:
outputs
)
{
for
(
auto
v
:
kv
.
second
)
{
auto
var
=
block
->
add_vars
();
var
->
set_name
(
v
);
auto
var_lt
=
var
->
mutable_lod_tensor
();
var_lt
->
set_data_type
(
paddle
::
framework
::
DataType
::
FP32
);
}
}
// insert op
auto
op
=
block
->
add_ops
();
op
->
set_type
(
type
);
for
(
auto
kv
:
inputs
)
{
auto
X
=
op
->
add_inputs
();
X
->
set_parameter
(
kv
.
first
);
for
(
auto
argu
:
kv
.
second
)
{
X
->
add_arguments
(
argu
);
}
}
for
(
auto
kv
:
outputs
)
{
auto
X
=
op
->
add_outputs
();
X
->
set_parameter
(
kv
.
first
);
for
(
auto
argu
:
kv
.
second
)
{
X
->
add_arguments
(
argu
);
}
}
for
(
auto
&
attr
:
attrs
)
{
auto
*
attr_desc
=
op
->
add_attrs
();
attr_desc
->
set_name
(
attr
.
first
);
attr_desc
->
set_type
(
static_cast
<
paddle
::
framework
::
AttrType
>
(
attr
.
second
.
which
()
-
1
));
SetAttrDescVisitor
visitor
(
attr_desc
);
boost
::
apply_visitor
(
visitor
,
attr
.
second
);
}
}
void
add_gaussian_random_op
(
string
var_name
,
std
::
vector
<
int
>
dim
,
proto_block
*
block
)
{
// insert variable
auto
a
=
block
->
add_vars
();
...
...
@@ -91,7 +158,7 @@ void add_feed_op(string var_name, std::vector<int>& dim, int index,
Out
->
add_arguments
(
var_name
);
}
void
add_fetch_op
(
string
var_name
,
std
::
vector
<
int
>
&
dim
,
int
index
,
void
add_fetch_op
(
string
var_name
,
std
::
vector
<
int
>
dim
,
int
index
,
proto_block
*
block
)
{
// insert variable
auto
a
=
block
->
add_vars
();
...
...
@@ -125,6 +192,28 @@ void add_fetch_op(string var_name, std::vector<int>& dim, int index,
Out
->
add_arguments
(
var_name
);
}
void
add_mul_op
(
string
X_str
,
string
Y_str
,
string
Out_str
,
proto_block
*
block
)
{
// insert variable
auto
a
=
block
->
add_vars
();
a
->
set_name
(
Out_str
);
auto
a_lt
=
a
->
mutable_lod_tensor
();
a_lt
->
set_data_type
(
paddle
::
framework
::
DataType
::
FP32
);
// insert op
auto
op
=
block
->
add_ops
();
op
->
set_type
(
"mul"
);
auto
X
=
op
->
add_inputs
();
X
->
set_parameter
(
"X"
);
X
->
add_arguments
(
X_str
);
auto
Y
=
op
->
add_inputs
();
Y
->
set_parameter
(
"Y"
);
Y
->
add_arguments
(
Y_str
);
auto
Out
=
op
->
add_outputs
();
Out
->
set_parameter
(
"Out"
);
Out
->
add_arguments
(
Out_str
);
}
std
::
once_flag
set_variable_flag
;
// Tensors in feed value variable will only be in CPUPlace
...
...
@@ -168,36 +257,37 @@ std::vector<std::vector<T>> get_fetch_variable() {
class
ExecutorTesterRandom
:
public
::
testing
::
Test
{
public:
virtual
void
SetUp
()
override
{
int
input_dim
=
5
,
batch_size
=
2
,
embed_dim
=
5
;
// init pdesc
auto
init_root_block
=
init_pdesc_
.
add_blocks
();
init_root_block
->
set_idx
(
0
);
init_root_block
->
set_parent_idx
(
-
1
);
AddOp
(
"gaussian_random"
,
{},
{{
"Out"
,
{
"w1"
}}},
{{
"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
}}},
init_root_block
);
AddOp
(
"fetch"
,
{{
"Input"
,
{
"w2"
}}},
{},
{{
"dims"
,
std
::
vector
<
int
>
{
embed_dim
,
input_dim
}}},
init_root_block
);
// run pdesc
auto
root_block
=
pdesc_
.
add_blocks
();
root_block
->
set_idx
(
0
);
root_block
->
set_parent_idx
(
-
1
);
std
::
vector
<
int
>
dim
{
2
,
3
};
add_gaussian_random_op
(
"a"
,
dim
,
root_block
);
add_gaussian_random_op
(
"b"
,
dim
,
root_block
);
add_gaussian_random_op
(
"a"
,
{
batch_size
,
input_dim
},
root_block
);
auto
c
=
root_block
->
add_vars
();
c
->
set_name
(
"c"
);
auto
c_lt
=
c
->
mutable_lod_tensor
();
c_lt
->
set_data_type
(
paddle
::
framework
::
DataType
::
FP32
);
add_mul_op
(
"a"
,
"w1"
,
"b"
,
root_block
);
add_mul_op
(
"b"
,
"w2"
,
"a_out"
,
root_block
);
auto
op
=
root_block
->
add_ops
();
op
->
set_type
(
"elementwise_add"
);
auto
X
=
op
->
add_inputs
();
X
->
set_parameter
(
"X"
);
X
->
add_arguments
(
"a"
);
auto
Y
=
op
->
add_inputs
();
Y
->
set_parameter
(
"Y"
);
Y
->
add_arguments
(
"b"
);
auto
Out
=
op
->
add_outputs
();
Out
->
set_parameter
(
"Out"
);
Out
->
add_arguments
(
"c"
);
add_fetch_op
(
"c"
,
dim
,
0
,
root_block
);
add_fetch_op
(
"a_out"
,
{
input_dim
,
batch_size
},
0
,
root_block
);
}
protected:
ProgramDesc
pdesc_
;
ProgramDesc
init_pdesc_
;
};
class
ExecutorTesterFeedAndFetch
:
public
::
testing
::
Test
{
...
...
@@ -238,6 +328,7 @@ TEST_F(ExecutorTesterRandom, CPU) {
paddle
::
memory
::
Used
(
cpu_place
);
Executor
*
executor
=
new
Executor
(
places
);
executor
->
Run
(
init_pdesc_
,
GetGlobalScope
());
executor
->
Run
(
pdesc_
,
GetGlobalScope
());
std
::
vector
<
std
::
vector
<
float
>>
result
=
get_fetch_variable
<
float
>
();
...
...
@@ -295,7 +386,19 @@ TEST_F(ExecutorTesterRandom, GPU) {
paddle
::
memory
::
Used
(
gpu_place
);
Executor
*
executor
=
new
Executor
(
places
);
LOG
(
INFO
)
<<
"Run Init"
;
executor
->
Run
(
init_pdesc_
,
GetGlobalScope
());
LOG
(
INFO
)
<<
"Run"
;
executor
->
Run
(
pdesc_
,
GetGlobalScope
());
std
::
vector
<
std
::
vector
<
float
>>
result
=
get_fetch_variable
<
float
>
();
for
(
auto
&
vec
:
result
)
{
for
(
auto
&
num
:
vec
)
{
std
::
cout
<<
num
<<
" "
;
}
std
::
cout
<<
std
::
endl
;
}
delete
executor
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录