Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
f40988af
P
Paddle
项目概览
机器未来
/
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看板
提交
f40988af
编写于
8月 11, 2017
作者:
Y
Yi Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correct the use of protobuf generated methods
上级
38f4b1d5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
13 deletion
+11
-13
paddle/framework/op_registry.h
paddle/framework/op_registry.h
+11
-13
未找到文件。
paddle/framework/op_registry.h
浏览文件 @
f40988af
...
@@ -69,18 +69,18 @@ class OpProtoAndCheckerMaker {
...
@@ -69,18 +69,18 @@ class OpProtoAndCheckerMaker {
VariableBuilder
AddInput
(
const
std
::
string
&
name
,
VariableBuilder
AddInput
(
const
std
::
string
&
name
,
const
std
::
string
&
comment
)
{
const
std
::
string
&
comment
)
{
auto
input
=
proto_
->
mutable_inputs
()
->
Add
();
VarProto
*
input
=
proto_
->
add_inputs
();
*
input
->
mutable_name
()
=
name
;
input
->
set_name
(
name
)
;
*
input
->
mutable_comment
()
=
comment
;
input
->
set_comment
(
comment
)
;
return
VariableBuilder
{
input
,
[
=
]
{
this
->
SetHasMultipleInput
();
},
return
VariableBuilder
{
input
,
[
=
]
{
this
->
SetHasMultipleInput
();
},
nullptr
};
nullptr
};
}
}
VariableBuilder
AddOutput
(
const
std
::
string
&
name
,
VariableBuilder
AddOutput
(
const
std
::
string
&
name
,
const
std
::
string
&
comment
)
{
const
std
::
string
&
comment
)
{
auto
output
=
proto_
->
mutable_outputs
()
->
Add
();
VarProto
*
output
=
proto_
->
add_outputs
();
*
output
->
mutable_name
()
=
name
;
output
->
set_name
(
name
)
;
*
output
->
mutable_comment
()
=
comment
;
output
->
set_comment
(
comment
)
;
return
VariableBuilder
{
output
,
[
=
]
{
this
->
SetHasMultipleOutput
();
},
return
VariableBuilder
{
output
,
[
=
]
{
this
->
SetHasMultipleOutput
();
},
[
=
]
{
this
->
SetHasTemporaryOutput
();
}};
[
=
]
{
this
->
SetHasTemporaryOutput
();
}};
}
}
...
@@ -89,17 +89,15 @@ class OpProtoAndCheckerMaker {
...
@@ -89,17 +89,15 @@ class OpProtoAndCheckerMaker {
TypedAttrChecker
<
T
>&
AddAttr
(
const
std
::
string
&
name
,
TypedAttrChecker
<
T
>&
AddAttr
(
const
std
::
string
&
name
,
const
std
::
string
&
comment
,
const
std
::
string
&
comment
,
bool
generated
=
false
)
{
bool
generated
=
false
)
{
auto
attr
=
proto_
->
mutable_attrs
()
->
Add
();
AttrProto
*
attr
=
proto_
->
add_attrs
();
*
attr
->
mutable_name
()
=
name
;
attr
->
set_name
(
name
)
;
*
attr
->
mutable_comment
()
=
comment
;
attr
->
set_comment
(
comment
)
;
attr
->
set_generated
(
generated
);
attr
->
set_generated
(
generated
);
attr
->
set_type
(
AttrTypeID
<
T
>
());
attr
->
set_type
(
AttrTypeID
<
T
>
());
return
op_checker_
->
AddAttrChecker
<
T
>
(
name
);
return
op_checker_
->
AddAttrChecker
<
T
>
(
name
);
}
}
void
AddComment
(
const
std
::
string
&
comment
)
{
void
AddComment
(
const
std
::
string
&
comment
)
{
proto_
->
set_comment
(
comment
);
}
*
(
proto_
->
mutable_comment
())
=
comment
;
}
private:
private:
void
SetHasMultiple
(
const
std
::
string
&
in_out
,
bool
*
flag
)
{
void
SetHasMultiple
(
const
std
::
string
&
in_out
,
bool
*
flag
)
{
...
@@ -187,7 +185,7 @@ class OpRegistry {
...
@@ -187,7 +185,7 @@ class OpRegistry {
OpProto
&
op_proto
=
protos
()[
op_type
];
OpProto
&
op_proto
=
protos
()[
op_type
];
auto
maker
=
ProtoMakerType
(
&
op_proto
,
&
op_checker
);
auto
maker
=
ProtoMakerType
(
&
op_proto
,
&
op_checker
);
maker
.
Validate
();
maker
.
Validate
();
*
op_proto
.
mutable_type
()
=
op_type
;
op_proto
.
set_type
(
op_type
)
;
PADDLE_ENFORCE
(
PADDLE_ENFORCE
(
op_proto
.
IsInitialized
(),
op_proto
.
IsInitialized
(),
"Fail to initialize %s's OpProto, because %s is not initialized"
,
"Fail to initialize %s's OpProto, because %s is not initialized"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录