Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
b394887b
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看板
提交
b394887b
编写于
6月 07, 2018
作者:
W
wangliu
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/develop' into develop
上级
791da853
43a91ee5
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
14 addition
and
13 deletion
+14
-13
src/operators/batchnorm_op.h
src/operators/batchnorm_op.h
+1
-1
src/operators/box_coder_op.h
src/operators/box_coder_op.h
+1
-1
src/operators/concat_op.h
src/operators/concat_op.h
+1
-1
src/operators/elementwise_add_op.h
src/operators/elementwise_add_op.h
+1
-1
src/operators/fusion_conv_add.h
src/operators/fusion_conv_add.h
+1
-1
src/operators/fusion_fc_op.h
src/operators/fusion_fc_op.h
+1
-1
src/operators/lrn_op.h
src/operators/lrn_op.h
+1
-1
src/operators/mul_op.h
src/operators/mul_op.h
+1
-1
src/operators/multiclass_nms_op.h
src/operators/multiclass_nms_op.h
+1
-1
src/operators/prior_box_op.h
src/operators/prior_box_op.h
+1
-1
src/operators/relu_op.h
src/operators/relu_op.h
+1
-1
src/operators/reshape_op.h
src/operators/reshape_op.h
+2
-1
src/operators/transpose_op.h
src/operators/transpose_op.h
+1
-1
未找到文件。
src/operators/batchnorm_op.h
浏览文件 @
b394887b
...
...
@@ -29,7 +29,7 @@ class BatchNormOp : public framework::OperatorWithKernel<DeviceType> {
public:
BatchNormOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/box_coder_op.h
浏览文件 @
b394887b
...
...
@@ -32,7 +32,7 @@ class BoxCoderOp : public framework::OperatorWithKernel<DeviceType> {
public:
BoxCoderOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/concat_op.h
浏览文件 @
b394887b
...
...
@@ -27,7 +27,7 @@ template <typename DeviceType, typename T>
class
ConcatOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
>
{
public:
ConcatOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/elementwise_add_op.h
浏览文件 @
b394887b
...
...
@@ -29,7 +29,7 @@ class ElementwiseAddOp : public framework::OperatorWithKernel<DeviceType> {
public:
ElementwiseAddOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/fusion_conv_add.h
浏览文件 @
b394887b
...
...
@@ -50,7 +50,7 @@ class FushionConvAddOp : public framework::OperatorWithKernel<DeviceType> {
public:
FushionConvAddOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
)
{}
...
...
src/operators/fusion_fc_op.h
浏览文件 @
b394887b
...
...
@@ -51,7 +51,7 @@ class FushionFcOp : public framework::OperatorWithKernel<DeviceType> {
public:
FushionFcOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/lrn_op.h
浏览文件 @
b394887b
...
...
@@ -28,7 +28,7 @@ template <typename DeviceType, typename T>
class
LrnOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
>
{
public:
LrnOp
(
const
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/mul_op.h
浏览文件 @
b394887b
...
...
@@ -28,7 +28,7 @@ template <typename DeviceType, typename T>
class
MulOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
>
{
public:
MulOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/multiclass_nms_op.h
浏览文件 @
b394887b
...
...
@@ -32,7 +32,7 @@ class MultiClassNMSOp : public framework::OperatorWithKernel<DeviceType> {
public:
MultiClassNMSOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/prior_box_op.h
浏览文件 @
b394887b
...
...
@@ -32,7 +32,7 @@ class PriorBoxOp : public framework::OperatorWithKernel<DeviceType> {
public:
PriorBoxOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/relu_op.h
浏览文件 @
b394887b
...
...
@@ -34,7 +34,7 @@ class ReluOp : public framework::OperatorWithKernel<DeviceType> {
* @b op 的实例化方法, 需要调用父类的实例化方法, 以及实例化自己的参数结构体
* */
ReluOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/reshape_op.h
浏览文件 @
b394887b
...
...
@@ -31,7 +31,8 @@ template <typename DeviceType, typename T>
class
ReshapeOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
>
{
public:
ReshapeOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
src/operators/transpose_op.h
浏览文件 @
b394887b
...
...
@@ -32,7 +32,7 @@ class TransposeOp : public framework::OperatorWithKernel<DeviceType> {
public:
TransposeOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
&
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录