Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
247fb2a0
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
12 个月 前同步成功
通知
692
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
247fb2a0
编写于
10月 10, 2017
作者:
F
fengjiayi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add unittests
上级
cffca923
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
98 addition
and
7 deletion
+98
-7
paddle/framework/block_desc.cc
paddle/framework/block_desc.cc
+0
-4
paddle/framework/op_desc.cc
paddle/framework/op_desc.cc
+5
-0
paddle/pybind/protobuf.cc
paddle/pybind/protobuf.cc
+1
-1
python/paddle/v2/framework/graph.py
python/paddle/v2/framework/graph.py
+34
-2
python/paddle/v2/framework/tests/test_operator_desc.py
python/paddle/v2/framework/tests/test_operator_desc.py
+58
-0
未找到文件。
paddle/framework/block_desc.cc
浏览文件 @
247fb2a0
...
...
@@ -91,9 +91,5 @@ BlockDescBind *BlockDescBind::ParentBlock() const {
return
prog_
->
Block
(
static_cast
<
size_t
>
(
this
->
desc_
->
parent_idx
()));
}
void
OpDescBind
::
SetBlockAttr
(
const
std
::
string
&
name
,
BlockDescBind
&
block
)
{
BlockDesc
*
desc
=
block
.
RawPtr
();
this
->
attrs_
[
name
]
=
desc
;
}
}
// namespace framework
}
// namespace paddle
paddle/framework/op_desc.cc
浏览文件 @
247fb2a0
...
...
@@ -97,6 +97,11 @@ void OpDescBind::SetAttr(const std::string &name, const Attribute &v) {
need_update_
=
true
;
}
void
OpDescBind
::
SetBlockAttr
(
const
std
::
string
&
name
,
BlockDescBind
&
block
)
{
BlockDesc
*
desc
=
block
.
RawPtr
();
this
->
attrs_
[
name
]
=
desc
;
}
void
OpDescBind
::
SetAttrMap
(
const
std
::
unordered_map
<
std
::
string
,
Attribute
>
&
attr_map
)
{
attrs_
=
attr_map
;
...
...
paddle/pybind/protobuf.cc
浏览文件 @
247fb2a0
...
...
@@ -196,7 +196,7 @@ void BindOpDesc(py::module &m) {
.
def
(
"set_attr"
,
&
OpDescBind
::
SetAttr
)
.
def
(
"attr"
,
&
OpDescBind
::
GetAttr
)
.
def
(
"set_block_attr"
,
&
OpDescBind
::
SetBlockAttr
)
.
def
(
"
get_
block_attr"
,
&
OpDescBind
::
GetBlockAttr
);
.
def
(
"block_attr"
,
&
OpDescBind
::
GetBlockAttr
);
}
}
// namespace pybind
...
...
python/paddle/v2/framework/graph.py
浏览文件 @
247fb2a0
...
...
@@ -32,7 +32,7 @@ class OpProtoHolder(object):
op_protos
=
get_all_op_protos
()
self
.
op_proto_map
=
{}
for
proto
in
op_protos
:
se
fl
.
op_proto_map
[
proto
.
type
]
=
proto
se
lf
.
op_proto_map
[
proto
.
type
]
=
proto
def
get_op_proto
(
self
,
type
):
assert
type
in
self
.
op_proto_map
,
"Operator with type
\"
%s
\"
has not been registered."
%
type
...
...
@@ -116,7 +116,39 @@ class Operator(object):
else
:
self
.
desc
.
set_block_attr
(
attr_name
,
attrs
[
attr_name
].
desc
)
# TODO: Getters
@
property
def
type
(
self
):
return
self
.
desc
.
type
()
def
input
(
self
,
name
):
return
self
.
desc
.
input
(
name
)
@
property
def
input_names
(
self
):
return
self
.
desc
.
input_names
()
def
output
(
self
,
name
):
return
self
.
desc
.
output
(
name
)
@
property
def
output_names
(
self
):
return
self
.
desc
.
output_names
()
def
has_attr
(
self
,
name
):
return
self
.
desc
.
has_attr
(
name
)
def
attr_type
(
self
,
name
):
return
self
.
desc
.
attr_type
(
name
)
@
property
def
attr_names
(
self
):
return
self
.
desc
.
attr_names
()
def
attr
(
self
,
name
):
return
self
.
desc
.
attr
(
name
)
def
block_attr
(
self
,
name
):
return
self
.
desc
.
block_attr
(
name
)
class
Block
(
object
):
...
...
python/paddle/v2/framework/tests/test_operator_desc.py
0 → 100644
浏览文件 @
247fb2a0
import
unittest
from
paddle.v2.framework.graph
import
Variable
,
g_program
import
paddle.v2.framework.core
as
core
class
TestOperator
(
unittest
.
TestCase
):
def
test_error_type
(
self
):
block
=
g_program
.
create_block
()
try
:
block
.
append_op
(
type
=
"no_such_op"
)
self
.
assertFail
()
except
AssertionError
as
err
:
self
.
assertEqual
(
err
.
message
,
"Operator with type
\"
no_such_op
\"
has not been registered."
)
def
test_input_output
(
self
):
block
=
g_program
.
current_block
()
mul_x
=
block
.
create_var
(
dtype
=
"float32"
,
shape
=
[
5
,
10
],
lod_level
=
0
,
name
=
"mul.x"
)
mul_y
=
block
.
create_var
(
dtype
=
"float32"
,
shape
=
[
10
,
8
],
lod_level
=
0
,
name
=
"mul.y"
)
mul_out
=
block
.
create_var
(
dtype
=
"float32"
,
shape
=
[
5
,
8
],
lod_level
=
0
,
name
=
"mul.out"
)
mul_op
=
block
.
append_op
(
type
=
"mul"
,
inputs
=
{
"X"
:
[
mul_x
],
"Y"
:
mul_y
},
outputs
=
{
"Out"
:
[
mul_out
]})
self
.
assertEqual
(
mul_op
.
type
,
"mul"
)
self
.
assertEqual
(
mul_op
.
input_names
,
[
"X"
,
"Y"
])
self
.
assertEqual
(
mul_op
.
input
(
"X"
),
[
"x"
])
self
.
assertEqual
(
mul_op
.
output_names
,
[
"Out"
])
self
.
assertEqual
(
mul_op
.
output
(
"Out"
),
[
"out"
])
def
test_mult_input
(
self
):
block
=
g_program
.
current_block
()
sum_x1
=
block
.
create_var
(
dtype
=
"int"
,
shape
=
[
3
,
4
],
lod_level
=
0
,
name
=
"sum.x1"
)
sum_x2
=
block
.
create_var
(
dtype
=
"int"
,
shape
=
[
3
,
4
],
lod_level
=
0
,
name
=
"sum.x2"
)
sum_x3
=
block
.
create_var
(
dtype
=
"int"
,
shape
=
[
3
,
4
],
lod_level
=
0
,
name
=
"sum.x3"
)
sum_out
=
block
.
create_var
(
dtype
=
"int"
,
shape
=
[
3
,
4
],
lod_level
=
0
,
name
=
"sum.out"
)
sum_op
=
block
.
append_op
(
type
=
"sum"
,
inputs
=
{
"X"
:
[
sum_x1
,
sum_x2
,
sum_x3
]},
outputs
=
{
"Out"
:
sum_out
})
self
.
assertEqual
(
sum_op
.
type
,
"sum"
)
self
.
assertEqual
(
sum_op
.
input_names
,
[
"X"
])
self
.
assertEqual
(
sum_op
.
input
(
"X"
),
[
"x1"
,
"x2"
,
"x3"
])
self
.
assertEqual
(
sum_op
.
output_names
,
[
"Out"
])
self
.
assertEqual
(
sum_op
.
output
(
"Out"
),
[
"out"
])
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录