Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
b080d986
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看板
未验证
提交
b080d986
编写于
10月 27, 2021
作者:
B
baoachun
提交者:
GitHub
10月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fim matmul dim error (#36768)
上级
9d2e0923
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
77 addition
and
9 deletion
+77
-9
paddle/fluid/inference/api/paddle_pass_builder.cc
paddle/fluid/inference/api/paddle_pass_builder.cc
+9
-9
paddle/fluid/operators/matmul_op.cc
paddle/fluid/operators/matmul_op.cc
+38
-0
paddle/fluid/operators/mkldnn/matmul_mkldnn_op.cc
paddle/fluid/operators/mkldnn/matmul_mkldnn_op.cc
+30
-0
未找到文件。
paddle/fluid/inference/api/paddle_pass_builder.cc
浏览文件 @
b080d986
...
...
@@ -205,7 +205,7 @@ CpuPassStrategy::CpuPassStrategy() : PassStrategy({}) {
"reshape2_matmul_fuse_pass"
,
//
"flatten2_matmul_fuse_pass"
,
//
"map_matmul_v2_to_mul_pass"
,
//
//
"map_matmul_v2_to_matmul_pass", //
"map_matmul_v2_to_matmul_pass"
,
//
"map_matmul_to_mul_pass"
,
//
"fc_fuse_pass"
,
//
"repeated_fc_relu_fuse_pass"
,
//
...
...
paddle/fluid/operators/matmul_op.cc
浏览文件 @
b080d986
...
...
@@ -336,6 +336,7 @@ framework::DDim GetDimForInput(const framework::InferShapeContext &ctx,
"The Input(%s) has not been initialized properly. The "
"shape of Input(%s) = [%s]."
,
dim
));
// if mkldnn reshape+transpose+matmul fuse activated
if
(
!
shape
.
empty
()
&&
!
axis
.
empty
())
{
PADDLE_ENFORCE_GE
(
shape
.
size
(),
2
,
...
...
@@ -355,6 +356,43 @@ framework::DDim GetDimForInput(const framework::InferShapeContext &ctx,
"Ranks of shape_%s and axis_%s attributes of MatMulOp "
"must be equal."
,
input_name
,
input_name
));
int
num_negative
=
std
::
count
(
shape
.
begin
(),
shape
.
end
(),
-
1
);
PADDLE_ENFORCE_LE
(
num_negative
,
1
,
platform
::
errors
::
InvalidArgument
(
"The max number of -1 in fused_reshape_%s is 1 "
"but received %d."
,
input_name
,
num_negative
));
auto
it_zero
=
std
::
find
(
shape
.
begin
(),
shape
.
end
(),
0
);
if
(
it_zero
!=
shape
.
end
())
{
for
(
uint64_t
i
=
0
;
i
<
shape
.
size
();
i
++
)
{
if
(
shape
[
i
]
==
0
)
{
PADDLE_ENFORCE_LT
(
i
,
dim
.
size
(),
platform
::
errors
::
InvalidArgument
(
"The index of 0 in fused_reshape_%s "
,
"should be less than output dim size, "
,
"but the index is %d and output dim size is %d"
,
input_name
,
i
,
dim
.
size
()));
shape
[
i
]
=
dim
.
at
(
i
);
}
}
}
// if "-1" is present then one of reshape dims must be infered
auto
it_negative
=
std
::
find
(
shape
.
begin
(),
shape
.
end
(),
-
1
);
if
(
it_negative
!=
shape
.
end
())
{
int64_t
dim_product
=
1
;
for
(
int
i
=
0
;
i
<
dim
.
size
();
i
++
)
{
dim_product
*=
dim
.
at
(
i
);
}
int64_t
shape_product
=
std
::
accumulate
(
shape
.
begin
(),
shape
.
end
(),
-
1
,
std
::
multiplies
<
int
>
());
int
index
=
std
::
distance
(
shape
.
begin
(),
it_negative
);
shape
[
index
]
=
dim_product
/
shape_product
;
}
dim
=
dim
.
reshape
(
shape
).
transpose
(
axis
);
}
return
dim
;
...
...
paddle/fluid/operators/mkldnn/matmul_mkldnn_op.cc
浏览文件 @
b080d986
...
...
@@ -245,6 +245,36 @@ class MatMulMKLDNNHandler
auto
input_dims
=
ctx
.
Input
<
Tensor
>
(
input_name
)
->
dims
();
auto
new_dims
=
input_dims
;
if
(
!
shape
.
empty
()
&&
!
axis
.
empty
())
{
auto
it_zero
=
std
::
find
(
shape
.
begin
(),
shape
.
end
(),
0
);
if
(
it_zero
!=
shape
.
end
())
{
for
(
uint64_t
i
=
0
;
i
<
shape
.
size
();
i
++
)
{
if
(
shape
[
i
]
==
0
)
{
PADDLE_ENFORCE_LT
(
i
,
input_dims
.
size
(),
paddle
::
platform
::
errors
::
InvalidArgument
(
"The index of 0 in fused_reshape_%s "
,
"should be less than output dim size, "
,
"but the index is %d and output dim size is %d"
,
input_name
,
i
,
input_dims
.
size
()));
shape
[
i
]
=
input_dims
.
at
(
i
);
}
}
}
// if "-1" is present then one of reshape dims must be infered
auto
it_negative
=
std
::
find
(
shape
.
begin
(),
shape
.
end
(),
-
1
);
if
(
it_negative
!=
shape
.
end
())
{
int64_t
dim_product
=
1
;
for
(
int
i
=
0
;
i
<
input_dims
.
size
();
i
++
)
{
dim_product
*=
input_dims
.
at
(
i
);
}
int64_t
shape_product
=
std
::
accumulate
(
shape
.
begin
(),
shape
.
end
(),
-
1
,
std
::
multiplies
<
int
>
());
int
index
=
std
::
distance
(
shape
.
begin
(),
it_negative
);
shape
[
index
]
=
dim_product
/
shape_product
;
}
new_dims
=
input_dims
.
reshape
(
shape
).
transpose
(
axis
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录