Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
5b091f91
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看板
未验证
提交
5b091f91
编写于
6月 08, 2020
作者:
Y
Yuan Shuai
提交者:
GitHub
6月 08, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[LITE][OPENCL] Fix grid sampler for mali gpu (#3753)
* [LITE][OPENCL] Fix grid sampler for mali gpu. test=develop
上级
fb54e938
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
68 addition
and
17 deletion
+68
-17
lite/api/model_test.cc
lite/api/model_test.cc
+52
-13
lite/backends/opencl/cl_kernel/image/grid_sampler_kernel.cl
lite/backends/opencl/cl_kernel/image/grid_sampler_kernel.cl
+16
-4
未找到文件。
lite/api/model_test.cc
浏览文件 @
5b091f91
...
...
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include <gflags/gflags.h>
#include <sstream>
#include <string>
#include <vector>
...
...
@@ -25,6 +24,7 @@
#ifdef LITE_WITH_PROFILE
#include "lite/core/profile/basic_profiler.h"
#endif // LITE_WITH_PROFILE
#include <gflags/gflags.h>
using
paddle
::
lite
::
profile
::
Timer
;
...
...
@@ -34,6 +34,10 @@ DEFINE_string(input_shape,
DEFINE_bool
(
use_optimize_nb
,
false
,
"optimized & naive buffer model for mobile devices"
);
DEFINE_string
(
backend
,
"arm_cpu"
,
"choose backend for valid_places: arm_cpu | opencl. Compile "
"OpenCL version if you choose opencl"
);
DEFINE_string
(
arg_name
,
""
,
"the arg name"
);
namespace
paddle
{
...
...
@@ -49,9 +53,19 @@ void OutputOptModel(const std::string& load_model_dir,
Place
{
TARGET
(
kX86
),
PRECISION
(
kInt64
)},
Place
{
TARGET
(
kHost
),
PRECISION
(
kFloat
)}});
#else
config
.
set_valid_places
({
Place
{
TARGET
(
kARM
),
PRECISION
(
kFloat
)},
});
if
(
FLAGS_backend
==
"opencl"
)
{
config
.
set_valid_places
({
Place
{
TARGET
(
kOpenCL
),
PRECISION
(
kFP16
),
DATALAYOUT
(
kImageDefault
)},
Place
{
TARGET
(
kOpenCL
),
PRECISION
(
kFloat
),
DATALAYOUT
(
kNCHW
)},
Place
{
TARGET
(
kOpenCL
),
PRECISION
(
kAny
),
DATALAYOUT
(
kImageDefault
)},
Place
{
TARGET
(
kOpenCL
),
PRECISION
(
kAny
),
DATALAYOUT
(
kNCHW
)},
TARGET
(
kARM
),
// enable kARM CPU kernel when no opencl kernel
});
}
else
{
// arm_cpu
config
.
set_valid_places
({
Place
{
TARGET
(
kARM
),
PRECISION
(
kFloat
)},
});
}
#endif
auto
predictor
=
lite_api
::
CreatePaddlePredictor
(
config
);
...
...
@@ -117,16 +131,40 @@ void Run(const std::vector<std::vector<int64_t>>& input_shapes,
<<
", min time: "
<<
ti
.
LapTimes
().
Min
()
<<
" ms"
<<
", max time: "
<<
ti
.
LapTimes
().
Max
()
<<
" ms."
;
auto
output
=
predictor
->
GetOutput
(
0
);
auto
out
=
output
->
data
<
float
>
();
LOG
(
INFO
)
<<
"out "
<<
out
[
0
];
LOG
(
INFO
)
<<
"out "
<<
out
[
1
];
auto
output_shape
=
output
->
shape
();
int
output_num
=
1
;
for
(
int
i
=
0
;
i
<
output_shape
.
size
();
++
i
)
{
output_num
*=
output_shape
[
i
];
// output summary
size_t
output_tensor_num
=
predictor
->
GetOutputNames
().
size
();
LOG
(
INFO
)
<<
"output tensor num:"
<<
output_tensor_num
;
for
(
size_t
tidx
=
0
;
tidx
<
output_tensor_num
;
++
tidx
)
{
auto
output_tensor
=
predictor
->
GetOutput
(
tidx
);
LOG
(
INFO
)
<<
"============= output tensor "
<<
tidx
<<
" ============="
;
auto
tensor_shape
=
output_tensor
->
shape
();
std
::
string
tensor_shape_str
{
""
};
int
output_tensor_numel
=
1
;
for
(
int
i
=
0
;
i
<
tensor_shape
.
size
();
++
i
)
{
output_tensor_numel
*=
tensor_shape
[
i
];
tensor_shape_str
+=
std
::
to_string
(
tensor_shape
[
i
]);
tensor_shape_str
+=
(
i
<
tensor_shape
.
size
()
-
1
)
?
"x"
:
""
;
}
auto
out_data
=
output_tensor
->
data
<
float
>
();
auto
out_mean
=
paddle
::
lite
::
compute_mean
<
float
>
(
out_data
,
output_tensor_numel
);
auto
out_std_dev
=
paddle
::
lite
::
compute_standard_deviation
<
float
>
(
out_data
,
output_tensor_numel
,
true
,
out_mean
);
LOG
(
INFO
)
<<
"output tensor "
<<
tidx
<<
" dims:"
<<
tensor_shape_str
;
LOG
(
INFO
)
<<
"output tensor "
<<
tidx
<<
" elements num:"
<<
output_tensor_numel
;
LOG
(
INFO
)
<<
"output tensor "
<<
tidx
<<
" standard deviation:"
<<
out_std_dev
;
LOG
(
INFO
)
<<
"output tensor "
<<
tidx
<<
" mean value:"
<<
out_mean
<<
"
\n
"
;
// print result
for
(
int
i
=
0
;
i
<
output_tensor_numel
;
++
i
)
{
VLOG
(
2
)
<<
"output_tensor->data<float>()["
<<
i
<<
"]:"
<<
output_tensor
->
data
<
float
>
()[
i
];
}
}
LOG
(
INFO
)
<<
"output_num: "
<<
output_num
;
// please turn off memory_optimize_pass to use this feature.
if
(
FLAGS_arg_name
!=
""
)
{
...
...
@@ -162,6 +200,7 @@ int main(int argc, char** argv) {
<<
"--model_dir /path/to/your/model"
;
exit
(
0
);
}
std
::
string
save_optimized_model_dir
=
""
;
if
(
FLAGS_use_optimize_nb
)
{
save_optimized_model_dir
=
FLAGS_model_dir
;
...
...
lite/backends/opencl/cl_kernel/image/grid_sampler_kernel.cl
浏览文件 @
5b091f91
...
...
@@ -63,7 +63,10 @@ __kernel void grid_sampler(__read_only image2d_t input,
if (x0 + 1 < 0 || x0 + 1 > out_width - 1 || y0 + 1 < 0 || y0 + 1 > out_height - 1){
input3 = (CL_DTYPE4)(0.0);
}
CL_DTYPE4 out_val = input0 * xe * ye + input1 * xs * ye + input2 * xe * ys + input3 * xs * ys;
CL_DTYPE4 out_val = input0 * (CL_DTYPE4)(xe) * (CL_DTYPE4)(ye) +
input1 * (CL_DTYPE4)(xs) * (CL_DTYPE4)(ye) +
input2 * (CL_DTYPE4)(xe) * (CL_DTYPE4)(ys) +
input3 * (CL_DTYPE4)(xs) * (CL_DTYPE4)(ys);
WRITE_IMG_TYPE(CL_DTYPE_CHAR, output, outpoints, out_val);
// y
...
...
@@ -97,7 +100,10 @@ __kernel void grid_sampler(__read_only image2d_t input,
input3 = (CL_DTYPE4)(0.0);
}
out_val = input0 * xe * ye + input1 * xs * ye + input2 * xe * ys + input3 * xs * ys;
out_val = input0 * (CL_DTYPE4)(xe) * (CL_DTYPE4)(ye) +
input1 * (CL_DTYPE4)(xs) * (CL_DTYPE4)(ye) +
input2 * (CL_DTYPE4)(xe) * (CL_DTYPE4)(ys) +
input3 * (CL_DTYPE4)(xs) * (CL_DTYPE4)(ys);
WRITE_IMG_TYPE(CL_DTYPE_CHAR, output, (int2)(outpoints.x, outpoints.y + 1), out_val);
// z
...
...
@@ -130,7 +136,10 @@ __kernel void grid_sampler(__read_only image2d_t input,
if (x0 + 1 < 0 || x0 + 1 > out_width - 1 || y0 + 1 < 0 || y0 + 1 > out_height - 1){
input3 = (CL_DTYPE4)(0.0);
}
out_val = input0 * xe * ye + input1 * xs * ye + input2 * xe * ys + input3 * xs * ys;
out_val = input0 * (CL_DTYPE4)(xe) * (CL_DTYPE4)(ye) +
input1 * (CL_DTYPE4)(xs) * (CL_DTYPE4)(ye) +
input2 * (CL_DTYPE4)(xe) * (CL_DTYPE4)(ys) +
input3 * (CL_DTYPE4)(xs) * (CL_DTYPE4)(ys);
WRITE_IMG_TYPE(CL_DTYPE_CHAR, output, (int2)(outpoints.x, outpoints.y + 2), out_val);
// w
...
...
@@ -163,6 +172,9 @@ __kernel void grid_sampler(__read_only image2d_t input,
if (x0 + 1 < 0 || x0 + 1 > out_width - 1 || y0 + 1 < 0 |
|
y0
+
1
>
out_height
-
1
)
{
input3
=
(
CL_DTYPE4
)(
0.0
)
;
}
out_val
=
input0
*
xe
*
ye
+
input1
*
xs
*
ye
+
input2
*
xe
*
ys
+
input3
*
xs
*
ys
;
out_val
=
input0
*
(
CL_DTYPE4
)(
xe
)
*
(
CL_DTYPE4
)(
ye
)
+
input1
*
(
CL_DTYPE4
)(
xs
)
*
(
CL_DTYPE4
)(
ye
)
+
input2
*
(
CL_DTYPE4
)(
xe
)
*
(
CL_DTYPE4
)(
ys
)
+
input3
*
(
CL_DTYPE4
)(
xs
)
*
(
CL_DTYPE4
)(
ys
)
;
WRITE_IMG_TYPE
(
CL_DTYPE_CHAR,
output,
(
int2
)(
outpoints.x,
outpoints.y
+
3
)
,
out_val
)
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录