Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
db658bec
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看板
提交
db658bec
编写于
9月 14, 2020
作者:
Z
zhangwen31
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[arm][kernel] refactor: elementwise-sub uses template now
上级
b059fb33
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
16 addition
and
17 deletion
+16
-17
lite/kernels/arm/elementwise_compute.cc
lite/kernels/arm/elementwise_compute.cc
+13
-14
lite/kernels/arm/elementwise_compute.h
lite/kernels/arm/elementwise_compute.h
+2
-2
lite/tests/kernels/elementwise_grad_compute_test.cc
lite/tests/kernels/elementwise_grad_compute_test.cc
+1
-1
未找到文件。
lite/kernels/arm/elementwise_compute.cc
浏览文件 @
db658bec
...
@@ -132,24 +132,25 @@ void ElementwiseAddActivationCompute::Run() {
...
@@ -132,24 +132,25 @@ void ElementwiseAddActivationCompute::Run() {
}
}
}
}
void
ElementwiseSubCompute
::
Run
()
{
template
<
typename
T
,
PrecisionType
PType
>
auto
&
param
=
Param
<
operators
::
ElementwiseParam
>
();
void
ElementwiseSubCompute
<
T
,
PType
>::
Run
()
{
const
float
*
x_data
=
param
.
X
->
data
<
float
>
();
auto
&
param
=
this
->
template
Param
<
operators
::
ElementwiseParam
>();
const
float
*
y_data
=
param
.
Y
->
data
<
float
>
();
const
T
*
x_data
=
param
.
X
->
template
data
<
T
>();
float
*
out_data
=
param
.
Out
->
mutable_data
<
float
>
();
const
T
*
y_data
=
param
.
Y
->
template
data
<
T
>();
T
*
out_data
=
param
.
Out
->
template
mutable_data
<
T
>();
int
axis
=
param
.
axis
;
int
axis
=
param
.
axis
;
auto
x_dims
=
param
.
X
->
dims
();
auto
x_dims
=
param
.
X
->
dims
();
auto
y_dims
=
param
.
Y
->
dims
();
auto
y_dims
=
param
.
Y
->
dims
();
int
pre
,
n
,
post
;
int
pre
,
n
,
post
;
if
(
x_dims
.
size
()
<
y_dims
.
size
()
&&
if
(
x_dims
.
size
()
<
y_dims
.
size
()
&&
is_broadcast
(
y_dims
,
x_dims
,
axis
,
&
pre
,
&
n
,
&
post
))
{
is_broadcast
(
y_dims
,
x_dims
,
axis
,
&
pre
,
&
n
,
&
post
))
{
lite
::
arm
::
math
::
elementwise_sub_broadcast
(
lite
::
arm
::
math
::
elementwise_sub_broadcast
<
T
>
(
y_data
,
x_data
,
out_data
,
pre
,
n
,
post
);
y_data
,
x_data
,
out_data
,
pre
,
n
,
post
);
}
else
if
(
is_broadcast
(
x_dims
,
y_dims
,
axis
,
&
pre
,
&
n
,
&
post
))
{
}
else
if
(
is_broadcast
(
x_dims
,
y_dims
,
axis
,
&
pre
,
&
n
,
&
post
))
{
lite
::
arm
::
math
::
elementwise_sub_broadcast
(
lite
::
arm
::
math
::
elementwise_sub_broadcast
<
T
>
(
x_data
,
y_data
,
out_data
,
pre
,
n
,
post
);
x_data
,
y_data
,
out_data
,
pre
,
n
,
post
);
}
else
{
}
else
{
lite
::
arm
::
math
::
elementwise_sub
(
lite
::
arm
::
math
::
elementwise_sub
<
T
>
(
x_data
,
y_data
,
out_data
,
x_dims
.
production
());
x_data
,
y_data
,
out_data
,
x_dims
.
production
());
}
}
}
}
...
@@ -419,12 +420,10 @@ REGISTER_LITE_KERNEL(
...
@@ -419,12 +420,10 @@ REGISTER_LITE_KERNEL(
.
BindOutput
(
"Out"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
BindOutput
(
"Out"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
Finalize
();
.
Finalize
();
REGISTER_LITE_KERNEL
(
elementwise_sub
,
using
elementwise_sub_float_t
=
kARM
,
paddle
::
lite
::
kernels
::
arm
::
ElementwiseSubCompute
<
float
,
PRECISION
(
kFloat
)
>
;
kFloat
,
REGISTER_LITE_KERNEL
(
kNCHW
,
elementwise_sub
,
kARM
,
kFloat
,
kNCHW
,
elementwise_sub_float_t
,
def
)
paddle
::
lite
::
kernels
::
arm
::
ElementwiseSubCompute
,
def
)
.
BindInput
(
"X"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
BindInput
(
"X"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
BindInput
(
"Y"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
BindInput
(
"Y"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
BindOutput
(
"Out"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
.
BindOutput
(
"Out"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
))})
...
...
lite/kernels/arm/elementwise_compute.h
浏览文件 @
db658bec
...
@@ -38,8 +38,8 @@ class ElementwiseAddActivationCompute
...
@@ -38,8 +38,8 @@ class ElementwiseAddActivationCompute
virtual
~
ElementwiseAddActivationCompute
()
=
default
;
virtual
~
ElementwiseAddActivationCompute
()
=
default
;
};
};
class
ElementwiseSubCompute
template
<
typename
T
,
PrecisionType
PType
>
:
public
KernelLite
<
TARGET
(
kARM
),
PRECISION
(
kFloat
)
>
{
class
ElementwiseSubCompute
:
public
KernelLite
<
TARGET
(
kARM
),
PType
>
{
public:
public:
void
Run
()
override
;
void
Run
()
override
;
...
...
lite/tests/kernels/elementwise_grad_compute_test.cc
浏览文件 @
db658bec
...
@@ -27,7 +27,7 @@ using param_t = operators::ElementwiseParam;
...
@@ -27,7 +27,7 @@ using param_t = operators::ElementwiseParam;
using
grad_param_t
=
operators
::
ElementwiseGradParam
;
using
grad_param_t
=
operators
::
ElementwiseGradParam
;
using
kernel_add_t
=
ElementwiseAddCompute
<
float
,
PRECISION
(
kFloat
)
>
;
using
kernel_add_t
=
ElementwiseAddCompute
<
float
,
PRECISION
(
kFloat
)
>
;
using
grad_kernel_add_t
=
ElementwiseAddGradCompute
;
using
grad_kernel_add_t
=
ElementwiseAddGradCompute
;
using
kernel_sub_t
=
ElementwiseSubCompute
;
using
kernel_sub_t
=
ElementwiseSubCompute
<
float
,
PRECISION
(
kFloat
)
>
;
using
grad_kernel_sub_t
=
ElementwiseSubGradCompute
;
using
grad_kernel_sub_t
=
ElementwiseSubGradCompute
;
void
elementwise_common
(
grad_param_t
&
param
,
// NOLINT
void
elementwise_common
(
grad_param_t
&
param
,
// NOLINT
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录