Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
5d3acea2
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看板
提交
5d3acea2
编写于
5月 26, 2018
作者:
E
eclipsess
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
code style
上级
cd63d8a2
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
144 addition
and
148 deletion
+144
-148
src/operators/kernel/arm/reshape_kernel.cpp
src/operators/kernel/arm/reshape_kernel.cpp
+31
-31
src/operators/kernel/reshape_kernel.h
src/operators/kernel/reshape_kernel.h
+46
-49
src/operators/reshape_op.cpp
src/operators/reshape_op.cpp
+11
-11
src/operators/reshape_op.h
src/operators/reshape_op.h
+27
-28
test/executor_for_test.h
test/executor_for_test.h
+1
-1
test/operators/test_reshape_op.cpp
test/operators/test_reshape_op.cpp
+28
-28
未找到文件。
src/operators/kernel/arm/reshape_kernel.cpp
浏览文件 @
5d3acea2
...
@@ -17,10 +17,10 @@ limitations under the License. */
...
@@ -17,10 +17,10 @@ limitations under the License. */
#include "operators/kernel/reshape_kernel.h"
#include "operators/kernel/reshape_kernel.h"
namespace
paddle_mobile
{
namespace
paddle_mobile
{
namespace
operators
{
namespace
operators
{
template
<
>
template
<
>
void
ReshapeKernel
<
CPU
,
float
>::
Compute
(
const
ReshapeParam
&
param
)
const
{
void
ReshapeKernel
<
CPU
,
float
>::
Compute
(
const
ReshapeParam
&
param
)
const
{
const
auto
*
input_x
=
param
.
InputX
();
const
auto
*
input_x
=
param
.
InputX
();
const
auto
&
input_x_dims
=
input_x
->
dims
();
const
auto
&
input_x_dims
=
input_x
->
dims
();
auto
*
out
=
param
.
Out
();
auto
*
out
=
param
.
Out
();
...
@@ -39,13 +39,13 @@ namespace paddle_mobile {
...
@@ -39,13 +39,13 @@ namespace paddle_mobile {
out
->
Resize
(
out_dims
);
out
->
Resize
(
out_dims
);
if
(
!
inplace
)
{
if
(
!
inplace
)
{
out
->
mutable_data
<
float
>
();
out
->
mutable_data
<
float
>
();
framework
::
TensorCopy
(
*
input_x
,
out
);
framework
::
TensorCopy
(
*
input_x
,
out
);
out
->
Resize
(
out_dims
);
out
->
Resize
(
out_dims
);
}
else
{
}
else
{
out
->
ShareDataWith
(
*
input_x
);
out
->
ShareDataWith
(
*
input_x
);
out
->
Resize
(
out_dims
);
out
->
Resize
(
out_dims
);
}
}
}
}
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
src/operators/kernel/reshape_kernel.h
浏览文件 @
5d3acea2
...
@@ -20,11 +20,10 @@ limitations under the License. */
...
@@ -20,11 +20,10 @@ limitations under the License. */
#pragma once;
#pragma once;
namespace
paddle_mobile
{
namespace
paddle_mobile
{
namespace
operators
{
namespace
operators
{
inline
framework
::
DDim
ValidateShape
(
const
std
::
vector
<
int
>
shape
,
inline
framework
::
DDim
ValidateShape
(
const
std
::
vector
<
int
>
shape
,
const
framework
::
DDim
&
in_dims
)
{
const
framework
::
DDim
&
in_dims
)
{
const
int64_t
in_size
=
framework
::
product
(
in_dims
);
const
int64_t
in_size
=
framework
::
product
(
in_dims
);
// only one dimension can be set to -1, whose size will be automatically
// only one dimension can be set to -1, whose size will be automatically
// infered.
// infered.
...
@@ -53,8 +52,7 @@ namespace paddle_mobile {
...
@@ -53,8 +52,7 @@ namespace paddle_mobile {
}
}
capacity
*=
(
shape
[
i
]
?
shape
[
i
]
:
in_dims
[
i
]);
capacity
*=
(
shape
[
i
]
?
shape
[
i
]
:
in_dims
[
i
]);
output_shape
[
i
]
=
output_shape
[
i
]
=
(
shape
[
i
]
?
static_cast
<
int64_t
>
(
shape
[
i
])
:
in_dims
[
i
]);
(
shape
[
i
]
?
static_cast
<
int64_t
>
(
shape
[
i
])
:
in_dims
[
i
]);
}
}
if
(
unk_dim_idx
!=
-
1
)
{
if
(
unk_dim_idx
!=
-
1
)
{
...
@@ -62,16 +60,15 @@ namespace paddle_mobile {
...
@@ -62,16 +60,15 @@ namespace paddle_mobile {
PADDLE_MOBILE_ENFORCE
(
output_shape
[
unk_dim_idx
]
*
capacity
==
-
in_size
,
PADDLE_MOBILE_ENFORCE
(
output_shape
[
unk_dim_idx
]
*
capacity
==
-
in_size
,
"Invalid shape is given."
);
"Invalid shape is given."
);
}
else
{
}
else
{
PADDLE_MOBILE_ENFORCE
(
capacity
==
in_size
,
"Invalid shape is given."
);
PADDLE_MOBILE_ENFORCE
(
capacity
==
in_size
,
"Invalid shape is given."
);
}
}
return
framework
::
make_ddim
(
output_shape
);
return
framework
::
make_ddim
(
output_shape
);
}
}
template
<
typename
DeviceType
,
typename
T
>
template
<
typename
DeviceType
,
typename
T
>
class
ReshapeKernel
class
ReshapeKernel
:
public
framework
::
OpKernelBase
<
DeviceType
,
ReshapeParam
>
{
:
public
framework
::
OpKernelBase
<
DeviceType
,
ReshapeParam
>
{
public:
public:
void
Compute
(
const
ReshapeParam
&
param
)
const
;
void
Compute
(
const
ReshapeParam
&
param
)
const
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
src/operators/reshape_op.cpp
浏览文件 @
5d3acea2
...
@@ -15,18 +15,18 @@ limitations under the License. */
...
@@ -15,18 +15,18 @@ limitations under the License. */
#include "operators/reshape_op.h"
#include "operators/reshape_op.h"
#include <vector>
#include <vector>
namespace
paddle_mobile
{
namespace
paddle_mobile
{
namespace
operators
{
namespace
operators
{
template
<
typename
Dtype
,
typename
T
>
template
<
typename
Dtype
,
typename
T
>
void
ReshapeOp
<
Dtype
,
T
>::
InferShape
()
const
{
void
ReshapeOp
<
Dtype
,
T
>::
InferShape
()
const
{
/// todo: add InputShape() detection.
/// todo: add InputShape() detection.
auto
&
shape
=
param_
.
Shape
();
auto
&
shape
=
param_
.
Shape
();
auto
input_x_dims
=
param_
.
InputX
()
->
dims
();
auto
input_x_dims
=
param_
.
InputX
()
->
dims
();
auto
out_dims
=
ValidateShape
(
shape
,
input_x_dims
);
auto
out_dims
=
ValidateShape
(
shape
,
input_x_dims
);
param_
.
Out
()
->
Resize
(
out_dims
);
param_
.
Out
()
->
Resize
(
out_dims
);
}
}
template
class
ReshapeOp
<
CPU
,
float
>;
template
class
ReshapeOp
<
CPU
,
float
>;
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
namespace
ops
=
paddle_mobile
::
operators
;
namespace
ops
=
paddle_mobile
::
operators
;
...
...
src/operators/reshape_op.h
浏览文件 @
5d3acea2
...
@@ -21,16 +21,15 @@ limitations under the License. */
...
@@ -21,16 +21,15 @@ limitations under the License. */
#include "operators/op_param.h"
#include "operators/op_param.h"
namespace
paddle_mobile
{
namespace
paddle_mobile
{
namespace
operators
{
namespace
operators
{
using
paddle_mobile
::
framework
::
Tensor
;
using
paddle_mobile
::
framework
::
Tensor
;
template
<
typename
DeviceType
,
typename
T
>
template
<
typename
DeviceType
,
typename
T
>
class
ReshapeOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
>
{
class
ReshapeOp
:
public
framework
::
OperatorWithKernel
<
DeviceType
>
{
public:
public:
ReshapeOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
ReshapeOp
(
const
std
::
string
&
type
,
const
VariableNameMap
&
inputs
,
const
VariableNameMap
&
outputs
,
const
VariableNameMap
&
outputs
,
const
framework
::
AttributeMap
attrs
,
const
framework
::
AttributeMap
attrs
,
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
std
::
shared_ptr
<
framework
::
Scope
>
scope
)
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
:
framework
::
OperatorWithKernel
<
DeviceType
>
(
type
,
inputs
,
outputs
,
attrs
,
scope
),
scope
),
...
@@ -46,7 +45,7 @@ namespace paddle_mobile {
...
@@ -46,7 +45,7 @@ namespace paddle_mobile {
protected:
protected:
ReshapeParam
param_
;
ReshapeParam
param_
;
};
};
}
// namespace operators
}
// namespace operators
}
// namespace paddle_mobile
}
// namespace paddle_mobile
test/executor_for_test.h
浏览文件 @
5d3acea2
...
@@ -21,9 +21,9 @@ limitations under the License. */
...
@@ -21,9 +21,9 @@ limitations under the License. */
#include "io.h"
#include "io.h"
#include "operators/conv_op.h"
#include "operators/conv_op.h"
#include "operators/pool_op.h"
#include "operators/pool_op.h"
#include "operators/reshape_op.h"
#include "operators/softmax_op.h"
#include "operators/softmax_op.h"
#include "operators/transpose_op.h"
#include "operators/transpose_op.h"
#include "operators/reshape_op.h"
using
paddle_mobile
::
Executor
;
using
paddle_mobile
::
Executor
;
using
paddle_mobile
::
framework
::
BlockDesc
;
using
paddle_mobile
::
framework
::
BlockDesc
;
...
...
test/operators/test_reshape_op.cpp
浏览文件 @
5d3acea2
...
@@ -22,8 +22,8 @@ int main() {
...
@@ -22,8 +22,8 @@ int main() {
if
(
program
.
originProgram
==
nullptr
)
{
if
(
program
.
originProgram
==
nullptr
)
{
DLOG
<<
"program read file"
;
DLOG
<<
"program read file"
;
}
}
Executor4Test
<
paddle_mobile
::
CPU
,
paddle_mobile
::
operators
::
ReshapeOp
<
Executor4Test
<
paddle_mobile
::
CPU
,
paddle_mobile
::
CPU
,
float
>>
paddle_mobile
::
operators
::
ReshapeOp
<
paddle_mobile
::
CPU
,
float
>>
executor
(
program
,
"reshape"
);
executor
(
program
,
"reshape"
);
paddle_mobile
::
framework
::
Tensor
input
;
paddle_mobile
::
framework
::
Tensor
input
;
SetupTensor
<
float
>
(
&
input
,
{
2
,
3
,
3
,
2
},
static_cast
<
float
>
(
0
),
SetupTensor
<
float
>
(
&
input
,
{
2
,
3
,
3
,
2
},
static_cast
<
float
>
(
0
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录