Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
b865b6b4
P
Paddle-Lite
项目概览
PaddlePaddle
/
Paddle-Lite
通知
338
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看板
提交
b865b6b4
编写于
6月 20, 2018
作者:
L
liuruilong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format files
上级
2ac900b6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
22 deletion
+20
-22
src/operators/fusion_conv_add.h
src/operators/fusion_conv_add.h
+5
-5
src/operators/fusion_fc_op.h
src/operators/fusion_fc_op.h
+9
-10
src/operators/kernel/arm/conv_add_kernel.cpp
src/operators/kernel/arm/conv_add_kernel.cpp
+1
-2
src/operators/op_param.h
src/operators/op_param.h
+5
-5
未找到文件。
src/operators/fusion_conv_add.h
浏览文件 @
b865b6b4
...
...
@@ -48,13 +48,13 @@ class FusionConvAddMatcher : public framework::FusionOpMatcher {
template
<
typename
DeviceType
,
typename
T
>
class
FusionConvAddOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
,
FusionConvAddParam
,
operators
::
ConvAddKernel
<
DeviceType
,
T
>>
{
DeviceType
,
FusionConvAddParam
,
operators
::
ConvAddKernel
<
DeviceType
,
T
>>
{
public:
FusionConvAddOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
,
FusionConvAddParam
,
operators
::
ConvAddKernel
<
DeviceType
,
T
>>
(
type
,
inputs
,
outputs
,
attrs
,
scope
)
{}
...
...
src/operators/fusion_fc_op.h
浏览文件 @
b865b6b4
...
...
@@ -45,18 +45,17 @@ class FusionFcMatcher : public framework::FusionOpMatcher {
};
template
<
typename
DeviceType
,
typename
T
>
class
FusionFcOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
,
FusionFcParam
,
operators
::
FusionFcKernel
<
DeviceType
,
T
>>
{
class
FusionFcOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
,
FusionFcParam
,
operators
::
FusionFcKernel
<
DeviceType
,
T
>>
{
public:
FusionFcOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
,
FusionFcParam
,
operators
::
FusionFcKernel
<
DeviceType
,
T
>>
(
type
,
inputs
,
outputs
,
attrs
,
scope
)
{}
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
,
FusionFcParam
,
operators
::
FusionFcKernel
<
DeviceType
,
T
>>
(
type
,
inputs
,
outputs
,
attrs
,
scope
)
{}
using
framework
::
OperatorWithKernel
<
DeviceType
,
FusionFcParam
,
...
...
src/operators/kernel/arm/conv_add_kernel.cpp
浏览文件 @
b865b6b4
...
...
@@ -19,8 +19,7 @@ namespace paddle_mobile {
namespace
operators
{
template
<
>
void
ConvAddKernel
<
CPU
,
float
>::
Compute
(
const
FusionConvAddParam
&
param
)
const
{
void
ConvAddKernel
<
CPU
,
float
>::
Compute
(
const
FusionConvAddParam
&
param
)
const
{
const
Tensor
*
input
=
param
.
Input
();
Tensor
filter
=
*
param
.
Filter
();
Tensor
bias
=
*
param
.
Bias
();
...
...
src/operators/op_param.h
浏览文件 @
b865b6b4
...
...
@@ -755,7 +755,7 @@ class ReluParam : public OpParam {
class
FusionFcParam
:
public
OpParam
{
public:
FusionFcParam
(
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
const
Scope
&
scope
)
{
const
AttributeMap
&
attrs
,
const
Scope
&
scope
)
{
input_x_
=
InputXFrom
<
LoDTensor
>
(
inputs
,
scope
);
input_y_
=
InputYFrom
<
LoDTensor
>
(
inputs
,
scope
);
input_z_
=
InputZFrom
<
LoDTensor
>
(
inputs
,
scope
);
...
...
@@ -793,8 +793,8 @@ class FusionFcParam : public OpParam {
class
FusionConvAddParam
:
public
OpParam
{
public:
FusionConvAddParam
(
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
const
Scope
&
scope
)
{
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
const
Scope
&
scope
)
{
bias_
=
InputYFrom
<
LoDTensor
>
(
inputs
,
scope
);
axis_
=
GetAttr
<
int
>
(
"axis"
,
attrs
);
filter_
=
FilterFrom
<
LoDTensor
>
(
inputs
,
scope
);
...
...
@@ -842,8 +842,8 @@ Print &operator<<(Print &printer, const FusionConvAddParam &conv_param);
class
FusionConvAddReluParam
:
public
FusionConvAddParam
{
public:
FusionConvAddReluParam
(
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
const
Scope
&
scope
)
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
const
Scope
&
scope
)
:
FusionConvAddParam
(
inputs
,
outputs
,
attrs
,
scope
)
{}
};
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录