Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
3fe5cddf
P
Paddle-Lite
项目概览
PaddlePaddle
/
Paddle-Lite
通知
331
Star
4
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
271
列表
看板
标记
里程碑
合并请求
78
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle-Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
271
Issue
271
列表
看板
标记
里程碑
合并请求
78
合并请求
78
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
3fe5cddf
编写于
12月 25, 2019
作者:
H
hong19860320
提交者:
GitHub
12月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[LITE][XPU] Fix matmul op bridge (#2668)
上级
28481458
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
64 addition
and
6 deletion
+64
-6
lite/kernels/xpu/bridges/matmul_op.cc
lite/kernels/xpu/bridges/matmul_op.cc
+64
-6
未找到文件。
lite/kernels/xpu/bridges/matmul_op.cc
浏览文件 @
3fe5cddf
...
@@ -49,9 +49,10 @@ int MatmulConverter(void* ctx, OpLite* op, KernelBase* kernel) {
...
@@ -49,9 +49,10 @@ int MatmulConverter(void* ctx, OpLite* op, KernelBase* kernel) {
auto
out_type
=
kernel
->
GetOutputDeclType
(
"Out"
);
auto
out_type
=
kernel
->
GetOutputDeclType
(
"Out"
);
CHECK
(
out_type
->
precision
()
==
PRECISION
(
kFloat
));
CHECK
(
out_type
->
precision
()
==
PRECISION
(
kFloat
));
CHECK
(
out_type
->
layout
()
==
DATALAYOUT
(
kNCHW
));
CHECK
(
out_type
->
layout
()
==
DATALAYOUT
(
kNCHW
));
auto
out
=
scope
->
FindMutableTensor
(
out_name
);
auto
out_dims
=
out
->
dims
();
auto
transpose_x
=
op_info
->
GetAttr
<
bool
>
(
"transpose_X"
);
auto
transpose_x
=
op_info
->
GetAttr
<
bool
>
(
"transpose_X"
);
CHECK
(
!
transpose_x
)
<<
"XPU only support transpose_x == true now"
;
auto
transpose_y
=
op_info
->
GetAttr
<
bool
>
(
"transpose_Y"
);
auto
transpose_y
=
op_info
->
GetAttr
<
bool
>
(
"transpose_Y"
);
auto
alpha
=
op_info
->
GetAttr
<
float
>
(
"alpha"
);
auto
alpha
=
op_info
->
GetAttr
<
float
>
(
"alpha"
);
...
@@ -71,11 +72,68 @@ int MatmulConverter(void* ctx, OpLite* op, KernelBase* kernel) {
...
@@ -71,11 +72,68 @@ int MatmulConverter(void* ctx, OpLite* op, KernelBase* kernel) {
y_node
=
graph
->
AddNode
(
y_name
,
y_dims
);
y_node
=
graph
->
AddNode
(
y_name
,
y_dims
);
}
}
auto
matmul_node
=
// Matmul node
graph
->
builder_
.
CreateMatmul2D
(
*
x_node
,
*
y_node
,
transpose_y
);
if
(
x_dims
.
size
()
>
2
&&
y_dims
.
size
()
>=
2
)
{
graph
->
AddNode
(
out_name
,
graph
->
builder_
.
CreateScale
(
matmul_node
,
alpha
));
// x: [B, ..., M, K], y: [B, ..., K, N], out: [B, ..., M, N]
// x: [B, M, K], y: [K, N], out: [B, M, N]
return
SUCCESS
;
// Reshape and transposed X node
if
(
x_dims
.
size
()
!=
3
)
{
auto
m
=
static_cast
<
int
>
(
x_dims
[
x_dims
.
size
()
-
2
]);
auto
k
=
static_cast
<
int
>
(
x_dims
[
x_dims
.
size
()
-
1
]);
x_node
=
graph
->
AddNode
(
x_name
+
"/reshape"
,
graph
->
builder_
.
CreateReshape
(
*
x_node
,
{
-
1
,
m
,
k
}));
if
(
transpose_x
)
{
x_node
=
graph
->
AddNode
(
x_name
+
"/reshape/transpose"
,
graph
->
builder_
.
CreateTranspose
(
*
x_node
,
{
0
,
2
,
1
}));
}
}
// Reshape and transposed Y node
if
(
y_dims
.
size
()
!=
3
)
{
auto
k
=
static_cast
<
int
>
(
y_dims
[
y_dims
.
size
()
-
2
]);
auto
n
=
static_cast
<
int
>
(
y_dims
[
y_dims
.
size
()
-
1
]);
y_node
=
graph
->
AddNode
(
y_name
+
"/reshape"
,
graph
->
builder_
.
CreateReshape
(
*
y_node
,
{
-
1
,
k
,
n
}));
if
(
!
transpose_y
)
{
y_node
=
graph
->
AddNode
(
y_name
+
"/reshape/transpose"
,
graph
->
builder_
.
CreateTranspose
(
*
y_node
,
{
0
,
2
,
1
}));
}
}
// Matmul node
auto
matmul_node
=
graph
->
AddNode
(
out_name
,
graph
->
builder_
.
CreateBatchMatmul
(
*
x_node
,
*
y_node
));
if
(
fabs
(
alpha
-
1
)
>
1e-6
f
)
{
matmul_node
=
graph
->
AddNode
(
out_name
,
graph
->
builder_
.
CreateScale
(
*
matmul_node
,
alpha
));
}
if
(
out_dims
.
size
()
!=
3
)
{
graph
->
AddNode
(
out_name
,
graph
->
builder_
.
CreateReshape
(
*
matmul_node
,
CvtShape
<
xtcl
::
Integer
>
(
out_dims
)));
}
}
else
if
(
x_dims
.
size
()
==
2
&&
y_dims
.
size
()
==
2
)
{
// x: [M, K], y: [K, N], out: [M, N]
if
(
transpose_x
)
{
x_node
=
graph
->
AddNode
(
x_name
+
"/transpose"
,
graph
->
builder_
.
CreateTranspose
(
*
x_node
,
{
1
,
0
}));
}
auto
matmul_node
=
graph
->
AddNode
(
out_name
,
graph
->
builder_
.
CreateMatmul2D
(
*
x_node
,
*
y_node
,
transpose_y
));
if
(
fabs
(
alpha
-
1
)
>
1e-6
f
)
{
matmul_node
=
graph
->
AddNode
(
out_name
,
graph
->
builder_
.
CreateScale
(
*
matmul_node
,
alpha
));
}
}
else
if
(
x_dims
.
size
()
==
1
&&
y_dims
.
size
()
==
1
)
{
// x: [K], y: [K], out: [1]
// x: [M], y: [N], x_transpose: true, y_transpose: true, out: [M, N]
LOG
(
FATAL
)
<<
"[XPU] Not supported."
;
return
FAILED
;
}
return
REBUILD_WHEN_SHAPE_CHANGED
;
}
}
}
// namespace xpu
}
// namespace xpu
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录