Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
三 安
Paddle
提交
e621ff39
P
Paddle
项目概览
三 安
/
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,发现更多精彩内容 >>
提交
e621ff39
编写于
10月 10, 2017
作者:
F
fengjiayi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Follow comments
上级
afaac789
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
7 deletion
+29
-7
python/paddle/v2/framework/graph.py
python/paddle/v2/framework/graph.py
+18
-5
python/paddle/v2/framework/tests/test_operator_desc.py
python/paddle/v2/framework/tests/test_operator_desc.py
+11
-2
未找到文件。
python/paddle/v2/framework/graph.py
浏览文件 @
e621ff39
...
...
@@ -142,15 +142,25 @@ class OpProtoHolder(object):
class
Operator
(
object
):
def
__init__
(
self
,
block
,
desc
,
type
,
inputs
=
None
,
outputs
=
None
,
def
__init__
(
self
,
block
,
desc
,
type
=
None
,
inputs
=
None
,
outputs
=
None
,
attrs
=
None
):
self
.
block
=
block
self
.
desc
=
desc
self
.
proto
=
OpProtoHolder
.
instance
().
get_op_proto
(
type
)
if
len
(
self
.
desc
.
type
())
!=
0
:
return
if
type
is
None
:
raise
ValueError
(
"`type` to initilized an Operator can not be None."
)
self
.
desc
.
set_type
(
type
)
proto
=
OpProtoHolder
.
instance
().
get_op_proto
(
type
)
if
inputs
is
not
None
:
for
in_proto
in
self
.
proto
.
inputs
:
for
in_proto
in
proto
.
inputs
:
in_argus
=
inputs
[
in_proto
.
name
]
if
not
isinstance
(
in_argus
,
list
):
in_argus
=
[
in_argus
]
...
...
@@ -164,7 +174,7 @@ class Operator(object):
self
.
desc
.
set_input
(
in_proto
.
name
,
in_argu_names
)
if
outputs
is
not
None
:
for
out_proto
in
self
.
proto
.
outputs
:
for
out_proto
in
proto
.
outputs
:
out_argus
=
outputs
[
out_proto
.
name
]
if
not
isinstance
(
out_argus
,
list
):
out_argus
=
[
out_argus
]
...
...
@@ -175,10 +185,11 @@ class Operator(object):
out_argu_names
=
[]
for
argu
in
out_argus
:
out_argu_names
.
append
(
argu
.
name
)
argu
.
op
=
self
self
.
desc
.
set_output
(
out_proto
.
name
,
out_argu_names
)
if
attrs
is
not
None
:
for
attr
in
self
.
proto
.
attrs
:
for
attr
in
proto
.
attrs
:
attr_name
=
attr
.
name
if
not
attr_name
in
attrs
:
continue
...
...
@@ -187,6 +198,8 @@ class Operator(object):
else
:
self
.
desc
.
set_block_attr
(
attr_name
,
attrs
[
attr_name
].
desc
)
self
.
desc
.
infer_shape
(
self
.
block
.
desc
)
@
property
def
type
(
self
):
return
self
.
desc
.
type
()
...
...
python/paddle/v2/framework/tests/test_operator_desc.py
浏览文件 @
e621ff39
...
...
@@ -6,11 +6,18 @@ 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
()
self
.
assertFail
()
except
ValueError
as
v_err
:
self
.
assertEqual
(
v_err
.
message
,
"`type` to initilized an Operator can not be None."
)
try
:
block
.
append_op
(
type
=
"no_such_op"
)
self
.
assertFail
()
except
AssertionError
as
err
:
self
.
assertEqual
(
err
.
message
,
except
AssertionError
as
a_
err
:
self
.
assertEqual
(
a_
err
.
message
,
"Operator
\"
no_such_op
\"
has not been registered."
)
def
test_op_desc_creation
(
self
):
...
...
@@ -37,6 +44,7 @@ class TestOperator(unittest.TestCase):
self
.
assertEqual
(
mul_op
.
has_attr
(
"x_num_col_dims"
),
True
)
self
.
assertEqual
(
mul_op
.
attr_type
(
"x_num_col_dims"
),
core
.
AttrType
.
INT
)
self
.
assertEqual
(
mul_op
.
attr
(
"x_num_col_dims"
),
1
)
self
.
assertEqual
(
mul_out
.
op
,
mul_op
)
def
test_mult_input
(
self
):
block
=
g_program
.
current_block
()
...
...
@@ -57,6 +65,7 @@ class TestOperator(unittest.TestCase):
self
.
assertEqual
(
sum_op
.
input
(
"X"
),
[
"sum.x1"
,
"sum.x2"
,
"sum.x3"
])
self
.
assertEqual
(
sum_op
.
output_names
,
[
"Out"
])
self
.
assertEqual
(
sum_op
.
output
(
"Out"
),
[
"sum.out"
])
self
.
assertEqual
(
sum_out
.
op
,
sum_op
)
if
__name__
==
'__main__'
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录