Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
ee6f778b
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
ee6f778b
编写于
11月 07, 2018
作者:
T
Tomasz Patejko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MKLDNN residual connections fuse pass: further refactoring
上级
7423748e
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
112 addition
and
98 deletion
+112
-98
paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc
...uid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc
+92
-19
paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.h
...luid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.h
+20
-79
未找到文件。
paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc
浏览文件 @
ee6f778b
...
@@ -99,10 +99,9 @@ bool IsReachable(ir::Graph* graph, Node* from, Node* to) {
...
@@ -99,10 +99,9 @@ bool IsReachable(ir::Graph* graph, Node* from, Node* to) {
return
false
;
return
false
;
}
}
std
::
pair
<
bool
,
Node
*>
ResidualConnectionMKLDNNFusePass
::
HasBias
(
std
::
pair
<
bool
,
Node
*>
HasBias
(
const
Node
&
op
,
const
std
::
string
&
bias_name
)
{
const
Node
&
op
)
const
{
auto
bias_input_names
=
op
.
Op
()
->
Inputs
();
auto
bias_input_names
=
op
.
Op
()
->
Inputs
();
auto
bias_it
=
bias_input_names
.
find
(
"Bias"
);
auto
bias_it
=
bias_input_names
.
find
(
bias_name
);
if
(
bias_it
!=
std
::
end
(
bias_input_names
))
{
if
(
bias_it
!=
std
::
end
(
bias_input_names
))
{
bool
has_bias
=
!
bias_it
->
second
.
empty
();
bool
has_bias
=
!
bias_it
->
second
.
empty
();
...
@@ -121,6 +120,74 @@ std::pair<bool, Node*> ResidualConnectionMKLDNNFusePass::HasBias(
...
@@ -121,6 +120,74 @@ std::pair<bool, Node*> ResidualConnectionMKLDNNFusePass::HasBias(
return
std
::
make_pair
(
false
,
nullptr
);
return
std
::
make_pair
(
false
,
nullptr
);
}
}
ResidualConnectionMKLDNNFusePass
::
FuseHandler
::
FuseHandler
(
const
ResidualConnectionMKLDNNFusePass
::
ConvFunc
&
get_node_from_conv_op
,
const
ResidualConnectionMKLDNNFusePass
::
ElementwiseAddFunc
&
get_node_from_elementwise_add_op
,
const
ResidualConnectionMKLDNNFusePass
::
CanFuseFunc
&
can_fuse_func
)
:
get_node_from_conv_op
{
get_node_from_conv_op
},
get_node_from_elementwise_add_op
{
get_node_from_elementwise_add_op
},
can_fuse_func
{
can_fuse_func
}
{}
void
ResidualConnectionMKLDNNFusePass
::
FuseHandler
::
operator
()(
const
GraphPatternDetector
::
subgraph_t
&
subgraph
,
Graph
*
graph
)
{
Node
*
conv_op
;
Node
*
conv_input
;
Node
*
conv_filter
;
Node
*
conv_output
;
Node
*
elementwise_add_op
;
Node
*
elementwise_add_identity
;
Node
*
elementwise_add_out
;
std
::
tie
(
conv_op
,
conv_input
,
conv_filter
,
conv_output
)
=
get_node_from_conv_op
(
subgraph
);
std
::
tie
(
elementwise_add_op
,
elementwise_add_identity
,
elementwise_add_out
)
=
get_node_from_elementwise_add_op
(
subgraph
);
if
(
!
can_fuse_func
(
conv_op
,
elementwise_add_op
))
return
;
if
(
!
IsReachable
(
graph
,
elementwise_add_identity
,
conv_output
))
return
;
OpDesc
op_desc
;
op_desc
.
SetType
(
"conv2d"
);
op_desc
.
SetInput
(
"Input"
,
{
conv_input
->
Name
()});
op_desc
.
SetInput
(
"Filter"
,
{
conv_filter
->
Name
()});
op_desc
.
SetInput
(
"ResidualData"
,
{
elementwise_add_identity
->
Name
()});
op_desc
.
SetOutput
(
"Output"
,
{
conv_output
->
Name
()});
bool
has_bias
;
Node
*
conv_bias
;
std
::
tie
(
has_bias
,
conv_bias
)
=
HasBias
(
*
conv_op
,
"Bias"
);
if
(
has_bias
)
{
op_desc
.
SetInput
(
"Bias"
,
{
conv_bias
->
Name
()});
}
for
(
const
auto
&
attr
:
conv_op
->
Op
()
->
GetAttrMap
())
{
op_desc
.
SetAttr
(
attr
.
first
,
attr
.
second
);
}
op_desc
.
SetAttr
(
"fuse_residual_connection"
,
true
);
auto
fused_conv_op
=
graph
->
CreateOpNode
(
&
op_desc
);
IR_NODE_LINK_TO
(
conv_input
,
fused_conv_op
);
IR_NODE_LINK_TO
(
conv_filter
,
fused_conv_op
);
IR_NODE_LINK_TO
(
elementwise_add_identity
,
fused_conv_op
);
IR_NODE_LINK_TO
(
fused_conv_op
,
conv_output
);
if
(
has_bias
)
{
IR_NODE_LINK_TO
(
conv_bias
,
fused_conv_op
);
}
CorrectGraphEdges
(
graph
,
elementwise_add_out
,
conv_output
);
GraphSafeRemoveNodes
(
graph
,
{
elementwise_add_out
,
conv_op
,
elementwise_add_op
});
}
graph_ptr
ResidualConnectionMKLDNNFusePass
::
FuseConvAsX
(
graph_ptr
ResidualConnectionMKLDNNFusePass
::
FuseConvAsX
(
const
std
::
string
&
name_scope_
,
graph_ptr
graph
)
const
{
const
std
::
string
&
name_scope_
,
graph_ptr
graph
)
const
{
GraphPatternDetector
gpd
;
GraphPatternDetector
gpd
;
...
@@ -135,8 +202,8 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsX(
...
@@ -135,8 +202,8 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsX(
pattern
->
NewNode
(
elementwise_add_pattern
.
elementwise_add_y_repr
()));
pattern
->
NewNode
(
elementwise_add_pattern
.
elementwise_add_y_repr
()));
conv_output
->
AsIntermediate
();
conv_output
->
AsIntermediate
();
auto
get_node_from_conv
=
[](
const
patterns
::
Conv
&
conv_pattern
,
auto
get_node_from_conv
=
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
[
&
conv_pattern
](
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*
,
Node
*>
{
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*
,
Node
*>
{
GET_IR_NODE_FROM_SUBGRAPH
(
conv_op
,
conv_op
,
conv_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
conv_op
,
conv_op
,
conv_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
conv_input
,
conv_input
,
conv_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
conv_input
,
conv_input
,
conv_pattern
);
...
@@ -146,8 +213,7 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsX(
...
@@ -146,8 +213,7 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsX(
return
std
::
make_tuple
(
conv_op
,
conv_input
,
conv_filter
,
conv_output
);
return
std
::
make_tuple
(
conv_op
,
conv_input
,
conv_filter
,
conv_output
);
};
};
auto
get_node_from_elementwise_add
=
[](
auto
get_node_from_elementwise_add
=
[
&
elementwise_add_pattern
](
const
patterns
::
ElementwiseAdd
&
elementwise_add_pattern
,
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*>
{
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*>
{
GET_IR_NODE_FROM_SUBGRAPH
(
elementwise_add_op
,
elementwise_add_op
,
GET_IR_NODE_FROM_SUBGRAPH
(
elementwise_add_op
,
elementwise_add_op
,
...
@@ -161,10 +227,14 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsX(
...
@@ -161,10 +227,14 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsX(
elementwise_add_out
);
elementwise_add_out
);
};
};
auto
handler
=
auto
can_fuse
=
[
this
](
Node
*
op1
,
Node
*
op2
)
->
bool
{
GenerateFuseHandler
(
conv_pattern
,
elementwise_add_pattern
,
return
this
->
FindFuseOption
(
*
op1
,
*
op2
)
==
FUSE_MKLDNN
;
get_node_from_conv
,
get_node_from_elementwise_add
);
};
gpd
(
graph
.
get
(),
handler
);
auto
fuse_handler
=
FuseHandler
{
get_node_from_conv
,
get_node_from_elementwise_add
,
can_fuse
};
gpd
(
graph
.
get
(),
fuse_handler
);
return
graph
;
return
graph
;
}
}
...
@@ -183,8 +253,8 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsY(
...
@@ -183,8 +253,8 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsY(
conv_output
);
conv_output
);
conv_output
->
AsIntermediate
();
conv_output
->
AsIntermediate
();
auto
get_node_from_conv
=
[](
const
patterns
::
Conv
&
conv_pattern
,
auto
get_node_from_conv
=
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
[
&
conv_pattern
](
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*
,
Node
*>
{
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*
,
Node
*>
{
GET_IR_NODE_FROM_SUBGRAPH
(
conv_op
,
conv_op
,
conv_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
conv_op
,
conv_op
,
conv_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
conv_input
,
conv_input
,
conv_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
conv_input
,
conv_input
,
conv_pattern
);
...
@@ -194,8 +264,7 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsY(
...
@@ -194,8 +264,7 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsY(
return
std
::
make_tuple
(
conv_op
,
conv_input
,
conv_filter
,
conv_output
);
return
std
::
make_tuple
(
conv_op
,
conv_input
,
conv_filter
,
conv_output
);
};
};
auto
get_node_from_elementwise_add
=
[](
auto
get_node_from_elementwise_add
=
[
&
elementwise_add_pattern
](
const
patterns
::
ElementwiseAdd
&
elementwise_add_pattern
,
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*>
{
->
std
::
tuple
<
Node
*
,
Node
*
,
Node
*>
{
GET_IR_NODE_FROM_SUBGRAPH
(
elementwise_add_op
,
elementwise_add_op
,
GET_IR_NODE_FROM_SUBGRAPH
(
elementwise_add_op
,
elementwise_add_op
,
...
@@ -209,10 +278,14 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsY(
...
@@ -209,10 +278,14 @@ graph_ptr ResidualConnectionMKLDNNFusePass::FuseConvAsY(
elementwise_add_out
);
elementwise_add_out
);
};
};
auto
handler
=
auto
can_fuse
=
[
this
](
Node
*
op1
,
Node
*
op2
)
->
bool
{
GenerateFuseHandler
(
conv_pattern
,
elementwise_add_pattern
,
return
this
->
FindFuseOption
(
*
op1
,
*
op2
)
==
FUSE_MKLDNN
;
get_node_from_conv
,
get_node_from_elementwise_add
);
};
gpd
(
graph
.
get
(),
handler
);
auto
fuse_handler
=
FuseHandler
{
get_node_from_conv
,
get_node_from_elementwise_add
,
can_fuse
};
gpd
(
graph
.
get
(),
fuse_handler
);
return
graph
;
return
graph
;
}
}
...
...
paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.h
浏览文件 @
ee6f778b
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#pragma once
#pragma once
#include <string>
#include <string>
#include <tuple>
#include <utility>
#include <utility>
#include "paddle/fluid/framework/ir/fuse_pass_base.h"
#include "paddle/fluid/framework/ir/fuse_pass_base.h"
#include "paddle/fluid/framework/ir/graph.h"
#include "paddle/fluid/framework/ir/graph.h"
...
@@ -28,24 +29,32 @@ using graph_ptr = std::unique_ptr<ir::Graph>;
...
@@ -28,24 +29,32 @@ using graph_ptr = std::unique_ptr<ir::Graph>;
void
CorrectGraphEdges
(
Graph
*
graph
,
Node
*
from
,
Node
*
to
);
void
CorrectGraphEdges
(
Graph
*
graph
,
Node
*
from
,
Node
*
to
);
bool
IsReachable
(
ir
::
Graph
*
graph
,
Node
*
from
,
Node
*
to
);
bool
IsReachable
(
ir
::
Graph
*
graph
,
Node
*
from
,
Node
*
to
);
std
::
pair
<
bool
,
Node
*>
HasBias
(
const
Node
&
op
,
const
std
::
string
&
bias_name
);
using
handler_func
=
std
::
function
<
void
(
const
GraphPatternDetector
::
subgraph_t
&
subgraph
,
Graph
*
g
)
>
;
class
ResidualConnectionMKLDNNFusePass
:
public
FusePassBase
{
class
ResidualConnectionMKLDNNFusePass
:
public
FusePassBase
{
private:
private:
graph_ptr
FuseConvAsX
(
const
std
::
string
&
name_scope_
,
graph_ptr
graph
)
const
;
graph_ptr
FuseConvAsX
(
const
std
::
string
&
name_scope_
,
graph_ptr
graph
)
const
;
graph_ptr
FuseConvAsY
(
const
std
::
string
&
name_scope_
,
graph_ptr
graph
)
const
;
graph_ptr
FuseConvAsY
(
const
std
::
string
&
name_scope_
,
graph_ptr
graph
)
const
;
std
::
pair
<
bool
,
Node
*>
HasBias
(
const
Node
&
op
)
const
;
template
<
typename
RetType
>
using
GetNodeFunc
=
std
::
function
<
RetType
(
const
GraphPatternDetector
::
subgraph_t
&
subgraph
)
>
;
using
ConvFunc
=
GetNodeFunc
<
std
::
tuple
<
Node
*
,
Node
*
,
Node
*
,
Node
*>>
;
using
ElementwiseAddFunc
=
GetNodeFunc
<
std
::
tuple
<
Node
*
,
Node
*
,
Node
*>>
;
using
CanFuseFunc
=
std
::
function
<
bool
(
Node
*
,
Node
*
)
>
;
struct
FuseHandler
{
FuseHandler
(
const
ConvFunc
&
get_node_from_conv_op
,
const
ElementwiseAddFunc
&
get_node_from_elementwise_add_op
,
const
CanFuseFunc
&
can_fuse_func
);
ConvFunc
get_node_from_conv_op
;
ElementwiseAddFunc
get_node_from_elementwise_add_op
;
CanFuseFunc
can_fuse_func
;
template
<
typename
CONV_FUNC
,
typename
ELEMENTWISE_ADD_FUNC
,
void
operator
()(
const
GraphPatternDetector
::
subgraph_t
&
subgraph
,
typename
HANDLER_FUNC
=
handler_func
>
Graph
*
graph
);
HANDLER_FUNC
GenerateFuseHandler
(
};
const
patterns
::
Conv
&
conv_pattern
,
const
patterns
::
ElementwiseAdd
&
elementwise_add_pattern
,
CONV_FUNC
get_node_from_conv_op
,
ELEMENTWISE_ADD_FUNC
get_node_from_elementwise_add_op
)
const
;
public:
public:
virtual
~
ResidualConnectionMKLDNNFusePass
()
{}
virtual
~
ResidualConnectionMKLDNNFusePass
()
{}
...
@@ -55,74 +64,6 @@ class ResidualConnectionMKLDNNFusePass : public FusePassBase {
...
@@ -55,74 +64,6 @@ class ResidualConnectionMKLDNNFusePass : public FusePassBase {
const
std
::
string
name_scope_
{
"residual_connection_fuse_pass"
};
const
std
::
string
name_scope_
{
"residual_connection_fuse_pass"
};
};
};
template
<
typename
CONV_FUNC
,
typename
ELEMENTWISE_ADD_FUNC
,
typename
HANDLER_FUNC
>
HANDLER_FUNC
ResidualConnectionMKLDNNFusePass
::
GenerateFuseHandler
(
const
patterns
::
Conv
&
conv_pattern
,
const
patterns
::
ElementwiseAdd
&
elementwise_add_pattern
,
CONV_FUNC
get_node_from_conv_op
,
ELEMENTWISE_ADD_FUNC
get_node_from_elementwise_add_op
)
const
{
return
[
&
](
const
GraphPatternDetector
::
subgraph_t
&
subgraph
,
Graph
*
graph
)
{
Node
*
conv_op
;
Node
*
conv_input
;
Node
*
conv_filter
;
Node
*
conv_output
;
Node
*
elementwise_add_op
;
Node
*
elementwise_add_identity
;
Node
*
elementwise_add_out
;
std
::
tie
(
conv_op
,
conv_input
,
conv_filter
,
conv_output
)
=
get_node_from_conv_op
(
conv_pattern
,
subgraph
);
std
::
tie
(
elementwise_add_op
,
elementwise_add_identity
,
elementwise_add_out
)
=
get_node_from_elementwise_add_op
(
elementwise_add_pattern
,
subgraph
);
if
(
this
->
FindFuseOption
(
*
conv_op
,
*
elementwise_add_op
)
!=
FUSE_MKLDNN
)
return
;
if
(
!
IsReachable
(
graph
,
elementwise_add_identity
,
conv_output
))
return
;
OpDesc
op_desc
;
op_desc
.
SetType
(
"conv2d"
);
op_desc
.
SetInput
(
"Input"
,
{
conv_input
->
Name
()});
op_desc
.
SetInput
(
"Filter"
,
{
conv_filter
->
Name
()});
op_desc
.
SetInput
(
"ResidualData"
,
{
elementwise_add_identity
->
Name
()});
op_desc
.
SetOutput
(
"Output"
,
{
conv_output
->
Name
()});
bool
has_bias
;
Node
*
conv_bias
;
std
::
tie
(
has_bias
,
conv_bias
)
=
this
->
HasBias
(
*
conv_op
);
if
(
has_bias
)
{
op_desc
.
SetInput
(
"Bias"
,
{
conv_bias
->
Name
()});
}
for
(
const
auto
&
attr
:
conv_op
->
Op
()
->
GetAttrMap
())
{
op_desc
.
SetAttr
(
attr
.
first
,
attr
.
second
);
}
op_desc
.
SetAttr
(
"fuse_residual_connection"
,
true
);
auto
fused_conv_op
=
graph
->
CreateOpNode
(
&
op_desc
);
IR_NODE_LINK_TO
(
conv_input
,
fused_conv_op
);
IR_NODE_LINK_TO
(
conv_filter
,
fused_conv_op
);
IR_NODE_LINK_TO
(
elementwise_add_identity
,
fused_conv_op
);
IR_NODE_LINK_TO
(
fused_conv_op
,
conv_output
);
if
(
has_bias
)
{
IR_NODE_LINK_TO
(
conv_bias
,
fused_conv_op
);
}
CorrectGraphEdges
(
graph
,
elementwise_add_out
,
conv_output
);
GraphSafeRemoveNodes
(
graph
,
{
elementwise_add_out
,
conv_op
,
elementwise_add_op
});
};
}
}
// namespace ir
}
// namespace ir
}
// namespace framework
}
// namespace framework
}
// namespace paddle
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录