Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
1a64347a
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看板
未验证
提交
1a64347a
编写于
4月 24, 2020
作者:
H
HappyAngel
提交者:
GitHub
4月 24, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[arm] add scale+relu/relu6/leakyrelu fusion (#3461)
* add scale+relu/relu6/leakyrelu test=develop * fix format, test=develop
上级
4d495329
变更
13
展开全部
显示空白变更内容
内联
并排
Showing
13 changed file
with
767 addition
and
18 deletion
+767
-18
lite/api/paddle_use_passes.h
lite/api/paddle_use_passes.h
+1
-0
lite/backends/arm/math/scale.cc
lite/backends/arm/math/scale.cc
+525
-17
lite/backends/arm/math/scale.h
lite/backends/arm/math/scale.h
+9
-0
lite/core/mir/CMakeLists.txt
lite/core/mir/CMakeLists.txt
+1
-0
lite/core/mir/fusion/CMakeLists.txt
lite/core/mir/fusion/CMakeLists.txt
+4
-0
lite/core/mir/fusion/scale_activation_fuse_pass.cc
lite/core/mir/fusion/scale_activation_fuse_pass.cc
+39
-0
lite/core/mir/fusion/scale_activation_fuse_pass.h
lite/core/mir/fusion/scale_activation_fuse_pass.h
+32
-0
lite/core/mir/fusion/scale_activation_fuser.cc
lite/core/mir/fusion/scale_activation_fuser.cc
+84
-0
lite/core/mir/fusion/scale_activation_fuser.h
lite/core/mir/fusion/scale_activation_fuser.h
+42
-0
lite/core/optimizer.h
lite/core/optimizer.h
+1
-0
lite/kernels/arm/scale_compute.cc
lite/kernels/arm/scale_compute.cc
+12
-1
lite/operators/op_params.h
lite/operators/op_params.h
+3
-0
lite/operators/scale_op.cc
lite/operators/scale_op.cc
+14
-0
未找到文件。
lite/api/paddle_use_passes.h
浏览文件 @
1a64347a
...
@@ -52,6 +52,7 @@ USE_MIR_PASS(mlu_postprocess_pass);
...
@@ -52,6 +52,7 @@ USE_MIR_PASS(mlu_postprocess_pass);
USE_MIR_PASS
(
weight_quantization_preprocess_pass
);
USE_MIR_PASS
(
weight_quantization_preprocess_pass
);
USE_MIR_PASS
(
apu_subgraph_pass
);
USE_MIR_PASS
(
apu_subgraph_pass
);
USE_MIR_PASS
(
quantized_op_attributes_inference_pass
);
USE_MIR_PASS
(
quantized_op_attributes_inference_pass
);
USE_MIR_PASS
(
lite_scale_activation_fuse_pass
);
USE_MIR_PASS
(
__xpu__resnet_fuse_pass
);
USE_MIR_PASS
(
__xpu__resnet_fuse_pass
);
USE_MIR_PASS
(
__xpu__multi_encoder_fuse_pass
);
USE_MIR_PASS
(
__xpu__multi_encoder_fuse_pass
);
USE_MIR_PASS
(
__xpu__embedding_with_eltwise_add_fuse_pass
);
USE_MIR_PASS
(
__xpu__embedding_with_eltwise_add_fuse_pass
);
...
...
lite/backends/arm/math/scale.cc
浏览文件 @
1a64347a
此差异已折叠。
点击以展开。
lite/backends/arm/math/scale.h
浏览文件 @
1a64347a
...
@@ -40,6 +40,15 @@ void scale_compute_basic(const operators::ScaleParam& param) {
...
@@ -40,6 +40,15 @@ void scale_compute_basic(const operators::ScaleParam& param) {
template
<
typename
T
>
template
<
typename
T
>
void
scale
(
const
T
*
din
,
T
*
dout
,
int
num
,
T
scale
,
T
bias
);
void
scale
(
const
T
*
din
,
T
*
dout
,
int
num
,
T
scale
,
T
bias
);
template
<
typename
T
>
void
scale_relu
(
const
T
*
din
,
T
*
dout
,
int
num
,
T
scale
,
T
bias
);
template
<
typename
T
>
void
scale_relu6
(
const
T
*
din
,
T
*
dout
,
int
num
,
T
scale
,
T
bias
,
T
alpha
);
template
<
typename
T
>
void
scale_leaky_relu
(
const
T
*
din
,
T
*
dout
,
int
num
,
T
scale
,
T
bias
,
T
alpha
);
template
<
typename
T
>
template
<
typename
T
>
void
scale
(
const
T
*
din
,
void
scale
(
const
T
*
din
,
T
*
dout
,
T
*
dout
,
...
...
lite/core/mir/CMakeLists.txt
浏览文件 @
1a64347a
...
@@ -21,6 +21,7 @@ lite_cc_library(mir_passes
...
@@ -21,6 +21,7 @@ lite_cc_library(mir_passes
fusion/elementwise_add_activation_fuse_pass.cc
fusion/elementwise_add_activation_fuse_pass.cc
fusion/quant_dequant_fuse_pass.cc
fusion/quant_dequant_fuse_pass.cc
fusion/sequence_pool_concat_fuse_pass.cc
fusion/sequence_pool_concat_fuse_pass.cc
fusion/scale_activation_fuse_pass.cc
fusion/__xpu__resnet_fuse_pass.cc
fusion/__xpu__resnet_fuse_pass.cc
fusion/__xpu__multi_encoder_fuse_pass.cc
fusion/__xpu__multi_encoder_fuse_pass.cc
fusion/__xpu__embedding_with_eltwise_add_fuse_pass.cc
fusion/__xpu__embedding_with_eltwise_add_fuse_pass.cc
...
...
lite/core/mir/fusion/CMakeLists.txt
浏览文件 @
1a64347a
...
@@ -31,6 +31,9 @@ lite_cc_library(fuse_interpolate
...
@@ -31,6 +31,9 @@ lite_cc_library(fuse_interpolate
lite_cc_library
(
fuse_sequence_pool_concat
lite_cc_library
(
fuse_sequence_pool_concat
SRCS sequence_pool_concat_fuser.cc
SRCS sequence_pool_concat_fuser.cc
DEPS pattern_matcher_high_api
)
DEPS pattern_matcher_high_api
)
lite_cc_library
(
fuse_scale_activation
SRCS scale_activation_fuser.cc
DEPS pattern_matcher_high_api
)
set
(
mir_fusers
set
(
mir_fusers
fuse_fc
fuse_fc
...
@@ -44,6 +47,7 @@ set(mir_fusers
...
@@ -44,6 +47,7 @@ set(mir_fusers
fuse_transpose_softmax_transpose
fuse_transpose_softmax_transpose
fuse_interpolate
fuse_interpolate
fuse_sequence_pool_concat
fuse_sequence_pool_concat
fuse_scale_activation
CACHE INTERNAL
"fusers"
)
CACHE INTERNAL
"fusers"
)
if
(
LITE_WITH_LIGHT_WEIGHT_FRAMEWORK
)
if
(
LITE_WITH_LIGHT_WEIGHT_FRAMEWORK
)
...
...
lite/core/mir/fusion/scale_activation_fuse_pass.cc
0 → 100644
浏览文件 @
1a64347a
// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "lite/core/mir/fusion/scale_activation_fuse_pass.h"
#include <memory>
#include <vector>
#include "lite/core/mir/fusion/scale_activation_fuser.h"
#include "lite/core/mir/pass_registry.h"
namespace
paddle
{
namespace
lite
{
namespace
mir
{
void
ScaleActivationFusePass
::
Apply
(
const
std
::
unique_ptr
<
SSAGraph
>&
graph
)
{
for
(
auto
act_type
:
{
"relu"
,
"relu6"
,
"leaky_relu"
})
{
fusion
::
ScaleActivationFuser
fuser
(
act_type
);
fuser
(
graph
.
get
());
}
}
}
// namespace mir
}
// namespace lite
}
// namespace paddle
REGISTER_MIR_PASS
(
lite_scale_activation_fuse_pass
,
paddle
::
lite
::
mir
::
ScaleActivationFusePass
)
.
BindTargets
({
TARGET
(
kARM
)})
.
BindKernel
(
"scale"
);
lite/core/mir/fusion/scale_activation_fuse_pass.h
0 → 100644
浏览文件 @
1a64347a
// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <memory>
#include <string>
#include "lite/core/mir/pass.h"
namespace
paddle
{
namespace
lite
{
namespace
mir
{
class
ScaleActivationFusePass
:
public
ProgramPass
{
public:
void
Apply
(
const
std
::
unique_ptr
<
SSAGraph
>&
graph
)
override
;
};
}
// namespace mir
}
// namespace lite
}
// namespace paddle
lite/core/mir/fusion/scale_activation_fuser.cc
0 → 100644
浏览文件 @
1a64347a
// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "lite/core/mir/fusion/scale_activation_fuser.h"
#include <memory>
#include <vector>
namespace
paddle
{
namespace
lite
{
namespace
mir
{
namespace
fusion
{
void
ScaleActivationFuser
::
BuildPattern
()
{
// create input nodes.
auto
*
x
=
VarNode
(
"x"
)
->
assert_is_op_input
(
"scale"
,
"X"
)
->
AsInput
();
// create op nodes
auto
*
scale
=
OpNode
(
"scale"
,
"scale"
)
->
assert_is_op
(
"scale"
)
->
AsIntermediate
();
auto
*
act
=
OpNode
(
"act"
,
act_type_
)
->
assert_is_op
(
act_type_
)
->
AsIntermediate
();
// create intermediate nodes
auto
*
scale_out
=
VarNode
(
"scale_out"
)
->
assert_is_op_output
(
"scale"
,
"Out"
)
->
assert_is_op_input
(
act_type_
,
"X"
)
->
AsIntermediate
();
// create output node
auto
*
out
=
VarNode
(
"output"
)
->
assert_is_op_output
(
act_type_
,
"Out"
)
->
AsOutput
();
// create topology.
*
x
>>
*
scale
>>
*
scale_out
;
*
scale_out
>>
*
act
>>
*
out
;
}
void
ScaleActivationFuser
::
InsertNewNode
(
SSAGraph
*
graph
,
const
key2nodes_t
&
matched
)
{
auto
op_desc
=
GenOpDesc
(
matched
);
auto
scale_op
=
LiteOpRegistry
::
Global
().
Create
(
"scale"
);
auto
scale
=
matched
.
at
(
"scale"
)
->
stmt
()
->
op
();
auto
*
scope
=
scale
->
scope
();
auto
&
valid_places
=
scale
->
valid_places
();
scale_op
->
Attach
(
op_desc
,
scope
);
auto
*
new_op_node
=
graph
->
GraphCreateInstructNode
(
scale_op
,
valid_places
);
IR_NODE_LINK_TO
(
matched
.
at
(
"x"
),
new_op_node
);
IR_NODE_LINK_TO
(
new_op_node
,
matched
.
at
(
"output"
));
}
cpp
::
OpDesc
ScaleActivationFuser
::
GenOpDesc
(
const
key2nodes_t
&
matched
)
{
cpp
::
OpDesc
op_desc
=
*
matched
.
at
(
"scale"
)
->
stmt
()
->
op_info
();
op_desc
.
SetOutput
(
"Out"
,
{
matched
.
at
(
"output"
)
->
arg
()
->
name
});
cpp
::
OpDesc
act_op_desc
=
*
matched
.
at
(
"act"
)
->
stmt
()
->
op_info
();
op_desc
.
SetAttr
(
"activation_type"
,
act_type_
);
if
(
act_type_
==
"relu"
)
{
op_desc
.
SetAttr
(
"fuse_relu"
,
true
);
}
else
if
(
act_type_
==
"relu6"
)
{
float
alpha
=
act_op_desc
.
GetAttr
<
float
>
(
"threshold"
);
op_desc
.
SetAttr
(
"alpha"
,
alpha
);
}
else
if
(
act_type_
==
"leaky_relu"
)
{
float
alpha
=
act_op_desc
.
GetAttr
<
float
>
(
"alpha"
);
op_desc
.
SetAttr
(
"alpha"
,
alpha
);
}
return
op_desc
;
}
}
// namespace fusion
}
// namespace mir
}
// namespace lite
}
// namespace paddle
lite/core/mir/fusion/scale_activation_fuser.h
0 → 100644
浏览文件 @
1a64347a
// Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
#include <memory>
#include <string>
#include "lite/core/mir/pattern_matcher_high_api.h"
namespace
paddle
{
namespace
lite
{
namespace
mir
{
namespace
fusion
{
class
ScaleActivationFuser
:
public
FuseBase
{
public:
explicit
ScaleActivationFuser
(
const
std
::
string
&
act_type
)
{
act_type_
=
act_type
;
}
void
BuildPattern
()
override
;
void
InsertNewNode
(
SSAGraph
*
graph
,
const
key2nodes_t
&
matched
)
override
;
private:
cpp
::
OpDesc
GenOpDesc
(
const
key2nodes_t
&
matched
)
override
;
std
::
string
act_type_
;
};
}
// namespace fusion
}
// namespace mir
}
// namespace lite
}
// namespace paddle
lite/core/optimizer.h
浏览文件 @
1a64347a
...
@@ -71,6 +71,7 @@ class Optimizer {
...
@@ -71,6 +71,7 @@ class Optimizer {
"identity_scale_eliminate_pass"
,
//
"identity_scale_eliminate_pass"
,
//
"elementwise_mul_constant_eliminate_pass"
,
//
"elementwise_mul_constant_eliminate_pass"
,
//
"lite_sequence_pool_concat_fuse_pass"
,
//
"lite_sequence_pool_concat_fuse_pass"
,
//
"lite_scale_activation_fuse_pass"
,
//
#if (defined LITE_WITH_LIGHT_WEIGHT_FRAMEWORK) || (defined LITE_WITH_CUDA) || \
#if (defined LITE_WITH_LIGHT_WEIGHT_FRAMEWORK) || (defined LITE_WITH_CUDA) || \
(defined LITE_WITH_ARM)
(defined LITE_WITH_ARM)
"lite_elementwise_add_activation_fuse_pass"
,
//
"lite_elementwise_add_activation_fuse_pass"
,
//
...
...
lite/kernels/arm/scale_compute.cc
浏览文件 @
1a64347a
...
@@ -31,7 +31,18 @@ void ScaleCompute<T, PType>::Run() {
...
@@ -31,7 +31,18 @@ void ScaleCompute<T, PType>::Run() {
if
(
!
param
.
bias_after_scale
)
{
if
(
!
param
.
bias_after_scale
)
{
bias
*=
scale
;
bias
*=
scale
;
}
}
T
alpha
=
param
.
alpha
;
if
(
param
.
activation_type
==
""
)
{
// no act
lite
::
arm
::
math
::
scale
<
T
>
(
x_data
,
output_data
,
num
,
scale
,
bias
);
lite
::
arm
::
math
::
scale
<
T
>
(
x_data
,
output_data
,
num
,
scale
,
bias
);
}
else
if
(
param
.
activation_type
==
"relu"
)
{
// do relu
lite
::
arm
::
math
::
scale_relu
<
T
>
(
x_data
,
output_data
,
num
,
scale
,
bias
);
}
else
if
(
param
.
activation_type
==
"relu6"
)
{
// do relu6
lite
::
arm
::
math
::
scale_relu6
<
T
>
(
x_data
,
output_data
,
num
,
scale
,
bias
,
alpha
);
}
else
if
(
param
.
activation_type
==
"leaky_relu"
)
{
// do leaky_relu
lite
::
arm
::
math
::
scale_leaky_relu
<
T
>
(
x_data
,
output_data
,
num
,
scale
,
bias
,
alpha
);
}
if
(
!
param
.
x
->
lod
().
empty
())
{
if
(
!
param
.
x
->
lod
().
empty
())
{
param
.
output
->
set_lod
(
param
.
x
->
lod
());
param
.
output
->
set_lod
(
param
.
x
->
lod
());
}
}
...
...
lite/operators/op_params.h
浏览文件 @
1a64347a
...
@@ -244,6 +244,9 @@ struct ScaleParam : ParamBase {
...
@@ -244,6 +244,9 @@ struct ScaleParam : ParamBase {
float
scale
{
1.
};
float
scale
{
1.
};
float
bias
{};
float
bias
{};
bool
bias_after_scale
{
true
};
bool
bias_after_scale
{
true
};
std
::
string
activation_type
{
""
};
bool
fuse_relu
{
false
};
float
alpha
{
6.
};
///////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
// get a vector of input tensors
// get a vector of input tensors
const
std
::
vector
<
const
Tensor
*>*
input_tensor_ptrs
()
override
{
const
std
::
vector
<
const
Tensor
*>*
input_tensor_ptrs
()
override
{
...
...
lite/operators/scale_op.cc
浏览文件 @
1a64347a
...
@@ -38,6 +38,20 @@ bool ScaleOp::AttachImpl(const cpp::OpDesc &op_desc, lite::Scope *scope) {
...
@@ -38,6 +38,20 @@ bool ScaleOp::AttachImpl(const cpp::OpDesc &op_desc, lite::Scope *scope) {
param_
.
scale
=
op_desc
.
GetAttr
<
float
>
(
"scale"
);
param_
.
scale
=
op_desc
.
GetAttr
<
float
>
(
"scale"
);
param_
.
bias
=
op_desc
.
GetAttr
<
float
>
(
"bias"
);
param_
.
bias
=
op_desc
.
GetAttr
<
float
>
(
"bias"
);
param_
.
bias_after_scale
=
op_desc
.
GetAttr
<
bool
>
(
"bias_after_scale"
);
param_
.
bias_after_scale
=
op_desc
.
GetAttr
<
bool
>
(
"bias_after_scale"
);
if
(
op_desc
.
HasAttr
(
"activation_type"
))
{
auto
act_type
=
op_desc
.
GetAttr
<
std
::
string
>
(
"activation_type"
);
param_
.
activation_type
=
act_type
;
if
(
act_type
==
"relu"
)
{
param_
.
fuse_relu
=
true
;
}
else
if
(
act_type
==
"relu6"
)
{
param_
.
alpha
=
op_desc
.
GetAttr
<
float
>
(
"alpha"
);
// 6.f
}
else
if
(
act_type
==
"leaky_relu"
)
{
param_
.
alpha
=
op_desc
.
GetAttr
<
float
>
(
"alpha"
);
}
else
{
CHECK
(
false
)
<<
"The fused conv only supports fuse with relu and leaky relu"
;
}
}
CHECK
(
param_
.
x
);
CHECK
(
param_
.
x
);
CHECK
(
param_
.
output
);
CHECK
(
param_
.
output
);
return
true
;
return
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录