Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
257a7dc8
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看板
提交
257a7dc8
编写于
10月 19, 2018
作者:
J
Jiaying Zhao
提交者:
GitHub
10月 19, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1156 from smilejames/opencl
update fetch kernel
上级
64280b85
78535dd6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
5 addition
and
13 deletion
+5
-13
src/framework/executor.cpp
src/framework/executor.cpp
+2
-12
src/framework/operator.cpp
src/framework/operator.cpp
+1
-1
src/operators/kernel/cl/fetch_kernel.cpp
src/operators/kernel/cl/fetch_kernel.cpp
+2
-0
未找到文件。
src/framework/executor.cpp
浏览文件 @
257a7dc8
...
@@ -922,12 +922,7 @@ void Executor<GPU_CL, Precision::FP32>::InitMemory() {
...
@@ -922,12 +922,7 @@ void Executor<GPU_CL, Precision::FP32>::InitMemory() {
if
(
var_desc
->
Persistable
())
{
if
(
var_desc
->
Persistable
())
{
CLImage
*
cl_image
=
nullptr
;
CLImage
*
cl_image
=
nullptr
;
if
(
var_desc
->
Name
()
==
"feed"
||
var_desc
->
Name
()
==
"fetch"
)
{
if
(
var_desc
->
Name
()
==
"feed"
||
var_desc
->
Name
()
==
"fetch"
)
{
auto
tensor
=
var
->
template
GetMutable
<
framework
::
LoDTensor
>();
var
->
template
GetMutable
<
framework
::
LoDTensor
>();
if
(
var_desc
->
Name
()
==
"fetch"
)
{
const
framework
::
TensorDesc
&
desc
=
var_desc
->
Tensor_desc
();
framework
::
DDim
ddim
=
framework
::
make_ddim
(
desc
.
Dims
());
tensor
->
mutable_data
<
float
>
(
ddim
);
}
continue
;
continue
;
}
else
{
}
else
{
cl_image
=
var
->
template
GetMutable
<
framework
::
CLImage
>();
cl_image
=
var
->
template
GetMutable
<
framework
::
CLImage
>();
...
@@ -991,12 +986,7 @@ void Executor<GPU_CL, Precision::FP32>::InitCombineMemory() {
...
@@ -991,12 +986,7 @@ void Executor<GPU_CL, Precision::FP32>::InitCombineMemory() {
if
(
var_desc
->
Persistable
())
{
if
(
var_desc
->
Persistable
())
{
CLImage
*
cl_image
=
nullptr
;
CLImage
*
cl_image
=
nullptr
;
if
(
var_desc
->
Name
()
==
"feed"
||
var_desc
->
Name
()
==
"fetch"
)
{
if
(
var_desc
->
Name
()
==
"feed"
||
var_desc
->
Name
()
==
"fetch"
)
{
auto
tensor
=
var
->
template
GetMutable
<
framework
::
LoDTensor
>();
var
->
template
GetMutable
<
framework
::
LoDTensor
>();
if
(
var_desc
->
Name
()
==
"fetch"
)
{
const
framework
::
TensorDesc
&
desc
=
var_desc
->
Tensor_desc
();
framework
::
DDim
ddim
=
framework
::
make_ddim
(
desc
.
Dims
());
tensor
->
mutable_data
<
float
>
(
ddim
);
}
continue
;
continue
;
}
else
{
}
else
{
cl_image
=
var
->
template
GetMutable
<
framework
::
CLImage
>();
cl_image
=
var
->
template
GetMutable
<
framework
::
CLImage
>();
...
...
src/framework/operator.cpp
浏览文件 @
257a7dc8
...
@@ -95,7 +95,7 @@ void OperatorBase<Dtype>::Run() {
...
@@ -95,7 +95,7 @@ void OperatorBase<Dtype>::Run() {
if
(
type_
==
"fetch"
)
{
if
(
type_
==
"fetch"
)
{
Tensor
*
tensor
=
vari
->
template
GetMutable
<
framework
::
LoDTensor
>();
Tensor
*
tensor
=
vari
->
template
GetMutable
<
framework
::
LoDTensor
>();
if
(
tensor
)
{
if
(
tensor
)
{
DLOG
<<
type_
<<
" output- "
<<
key
<<
"="
<<
tensor
->
dims
()
;
DLOG
<<
type_
<<
" output- "
<<
key
<<
"="
<<
*
tensor
;
}
}
}
else
{
}
else
{
CLImage
*
cl_image
=
vari
->
template
GetMutable
<
framework
::
CLImage
>();
CLImage
*
cl_image
=
vari
->
template
GetMutable
<
framework
::
CLImage
>();
...
...
src/operators/kernel/cl/fetch_kernel.cpp
浏览文件 @
257a7dc8
...
@@ -21,6 +21,8 @@ namespace operators {
...
@@ -21,6 +21,8 @@ namespace operators {
template
<
>
template
<
>
bool
FetchKernel
<
GPU_CL
,
float
>::
Init
(
FetchParam
<
GPU_CL
>
*
param
)
{
bool
FetchKernel
<
GPU_CL
,
float
>::
Init
(
FetchParam
<
GPU_CL
>
*
param
)
{
this
->
cl_helper_
.
AddKernel
(
"fetch"
,
"fetch_kernel.cl"
);
this
->
cl_helper_
.
AddKernel
(
"fetch"
,
"fetch_kernel.cl"
);
auto
*
out
=
param
->
Out
();
out
->
mutable_data
<
float
>
();
return
true
;
return
true
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录