Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
fd8df080
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看板
提交
fd8df080
编写于
9月 02, 2017
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make operator Input/Output can return nullptr
上级
fc8a1afa
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
32 deletion
+50
-32
paddle/framework/operator.cc
paddle/framework/operator.cc
+22
-10
paddle/framework/operator.h
paddle/framework/operator.h
+28
-22
未找到文件。
paddle/framework/operator.cc
浏览文件 @
fd8df080
...
@@ -33,12 +33,18 @@ ExecutionContext::GetEigenDevice<platform::GPUPlace, Eigen::GpuDevice>() const {
...
@@ -33,12 +33,18 @@ ExecutionContext::GetEigenDevice<platform::GPUPlace, Eigen::GpuDevice>() const {
}
}
#endif
#endif
const
std
::
string
&
OperatorBase
::
Input
(
const
std
::
string
&
name
)
const
{
std
::
string
OperatorBase
::
Input
(
const
std
::
string
&
name
)
const
{
auto
&
ins
=
Inputs
(
name
);
auto
&
ins
=
Inputs
(
name
);
PADDLE_ENFORCE_EQ
(
ins
.
size
(),
1UL
,
switch
(
ins
.
size
())
{
"Op %s input %s should contain only one variable"
,
type_
,
case
0
:
name
);
return
kEmptyVarName
;
return
ins
[
0
];
case
1
:
return
ins
[
0
];
default:
PADDLE_THROW
(
"Op %s input %s should contain only one variable"
,
type_
,
name
);
return
""
;
}
}
}
const
std
::
vector
<
std
::
string
>&
OperatorBase
::
Inputs
(
const
std
::
vector
<
std
::
string
>&
OperatorBase
::
Inputs
(
...
@@ -49,12 +55,18 @@ const std::vector<std::string>& OperatorBase::Inputs(
...
@@ -49,12 +55,18 @@ const std::vector<std::string>& OperatorBase::Inputs(
return
it
->
second
;
return
it
->
second
;
}
}
const
std
::
string
&
OperatorBase
::
Output
(
const
std
::
string
&
name
)
const
{
std
::
string
OperatorBase
::
Output
(
const
std
::
string
&
name
)
const
{
auto
&
outs
=
Outputs
(
name
);
auto
&
outs
=
Outputs
(
name
);
PADDLE_ENFORCE_EQ
(
outs
.
size
(),
1UL
,
switch
(
outs
.
size
())
{
"Op %s output %s should contain only one variable"
,
type_
,
case
0
:
name
);
return
kEmptyVarName
;
return
outs
[
0
];
case
1
:
return
outs
[
0
];
default:
PADDLE_THROW
(
"Op %s output %s should contain only one variable"
,
type_
,
name
);
return
""
;
}
}
}
const
std
::
vector
<
std
::
string
>&
OperatorBase
::
Outputs
(
const
std
::
vector
<
std
::
string
>&
OperatorBase
::
Outputs
(
...
...
paddle/framework/operator.h
浏览文件 @
fd8df080
...
@@ -95,12 +95,12 @@ class OperatorBase {
...
@@ -95,12 +95,12 @@ class OperatorBase {
const
VariableNameMap
&
Inputs
()
const
{
return
inputs_
;
}
const
VariableNameMap
&
Inputs
()
const
{
return
inputs_
;
}
const
VariableNameMap
&
Outputs
()
const
{
return
outputs_
;
}
const
VariableNameMap
&
Outputs
()
const
{
return
outputs_
;
}
//! Get a input with argument's name described in `op_proto`
//! Get a input with argument's name described in `op_proto`
const
std
::
string
&
Input
(
const
std
::
string
&
name
)
const
;
std
::
string
Input
(
const
std
::
string
&
name
)
const
;
//! Get a input which has multiple variables.
//! Get a input which has multiple variables.
const
std
::
vector
<
std
::
string
>&
Inputs
(
const
std
::
string
&
name
)
const
;
const
std
::
vector
<
std
::
string
>&
Inputs
(
const
std
::
string
&
name
)
const
;
//! Get a output with argument's name described in `op_proto`
//! Get a output with argument's name described in `op_proto`
const
std
::
string
&
Output
(
const
std
::
string
&
name
)
const
;
std
::
string
Output
(
const
std
::
string
&
name
)
const
;
//! Get an output which has multiple variables.
//! Get an output which has multiple variables.
//! TODO add a vector_view to prevent memory copy.
//! TODO add a vector_view to prevent memory copy.
const
std
::
vector
<
std
::
string
>&
Outputs
(
const
std
::
string
&
name
)
const
;
const
std
::
vector
<
std
::
string
>&
Outputs
(
const
std
::
string
&
name
)
const
;
...
@@ -238,11 +238,21 @@ class InferShapeContext {
...
@@ -238,11 +238,21 @@ class InferShapeContext {
}
}
const
Variable
*
InputVar
(
const
std
::
string
&
name
)
const
{
const
Variable
*
InputVar
(
const
std
::
string
&
name
)
const
{
return
scope_
.
FindVar
(
op_
.
Input
(
name
));
auto
ipt
=
op_
.
Input
(
name
);
if
(
ipt
==
kEmptyVarName
)
{
return
nullptr
;
}
else
{
return
scope_
.
FindVar
(
ipt
);
}
}
}
Variable
*
OutputVar
(
const
std
::
string
&
name
)
const
{
Variable
*
OutputVar
(
const
std
::
string
&
name
)
const
{
return
scope_
.
FindVar
(
op_
.
Output
(
name
));
auto
opt
=
op_
.
Output
(
name
);
if
(
opt
==
kEmptyVarName
)
{
return
nullptr
;
}
else
{
return
scope_
.
FindVar
(
opt
);
}
}
}
const
std
::
vector
<
const
Variable
*>
MultiInputVar
(
const
std
::
vector
<
const
Variable
*>
MultiInputVar
(
...
@@ -250,9 +260,11 @@ class InferShapeContext {
...
@@ -250,9 +260,11 @@ class InferShapeContext {
auto
names
=
op_
.
Inputs
(
name
);
auto
names
=
op_
.
Inputs
(
name
);
std
::
vector
<
const
Variable
*>
res
;
std
::
vector
<
const
Variable
*>
res
;
res
.
reserve
(
names
.
size
());
res
.
reserve
(
names
.
size
());
std
::
transform
(
std
::
transform
(
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
[
this
](
const
std
::
string
&
name
)
{
[
this
](
const
std
::
string
&
name
)
{
return
scope_
.
FindVar
(
name
);
});
return
name
!=
kEmptyVarName
?
scope_
.
FindVar
(
name
)
:
nullptr
;
});
return
res
;
return
res
;
}
}
...
@@ -260,24 +272,24 @@ class InferShapeContext {
...
@@ -260,24 +272,24 @@ class InferShapeContext {
auto
names
=
op_
.
Outputs
(
name
);
auto
names
=
op_
.
Outputs
(
name
);
std
::
vector
<
const
Variable
*>
res
;
std
::
vector
<
const
Variable
*>
res
;
res
.
reserve
(
names
.
size
());
res
.
reserve
(
names
.
size
());
std
::
transform
(
std
::
transform
(
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
[
this
](
const
std
::
string
&
name
)
{
[
this
](
const
std
::
string
&
name
)
{
return
scope_
.
FindVar
(
name
);
});
return
name
!=
kEmptyVarName
?
scope_
.
FindVar
(
name
)
:
nullptr
;
});
return
res
;
return
res
;
}
}
template
<
typename
T
>
template
<
typename
T
>
const
T
*
Input
(
const
std
::
string
&
name
)
const
{
const
T
*
Input
(
const
std
::
string
&
name
)
const
{
auto
*
var
=
InputVar
(
name
);
auto
*
var
=
InputVar
(
name
);
PADDLE_ENFORCE_NOT_NULL
(
var
,
"Input(%s) should not be nullptr"
,
name
);
return
var
==
nullptr
?
nullptr
:
&
var
->
Get
<
T
>
();
return
&
var
->
Get
<
T
>
();
}
}
template
<
typename
T
>
template
<
typename
T
>
T
*
Output
(
const
std
::
string
&
name
)
const
{
T
*
Output
(
const
std
::
string
&
name
)
const
{
auto
var
=
OutputVar
(
name
);
auto
var
=
OutputVar
(
name
);
PADDLE_ENFORCE_NOT_NULL
(
var
,
"Output(%s) should not be nullptr"
,
name
);
return
var
==
nullptr
?
nullptr
:
var
->
GetMutable
<
T
>
();
return
var
->
GetMutable
<
T
>
();
}
}
template
<
typename
T
>
template
<
typename
T
>
...
@@ -288,10 +300,7 @@ class InferShapeContext {
...
@@ -288,10 +300,7 @@ class InferShapeContext {
std
::
transform
(
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
std
::
transform
(
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
[
&
](
const
std
::
string
&
sub_name
)
{
[
&
](
const
std
::
string
&
sub_name
)
{
auto
var
=
scope_
.
FindVar
(
sub_name
);
auto
var
=
scope_
.
FindVar
(
sub_name
);
PADDLE_ENFORCE_NOT_NULL
(
return
var
==
nullptr
?
nullptr
:
&
var
->
Get
<
T
>
();
var
,
"MultiInput(%s:%s) should not be nullptr"
,
name
,
sub_name
);
return
&
var
->
Get
<
T
>
();
});
});
return
res
;
return
res
;
}
}
...
@@ -304,10 +313,7 @@ class InferShapeContext {
...
@@ -304,10 +313,7 @@ class InferShapeContext {
std
::
transform
(
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
std
::
transform
(
names
.
begin
(),
names
.
end
(),
std
::
back_inserter
(
res
),
[
&
](
const
std
::
string
&
sub_name
)
{
[
&
](
const
std
::
string
&
sub_name
)
{
auto
var
=
scope_
.
FindVar
(
sub_name
);
auto
var
=
scope_
.
FindVar
(
sub_name
);
PADDLE_ENFORCE_NOT_NULL
(
return
var
==
nullptr
?
nullptr
:
var
->
GetMutable
<
T
>
();
var
,
"MultiOutput(%s:%s) should not be nullptr."
,
name
,
sub_name
);
return
var
->
GetMutable
<
T
>
();
});
});
return
res
;
return
res
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录