Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
e15009e7
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看板
未验证
提交
e15009e7
编写于
6月 29, 2021
作者:
王
王明冬
提交者:
GitHub
6月 29, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add compat precondition for reshape_transpose_matmul_mkldnn_fuse_pass, (#33820)
test=develop.
上级
0bccd782
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
59 addition
and
4 deletion
+59
-4
paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.cc
...rk/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.cc
+58
-0
paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.h
...ork/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.h
+1
-4
未找到文件。
paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.cc
浏览文件 @
e15009e7
...
@@ -23,6 +23,59 @@ namespace paddle {
...
@@ -23,6 +23,59 @@ namespace paddle {
namespace
framework
{
namespace
framework
{
namespace
ir
{
namespace
ir
{
ReshapeTransposeMatmulMkldnnFusePass
::
ReshapeTransposeMatmulMkldnnFusePass
()
{
AddOpCompat
(
OpCompat
(
"reshape2"
))
.
AddInput
(
"X"
)
.
IsTensor
()
.
End
()
// The reshape2 op for this pass should not have "Shape" and "ShapeTensor"
.
AddOutput
(
"Out"
)
.
IsTensor
()
.
End
()
.
AddOutput
(
"XShape"
)
.
IsOptional
()
.
IsTensor
()
.
End
()
.
AddAttr
(
"shape"
)
.
IsType
<
std
::
vector
<
int
>>
()
.
End
();
AddOpCompat
(
OpCompat
(
"transpose2"
))
.
AddInput
(
"X"
)
.
IsTensor
()
.
End
()
.
AddOutput
(
"Out"
)
.
IsTensor
()
.
End
()
.
AddOutput
(
"XShape"
)
.
IsOptional
()
.
IsTensor
()
.
End
()
.
AddAttr
(
"axis"
)
.
IsType
<
std
::
vector
<
int
>>
()
.
End
();
AddOpCompat
(
OpCompat
(
"matmul"
))
.
AddInput
(
"X"
)
.
IsTensor
()
.
End
()
.
AddInput
(
"Y"
)
.
IsTensor
()
.
End
()
.
AddOutput
(
"Out"
)
.
IsTensor
()
.
End
()
.
AddAttr
(
"alpha"
)
.
IsType
<
float
>
()
.
End
()
.
AddAttr
(
"transpose_X"
)
.
IsType
<
bool
>
()
.
End
()
.
AddAttr
(
"transpose_Y"
)
.
IsType
<
bool
>
()
.
End
();
}
void
ReshapeTransposeMatmulMkldnnFusePass
::
Fuse
(
void
ReshapeTransposeMatmulMkldnnFusePass
::
Fuse
(
Graph
*
graph
,
bool
with_reshape_xshape
,
bool
with_transpose_xshape
)
const
{
Graph
*
graph
,
bool
with_reshape_xshape
,
bool
with_transpose_xshape
)
const
{
GraphPatternDetector
gpd
;
GraphPatternDetector
gpd
;
...
@@ -34,6 +87,11 @@ void ReshapeTransposeMatmulMkldnnFusePass::Fuse(
...
@@ -34,6 +87,11 @@ void ReshapeTransposeMatmulMkldnnFusePass::Fuse(
int
found_reshape_transpose_matmul_count
=
0
;
int
found_reshape_transpose_matmul_count
=
0
;
auto
handler
=
[
&
](
const
GraphPatternDetector
::
subgraph_t
&
subgraph
,
auto
handler
=
[
&
](
const
GraphPatternDetector
::
subgraph_t
&
subgraph
,
Graph
*
g
)
{
Graph
*
g
)
{
if
(
!
IsCompat
(
subgraph
,
g
))
{
LOG
(
WARNING
)
<<
"Op compatible check in "
"reshape_transpose_matmul_mkldnn_fuse_pass failed."
;
return
;
}
VLOG
(
4
)
<<
"handle ReshapeTransposeMatmulMkldnn fuse"
;
VLOG
(
4
)
<<
"handle ReshapeTransposeMatmulMkldnn fuse"
;
GET_IR_NODE_FROM_SUBGRAPH
(
reshape_in
,
reshape_in
,
rtm_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
reshape_in
,
reshape_in
,
rtm_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
reshape_op
,
reshape_op
,
rtm_pattern
);
GET_IR_NODE_FROM_SUBGRAPH
(
reshape_op
,
reshape_op
,
rtm_pattern
);
...
...
paddle/fluid/framework/ir/mkldnn/reshape_transpose_matmul_mkldnn_fuse_pass.h
浏览文件 @
e15009e7
...
@@ -17,8 +17,6 @@
...
@@ -17,8 +17,6 @@
#include <string>
#include <string>
#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_pattern_detector.h"
namespace
paddle
{
namespace
paddle
{
namespace
framework
{
namespace
framework
{
...
@@ -26,11 +24,10 @@ namespace ir {
...
@@ -26,11 +24,10 @@ namespace ir {
/*
/*
* Fuse Reshape->Transpose->MatMul when MatMul uses mkldnn.
* Fuse Reshape->Transpose->MatMul when MatMul uses mkldnn.
*/
*/
class
Graph
;
class
ReshapeTransposeMatmulMkldnnFusePass
:
public
FusePassBase
{
class
ReshapeTransposeMatmulMkldnnFusePass
:
public
FusePassBase
{
public:
public:
virtual
~
ReshapeTransposeMatmulMkldnnFusePass
()
{}
ReshapeTransposeMatmulMkldnnFusePass
();
protected:
protected:
void
ApplyImpl
(
ir
::
Graph
*
graph
)
const
override
;
void
ApplyImpl
(
ir
::
Graph
*
graph
)
const
override
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录