Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Xiaomi
Mace
提交
bdd6ff45
Mace
项目概览
Xiaomi
/
Mace
通知
106
Star
40
Fork
27
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Mace
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bdd6ff45
编写于
3月 28, 2018
作者:
Y
yejianwu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format code
上级
6982006f
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
17 addition
and
12 deletion
+17
-12
mace/core/runtime/opencl/opencl_runtime.cc
mace/core/runtime/opencl/opencl_runtime.cc
+1
-1
mace/core/runtime/opencl/opencl_runtime.h
mace/core/runtime/opencl/opencl_runtime.h
+1
-1
mace/kernels/opencl/bias_add_opencl.cc
mace/kernels/opencl/bias_add_opencl.cc
+2
-1
mace/kernels/opencl/concat.cc
mace/kernels/opencl/concat.cc
+1
-1
mace/kernels/opencl/fully_connected_opencl.cc
mace/kernels/opencl/fully_connected_opencl.cc
+2
-1
mace/kernels/opencl/helper.cc
mace/kernels/opencl/helper.cc
+10
-6
mace/kernels/reorganize.h
mace/kernels/reorganize.h
+0
-1
未找到文件。
mace/core/runtime/opencl/opencl_runtime.cc
浏览文件 @
bdd6ff45
...
...
@@ -361,7 +361,7 @@ const GPU_TYPE OpenCLRuntime::GetGPUType() const {
return
gpu_type_
;
}
const
std
::
string
&
OpenCLRuntime
::
GetOpenclVersion
()
{
const
std
::
string
&
OpenCLRuntime
::
GetOpenclVersion
()
const
{
return
opencl_version_
;
}
...
...
mace/core/runtime/opencl/opencl_runtime.h
浏览文件 @
bdd6ff45
...
...
@@ -56,7 +56,7 @@ class OpenCLRuntime {
uint64_t
GetKernelMaxWorkGroupSize
(
const
cl
::
Kernel
&
kernel
);
uint64_t
GetKernelWaveSize
(
const
cl
::
Kernel
&
kernel
);
const
GPU_TYPE
GetGPUType
()
const
;
const
std
::
string
&
GetOpenclVersion
();
const
std
::
string
&
GetOpenclVersion
()
const
;
cl
::
Kernel
BuildKernel
(
const
std
::
string
&
program_name
,
const
std
::
string
&
kernel_name
,
const
std
::
set
<
std
::
string
>
&
build_options
);
...
...
mace/kernels/opencl/bias_add_opencl.cc
浏览文件 @
bdd6ff45
...
...
@@ -71,7 +71,8 @@ void BiasAddFunctor<DeviceType::OPENCL, T>::operator()(const Tensor *input,
}
error
=
runtime
->
command_queue
().
enqueueNDRangeKernel
(
kernel_
,
cl
::
NullRange
,
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws
[
1
],
roundup_gws
[
2
]),
kernel_
,
cl
::
NullRange
,
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws
[
1
],
roundup_gws
[
2
]),
cl
::
NDRange
(
lws
[
0
],
lws
[
1
],
lws
[
2
]),
nullptr
,
&
event
);
}
MACE_CHECK
(
error
==
CL_SUCCESS
);
...
...
mace/kernels/opencl/concat.cc
浏览文件 @
bdd6ff45
mace/kernels/opencl/fully_connected_opencl.cc
浏览文件 @
bdd6ff45
...
...
@@ -111,7 +111,8 @@ void FCWXKernel(cl::Kernel *kernel,
cl
::
Event
event
;
cl_int
error
=
runtime
->
command_queue
().
enqueueNDRangeKernel
(
*
kernel
,
cl
::
NullRange
,
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws
[
1
],
roundup_gws
[
2
]),
*
kernel
,
cl
::
NullRange
,
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws
[
1
],
roundup_gws
[
2
]),
cl
::
NDRange
((
*
lws
)[
0
],
(
*
lws
)[
1
],
(
*
lws
)[
2
]),
nullptr
,
&
event
);
MACE_CHECK
(
error
==
CL_SUCCESS
)
<<
"Error code: "
<<
error
;
...
...
mace/kernels/opencl/helper.cc
浏览文件 @
bdd6ff45
...
...
@@ -249,7 +249,7 @@ void TuningOrRun3DKernel(const cl::Kernel &kernel,
<<
"Tuning parameters of 3D kernel must be 4D"
;
cl_int
error
=
CL_SUCCESS
;
std
::
vector
<
uint32_t
>
roundup_gws
(
3
);
if
(
!
is_qualcomm_opencl200
)
{
if
(
!
is_qualcomm_opencl200
)
{
for
(
size_t
i
=
0
;
i
<
3
;
++
i
)
{
roundup_gws
[
i
]
=
RoundUp
(
gws
[
i
],
params
[
i
]);
}
...
...
@@ -284,7 +284,8 @@ void TuningOrRun3DKernel(const cl::Kernel &kernel,
cl
::
NDRange
(
params
[
0
],
params
[
1
],
params
[
2
]),
nullptr
,
&
event
);
}
else
{
error
=
runtime
->
command_queue
().
enqueueNDRangeKernel
(
kernel
,
cl
::
NullRange
,
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws
[
1
],
roundup_gws
[
2
]),
kernel
,
cl
::
NullRange
,
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws
[
1
],
roundup_gws
[
2
]),
cl
::
NDRange
(
params
[
0
],
params
[
1
],
params
[
2
]),
nullptr
,
&
event
);
}
MACE_CHECK
(
error
==
CL_SUCCESS
)
<<
"Error code: "
<<
error
;
...
...
@@ -387,7 +388,8 @@ void TuningOrRun2DKernel(const cl::Kernel &kernel,
}
else
{
uint32_t
roundup_gws1
=
RoundUp
(
gws1
,
params
[
1
]);
error
=
runtime
->
command_queue
().
enqueueNDRangeKernel
(
kernel
,
cl
::
NDRange
(
0
,
i
*
block_size
),
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws1
),
kernel
,
cl
::
NDRange
(
0
,
i
*
block_size
),
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws1
),
cl
::
NDRange
(
params
[
0
],
params
[
1
]),
nullptr
,
&
event
);
}
MACE_CHECK
(
error
==
CL_SUCCESS
)
<<
"Error code: "
<<
error
;
...
...
@@ -420,12 +422,14 @@ void TuningOrRun2DKernel(const cl::Kernel &kernel,
(
i
==
num_blocks
-
1
)
?
(
gws
[
1
]
-
(
i
*
block_size
))
:
block_size
;
if
(
is_qualcomm_opencl200
)
{
error
=
runtime
->
command_queue
().
enqueueNDRangeKernel
(
kernel
,
cl
::
NDRange
(
0
,
i
*
block_size
),
cl
::
NDRange
(
gws
[
0
],
gws1
),
cl
::
NDRange
(
params
[
0
],
params
[
1
]),
nullptr
,
&
event
);
kernel
,
cl
::
NDRange
(
0
,
i
*
block_size
),
cl
::
NDRange
(
gws
[
0
],
gws1
),
cl
::
NDRange
(
params
[
0
],
params
[
1
]),
nullptr
,
&
event
);
}
else
{
uint32_t
roundup_gws1
=
RoundUp
(
gws1
,
params
[
1
]);
error
=
runtime
->
command_queue
().
enqueueNDRangeKernel
(
kernel
,
cl
::
NDRange
(
0
,
i
*
block_size
),
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws1
),
kernel
,
cl
::
NDRange
(
0
,
i
*
block_size
),
cl
::
NDRange
(
roundup_gws
[
0
],
roundup_gws1
),
cl
::
NDRange
(
params
[
0
],
params
[
1
]),
nullptr
,
&
event
);
}
MACE_CHECK
(
error
==
CL_SUCCESS
)
<<
"Error code: "
<<
error
;
...
...
mace/kernels/reorganize.h
浏览文件 @
bdd6ff45
...
...
@@ -74,7 +74,6 @@ struct ReOrganizeFunctor {
}
}
}
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录