Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
afefe9cf
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
afefe9cf
编写于
4月 20, 2020
作者:
Z
zhupengyang
提交者:
GitHub
4月 20, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
assign support tensor_array (#3436)
上级
2168ff38
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
88 addition
and
16 deletion
+88
-16
lite/kernels/arm/CMakeLists.txt
lite/kernels/arm/CMakeLists.txt
+0
-1
lite/kernels/host/CMakeLists.txt
lite/kernels/host/CMakeLists.txt
+1
-0
lite/kernels/host/assign_compute.cc
lite/kernels/host/assign_compute.cc
+53
-0
lite/kernels/host/assign_compute.h
lite/kernels/host/assign_compute.h
+5
-4
lite/operators/assign_op.cc
lite/operators/assign_op.cc
+21
-8
lite/operators/op_params.h
lite/operators/op_params.h
+7
-2
lite/tests/kernels/assign_compute_test.cc
lite/tests/kernels/assign_compute_test.cc
+1
-1
未找到文件。
lite/kernels/arm/CMakeLists.txt
浏览文件 @
afefe9cf
...
...
@@ -56,7 +56,6 @@ add_kernel(negative_compute_arm ARM extra SRCS negative_compute.cc DEPS ${lite_k
add_kernel
(
crop_compute_arm ARM extra SRCS crop_compute.cc DEPS
${
lite_kernel_deps
}
math_arm
)
add_kernel
(
power_compute_arm ARM extra SRCS power_compute.cc DEPS
${
lite_kernel_deps
}
math_arm
)
add_kernel
(
norm_compute_arm ARM extra SRCS norm_compute.cc DEPS
${
lite_kernel_deps
}
math_arm
)
add_kernel
(
assign_compute_arm ARM extra SRCS assign_compute.cc DEPS
${
lite_kernel_deps
}
math_arm
)
## 3. extra kernels
add_kernel
(
lrn_compute_arm ARM extra SRCS lrn_compute.cc DEPS
${
lite_kernel_deps
}
math_arm
)
...
...
lite/kernels/host/CMakeLists.txt
浏览文件 @
afefe9cf
...
...
@@ -12,3 +12,4 @@ add_kernel(logical_compute_host Host extra SRCS logical_compute.cc DEPS ${lite_k
add_kernel
(
ctc_align_compute_host Host extra SRCS ctc_align_compute.cc DEPS
${
lite_kernel_deps
}
)
add_kernel
(
write_to_array_compute_host Host extra SRCS write_to_array_compute.cc DEPS
${
lite_kernel_deps
}
)
add_kernel
(
read_from_array_compute_host Host extra SRCS read_from_array_compute.cc DEPS
${
lite_kernel_deps
}
)
add_kernel
(
assign_compute_host Host extra SRCS assign_compute.cc DEPS
${
lite_kernel_deps
}
)
lite/kernels/
arm
/assign_compute.cc
→
lite/kernels/
host
/assign_compute.cc
浏览文件 @
afefe9cf
...
...
@@ -12,29 +12,42 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "lite/kernels/arm/assign_compute.h"
#include <vector>
#include "lite/backends/arm/math/funcs.h"
#include "lite/core/op_registry.h"
#include "lite/core/type_system.h"
#include "lite/kernels/host/assign_compute.h"
namespace
paddle
{
namespace
lite
{
namespace
kernels
{
namespace
arm
{
namespace
host
{
void
AssignCompute
::
Run
()
{
auto
&
param
=
Param
<
param_t
>
();
param
.
Out
->
CopyDataFrom
(
*
param
.
X
);
if
(
param
.
X
!=
nullptr
)
{
param
.
Out
->
CopyDataFrom
(
*
param
.
X
);
}
else
if
(
param
.
X_array
!=
nullptr
)
{
auto
x_array
=
param
.
X_array
;
auto
out_array
=
param
.
Out_array
;
out_array
->
resize
(
x_array
->
size
());
for
(
size_t
i
=
0
;
i
<
x_array
->
size
();
i
++
)
{
out_array
->
at
(
i
).
CopyDataFrom
(
x_array
->
at
(
i
));
}
}
else
{
LOG
(
FATAL
)
<<
"x or x_array of assign must be set."
;
}
}
}
// namespace
arm
}
// namespace
host
}
// namespace kernels
}
// namespace lite
}
// namespace paddle
REGISTER_LITE_KERNEL
(
assign
,
kARM
,
kAny
,
kNCHW
,
paddle
::
lite
::
kernels
::
arm
::
AssignCompute
,
def
)
.
BindInput
(
"X"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
),
PRECISION
(
kAny
))})
.
BindOutput
(
"Out"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kARM
),
PRECISION
(
kAny
))})
assign
,
kHost
,
kAny
,
kAny
,
paddle
::
lite
::
kernels
::
host
::
AssignCompute
,
def
)
.
BindInput
(
"X"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kHost
),
PRECISION
(
kAny
),
DATALAYOUT
(
kAny
))})
.
BindOutput
(
"Out"
,
{
LiteType
::
GetTensorTy
(
TARGET
(
kHost
),
PRECISION
(
kAny
),
DATALAYOUT
(
kAny
))})
.
Finalize
();
lite/kernels/
arm
/assign_compute.h
→
lite/kernels/
host
/assign_compute.h
浏览文件 @
afefe9cf
...
...
@@ -15,14 +15,15 @@
#pragma once
#include <algorithm>
#include "lite/core/kernel.h"
#include "lite/
operators/assign_op
.h"
#include "lite/
core/op_registry
.h"
namespace
paddle
{
namespace
lite
{
namespace
kernels
{
namespace
arm
{
namespace
host
{
class
AssignCompute
:
public
KernelLite
<
TARGET
(
kARM
),
PRECISION
(
kAny
)
>
{
class
AssignCompute
:
public
KernelLite
<
TARGET
(
kHost
),
PRECISION
(
kAny
),
DATALAYOUT
(
kAny
)
>
{
public:
using
param_t
=
operators
::
AssignParam
;
...
...
@@ -31,7 +32,7 @@ class AssignCompute : public KernelLite<TARGET(kARM), PRECISION(kAny)> {
virtual
~
AssignCompute
()
=
default
;
};
}
// namespace
arm
}
// namespace
host
}
// namespace kernels
}
// namespace lite
}
// namespace paddle
lite/operators/assign_op.cc
浏览文件 @
afefe9cf
...
...
@@ -27,20 +27,33 @@ bool AssignOpLite::CheckShape() const {
}
bool
AssignOpLite
::
InferShapeImpl
()
const
{
lite
::
DDim
input_dims
;
input_dims
=
param_
.
X
->
dims
();
param_
.
Out
->
Resize
(
lite
::
DDim
(
input_dims
));
if
(
param_
.
X
!=
nullptr
)
{
param_
.
Out
->
Resize
(
param_
.
X
->
dims
());
}
else
if
(
param_
.
X_array
!=
nullptr
)
{
param_
.
Out_array
->
resize
(
param_
.
Out_array
->
size
());
}
else
{
LOG
(
FATAL
)
<<
"x or x_array must be set."
;
}
return
true
;
}
// TODO(Superjomn) replace framework::OpDesc with a lite one.
bool
AssignOpLite
::
AttachImpl
(
const
cpp
::
OpDesc
&
op_desc
,
lite
::
Scope
*
scope
)
{
auto
input
=
op_desc
.
Input
(
"X"
).
front
();
auto
out
=
op_desc
.
Output
(
"Out"
).
front
();
auto
x_name
=
op_desc
.
Input
(
"X"
).
front
();
auto
out
_name
=
op_desc
.
Output
(
"Out"
).
front
();
param_
.
X
=
scope
->
FindVar
(
input
)
->
GetMutable
<
lite
::
Tensor
>
();
CHECK
(
scope
->
FindVar
(
out
));
param_
.
Out
=
scope
->
FindVar
(
out
)
->
GetMutable
<
lite
::
Tensor
>
();
auto
x_var
=
scope
->
FindVar
(
x_name
);
if
(
x_var
->
IsType
<
Tensor
>
())
{
param_
.
X
=
scope
->
FindTensor
(
x_name
);
param_
.
Out
=
scope
->
FindMutableTensor
(
out_name
);
}
else
if
(
x_var
->
IsType
<
std
::
vector
<
Tensor
>>
())
{
param_
.
X_array
=
x_var
->
GetMutable
<
std
::
vector
<
Tensor
>>
();
param_
.
Out_array
=
scope
->
FindVar
(
out_name
)
->
GetMutable
<
std
::
vector
<
Tensor
>>
();
}
else
{
LOG
(
FATAL
)
<<
"X type for assign op is unsupported. Expected type is "
"tensor or tensor_array."
;
}
return
true
;
}
...
...
lite/operators/op_params.h
浏览文件 @
afefe9cf
...
...
@@ -1279,8 +1279,13 @@ struct GatherParam : ParamBase {
/// ----------------------- assign operators -----------------------
struct
AssignParam
:
ParamBase
{
const
lite
::
Tensor
*
X
{};
lite
::
Tensor
*
Out
{};
// for tensor
const
lite
::
Tensor
*
X
{
nullptr
};
lite
::
Tensor
*
Out
{
nullptr
};
// for tensor_array
const
std
::
vector
<
lite
::
Tensor
>*
X_array
{
nullptr
};
std
::
vector
<
lite
::
Tensor
>*
Out_array
{
nullptr
};
};
/// ----------------------- roi_align operators -----------------------
...
...
lite/tests/kernels/assign_compute_test.cc
浏览文件 @
afefe9cf
...
...
@@ -69,7 +69,7 @@ void TestAssign(const Place& place) {
TEST
(
Assign
,
precision
)
{
Place
place
;
#ifdef LITE_WITH_ARM
place
=
TARGET
(
k
ARM
);
place
=
TARGET
(
k
Host
);
#else
return
;
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录