Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
8e241b08
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看板
提交
8e241b08
编写于
6月 27, 2018
作者:
L
liuruilong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format files
上级
0a93ea55
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
19 addition
and
18 deletion
+19
-18
src/framework/operator.h
src/framework/operator.h
+1
-3
src/io/io.cpp
src/io/io.cpp
+2
-2
src/operators/kernel/arm/box_coder_kernel.cpp
src/operators/kernel/arm/box_coder_kernel.cpp
+1
-1
src/operators/kernel/arm/conv_add_relu_kernel.cpp
src/operators/kernel/arm/conv_add_relu_kernel.cpp
+2
-1
src/operators/kernel/arm/elementwise_add_kernel.cpp
src/operators/kernel/arm/elementwise_add_kernel.cpp
+2
-1
src/operators/kernel/arm/multiclass_nms_kernel.cpp
src/operators/kernel/arm/multiclass_nms_kernel.cpp
+2
-1
src/operators/kernel/arm/transpose_kernel.cpp
src/operators/kernel/arm/transpose_kernel.cpp
+1
-1
src/operators/kernel/box_coder_kernel.h
src/operators/kernel/box_coder_kernel.h
+1
-1
src/operators/kernel/fusion_fc_kernel.h
src/operators/kernel/fusion_fc_kernel.h
+1
-1
src/operators/kernel/multiclass_nms_kernel.h
src/operators/kernel/multiclass_nms_kernel.h
+1
-1
src/operators/kernel/prior_box_kernel.h
src/operators/kernel/prior_box_kernel.h
+1
-1
src/operators/kernel/relu_kernel.h
src/operators/kernel/relu_kernel.h
+1
-1
src/operators/kernel/reshape_kernel.h
src/operators/kernel/reshape_kernel.h
+1
-1
src/operators/kernel/sigmoid_kernel.h
src/operators/kernel/sigmoid_kernel.h
+1
-1
src/operators/kernel/transpose_kernel.h
src/operators/kernel/transpose_kernel.h
+1
-1
未找到文件。
src/framework/operator.h
浏览文件 @
8e241b08
...
@@ -111,9 +111,7 @@ class OperatorWithKernel : public OperatorBase<Dtype> {
...
@@ -111,9 +111,7 @@ class OperatorWithKernel : public OperatorBase<Dtype> {
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
const
VariableNameMap
&
outputs
,
const
AttributeMap
&
attrs
,
std
::
shared_ptr
<
Scope
>
scope
)
std
::
shared_ptr
<
Scope
>
scope
)
:
OperatorBase
<
Dtype
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
:
OperatorBase
<
Dtype
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
param_
(
inputs
,
outputs
,
attrs
,
*
scope
)
{
param_
(
inputs
,
outputs
,
attrs
,
*
scope
)
{}
}
virtual
void
RunImpl
()
const
{
this
->
kernel_
.
Compute
(
this
->
param_
);
}
virtual
void
RunImpl
()
const
{
this
->
kernel_
.
Compute
(
this
->
param_
);
}
...
...
src/io/io.cpp
浏览文件 @
8e241b08
...
@@ -200,9 +200,9 @@ Executor<Dtype, P>::Executor(const framework::Program<Dtype> p, int batch_size,
...
@@ -200,9 +200,9 @@ Executor<Dtype, P>::Executor(const framework::Program<Dtype> p, int batch_size,
}
}
std
::
shared_ptr
<
framework
::
BlockDesc
>
to_predict_block
=
std
::
shared_ptr
<
framework
::
BlockDesc
>
to_predict_block
=
to_predict_program_
->
Block
(
0
);
to_predict_program_
->
Block
(
0
);
auto
&
ops
=
ops_of_block_
[
*
to_predict_block
.
get
()];
auto
&
ops
=
ops_of_block_
[
*
to_predict_block
.
get
()];
for
(
const
auto
&
op
:
ops
)
{
for
(
const
auto
&
op
:
ops
)
{
op
->
Init
();
op
->
Init
();
}
}
}
}
...
...
src/operators/kernel/arm/box_coder_kernel.cpp
浏览文件 @
8e241b08
...
@@ -110,7 +110,7 @@ void DecodeCenterSize(const framework::Tensor& target_box,
...
@@ -110,7 +110,7 @@ void DecodeCenterSize(const framework::Tensor& target_box,
}
}
template
<
>
template
<
>
bool
BoxCoderKernel
<
CPU
,
float
>::
Init
(
const
BoxCoderParam
&
para
)
const
{
bool
BoxCoderKernel
<
CPU
,
float
>::
Init
(
const
BoxCoderParam
&
para
)
const
{
return
true
;
return
true
;
}
}
...
...
src/operators/kernel/arm/conv_add_relu_kernel.cpp
浏览文件 @
8e241b08
...
@@ -20,7 +20,8 @@ namespace paddle_mobile {
...
@@ -20,7 +20,8 @@ namespace paddle_mobile {
namespace
operators
{
namespace
operators
{
template
<
>
template
<
>
bool
ConvAddReluKernel
<
CPU
,
float
>::
Init
(
const
FusionConvAddReluParam
&
para
)
const
{
bool
ConvAddReluKernel
<
CPU
,
float
>::
Init
(
const
FusionConvAddReluParam
&
para
)
const
{
return
true
;
return
true
;
}
}
...
...
src/operators/kernel/arm/elementwise_add_kernel.cpp
浏览文件 @
8e241b08
...
@@ -27,7 +27,8 @@ struct AddFunctor {
...
@@ -27,7 +27,8 @@ struct AddFunctor {
};
};
template
<
>
template
<
>
bool
ElementwiseAddKernel
<
CPU
,
float
>::
Init
(
const
ElementwiseAddParam
&
para
)
const
{
bool
ElementwiseAddKernel
<
CPU
,
float
>::
Init
(
const
ElementwiseAddParam
&
para
)
const
{
return
true
;
return
true
;
}
}
...
...
src/operators/kernel/arm/multiclass_nms_kernel.cpp
浏览文件 @
8e241b08
...
@@ -206,7 +206,8 @@ void MultiClassOutput(const Tensor& scores, const Tensor& bboxes,
...
@@ -206,7 +206,8 @@ void MultiClassOutput(const Tensor& scores, const Tensor& bboxes,
}
}
template
<
>
template
<
>
bool
MultiClassNMSKernel
<
CPU
,
float
>::
Init
(
const
MultiClassNMSParam
&
para
)
const
{
bool
MultiClassNMSKernel
<
CPU
,
float
>::
Init
(
const
MultiClassNMSParam
&
para
)
const
{
return
true
;
return
true
;
}
}
...
...
src/operators/kernel/arm/transpose_kernel.cpp
浏览文件 @
8e241b08
...
@@ -35,7 +35,7 @@ namespace operators {
...
@@ -35,7 +35,7 @@ namespace operators {
// }
// }
template
<
>
template
<
>
bool
TransposeKernel
<
CPU
,
float
>::
Init
(
const
TransposeParam
&
para
)
const
{
bool
TransposeKernel
<
CPU
,
float
>::
Init
(
const
TransposeParam
&
para
)
const
{
return
true
;
return
true
;
}
}
...
...
src/operators/kernel/box_coder_kernel.h
浏览文件 @
8e241b08
...
@@ -30,7 +30,7 @@ class BoxCoderKernel
...
@@ -30,7 +30,7 @@ class BoxCoderKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
BoxCoderParam
>
{
:
public
framework
::
OpKernelBase
<
DeviceType
,
BoxCoderParam
>
{
public:
public:
void
Compute
(
const
BoxCoderParam
&
param
)
const
;
void
Compute
(
const
BoxCoderParam
&
param
)
const
;
bool
Init
(
const
BoxCoderParam
&
para
)
const
;
bool
Init
(
const
BoxCoderParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/fusion_fc_kernel.h
浏览文件 @
8e241b08
...
@@ -28,7 +28,7 @@ class FusionFcKernel
...
@@ -28,7 +28,7 @@ class FusionFcKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
FusionFcParam
>
{
:
public
framework
::
OpKernelBase
<
DeviceType
,
FusionFcParam
>
{
public:
public:
void
Compute
(
const
FusionFcParam
&
param
)
const
;
void
Compute
(
const
FusionFcParam
&
param
)
const
;
bool
Init
(
const
FusionFcParam
&
para
)
const
;
bool
Init
(
const
FusionFcParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/multiclass_nms_kernel.h
浏览文件 @
8e241b08
...
@@ -28,7 +28,7 @@ class MultiClassNMSKernel
...
@@ -28,7 +28,7 @@ class MultiClassNMSKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
MultiClassNMSParam
>
{
:
public
framework
::
OpKernelBase
<
DeviceType
,
MultiClassNMSParam
>
{
public:
public:
void
Compute
(
const
MultiClassNMSParam
&
param
)
const
;
void
Compute
(
const
MultiClassNMSParam
&
param
)
const
;
bool
Init
(
const
MultiClassNMSParam
&
para
)
const
;
bool
Init
(
const
MultiClassNMSParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/prior_box_kernel.h
浏览文件 @
8e241b08
...
@@ -54,7 +54,7 @@ class PriorBoxKernel
...
@@ -54,7 +54,7 @@ class PriorBoxKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
PriorBoxParam
>
{
:
public
framework
::
OpKernelBase
<
DeviceType
,
PriorBoxParam
>
{
public:
public:
void
Compute
(
const
PriorBoxParam
&
param
)
const
;
void
Compute
(
const
PriorBoxParam
&
param
)
const
;
bool
Init
(
const
PriorBoxParam
&
para
)
const
;
bool
Init
(
const
PriorBoxParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/relu_kernel.h
浏览文件 @
8e241b08
...
@@ -27,7 +27,7 @@ template <typename DeviceType, typename T>
...
@@ -27,7 +27,7 @@ template <typename DeviceType, typename T>
class
ReluKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
ReluParam
>
{
class
ReluKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
ReluParam
>
{
public:
public:
void
Compute
(
const
ReluParam
&
param
)
const
;
void
Compute
(
const
ReluParam
&
param
)
const
;
bool
Init
(
const
ReluParam
&
para
)
const
;
bool
Init
(
const
ReluParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/reshape_kernel.h
浏览文件 @
8e241b08
...
@@ -71,7 +71,7 @@ template <typename DeviceType, typename T>
...
@@ -71,7 +71,7 @@ template <typename DeviceType, typename T>
class
ReshapeKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
ReshapeParam
>
{
class
ReshapeKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
ReshapeParam
>
{
public:
public:
void
Compute
(
const
ReshapeParam
&
param
)
const
;
void
Compute
(
const
ReshapeParam
&
param
)
const
;
bool
Init
(
const
ReshapeParam
&
para
)
const
;
bool
Init
(
const
ReshapeParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/sigmoid_kernel.h
浏览文件 @
8e241b08
...
@@ -26,7 +26,7 @@ template <typename DeviceType, typename T>
...
@@ -26,7 +26,7 @@ template <typename DeviceType, typename T>
class
SigmoidKernel
:
public
OpKernelBase
<
DeviceType
,
SigmoidParam
>
{
class
SigmoidKernel
:
public
OpKernelBase
<
DeviceType
,
SigmoidParam
>
{
public:
public:
void
Compute
(
const
SigmoidParam
&
param
)
const
override
;
void
Compute
(
const
SigmoidParam
&
param
)
const
override
;
bool
Init
(
const
SigmoidParam
&
para
)
const
;
bool
Init
(
const
SigmoidParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
src/operators/kernel/transpose_kernel.h
浏览文件 @
8e241b08
...
@@ -29,7 +29,7 @@ class TransposeKernel
...
@@ -29,7 +29,7 @@ class TransposeKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
TransposeParam
>
{
:
public
framework
::
OpKernelBase
<
DeviceType
,
TransposeParam
>
{
public:
public:
void
Compute
(
const
TransposeParam
&
param
)
const
;
void
Compute
(
const
TransposeParam
&
param
)
const
;
bool
Init
(
const
TransposeParam
&
para
)
const
;
bool
Init
(
const
TransposeParam
&
para
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录