Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
冰之2023
Mace
提交
79d940af
Mace
项目概览
冰之2023
/
Mace
与 Fork 源项目一致
Fork自
Xiaomi / Mace
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
提交
79d940af
编写于
12月 12, 2017
作者:
Y
yejianwu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format coding, fix memory leak, use vector to read/write files instead of string
上级
d3c2d368
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
34 deletion
+41
-34
mace/core/runtime/opencl/opencl_runtime.cc
mace/core/runtime/opencl/opencl_runtime.cc
+40
-31
mace/core/runtime/opencl/opencl_runtime.h
mace/core/runtime/opencl/opencl_runtime.h
+0
-2
tools/validate_gcn.sh
tools/validate_gcn.sh
+1
-1
未找到文件。
mace/core/runtime/opencl/opencl_runtime.cc
浏览文件 @
79d940af
...
...
@@ -15,8 +15,9 @@
namespace
mace
{
namespace
{
bool
ReadFile
(
const
std
::
string
&
filename
,
std
::
string
&
content
,
bool
binary
)
{
content
=
""
;
bool
ReadFile
(
const
std
::
string
&
filename
,
bool
binary
,
std
::
vector
<
unsigned
char
>
*
content_ptr
)
{
MACE_CHECK_NOTNULL
(
content_ptr
);
std
::
ios_base
::
openmode
mode
=
std
::
ios
::
in
;
if
(
binary
)
{
...
...
@@ -25,6 +26,9 @@ bool ReadFile(const std::string &filename, std::string &content, bool binary) {
std
::
ifstream
ifs
(
filename
,
mode
);
// Stop eating new lines and whitespace
ifs
.
unsetf
(
std
::
ios
::
skipws
);
if
(
!
ifs
.
is_open
())
{
LOG
(
ERROR
)
<<
"Failed to open file "
<<
filename
;
return
false
;
...
...
@@ -32,33 +36,35 @@ bool ReadFile(const std::string &filename, std::string &content, bool binary) {
ifs
.
seekg
(
0
,
std
::
ios
::
end
);
const
size_t
filesize
=
ifs
.
tellg
();
if
(
filesize
>
10
485760
)
{
// 10485760 == 10 * 1024 * 1024
if
(
filesize
>
10
*
1024
*
1024
)
{
LOG
(
ERROR
)
<<
"Filesize overflow 10MB"
;
return
false
;
}
content
.
reserve
(
filesize
);
content
_ptr
->
reserve
(
filesize
);
ifs
.
seekg
(
0
,
std
::
ios
::
beg
);
content
.
assign
(
std
::
istreambuf_iterator
<
char
>
(
ifs
),
std
::
istreambuf_iterator
<
char
>
());
content
_ptr
->
insert
(
content_ptr
->
begin
(),
std
::
istreambuf_iterator
<
char
>
(
ifs
),
std
::
istreambuf_iterator
<
char
>
());
ifs
.
close
();
if
(
ifs
.
fail
())
{
LOG
(
ERROR
)
<<
"Failed to read from file "
<<
filename
;
return
false
;
}
ifs
.
close
();
return
true
;
}
bool
WriteFile
(
const
std
::
string
&
filename
,
const
std
::
string
&
content
,
bool
binary
)
{
bool
WriteFile
(
const
std
::
string
&
filename
,
bool
binary
,
const
std
::
vector
<
unsigned
char
>
&
content
)
{
std
::
ios_base
::
openmode
mode
=
std
::
ios
::
out
;
if
(
binary
)
{
mode
|=
std
::
ios
::
binary
;
}
std
::
ofstream
ofs
(
filename
,
mode
);
ofs
.
write
(
content
.
c_str
(),
content
.
size
());
ofs
.
write
(
reinterpret_cast
<
const
char
*>
(
&
content
[
0
]),
content
.
size
()
*
sizeof
(
char
));
ofs
.
close
();
if
(
ofs
.
fail
())
{
LOG
(
ERROR
)
<<
"Failed to write to file "
<<
filename
;
...
...
@@ -210,26 +216,23 @@ void OpenCLRuntime::BuildProgram(const std::string &program_file_name,
bool
is_binary_filename_exist
=
std
::
ifstream
(
binary_filename
).
is_open
();
if
(
is_binary_filename_exist
)
{
VLOG
(
1
)
<<
"Create program with binary: "
<<
binary_filename
;
std
::
string
kernel_binary
;
MACE_CHECK
(
ReadFile
(
binary_filename
,
kernel_binary
,
true
));
std
::
vector
<
unsigned
char
>
binaries
(
kernel_binary
.
begin
(),
kernel_binary
.
end
());
std
::
vector
<
unsigned
char
>
binaries
;
MACE_CHECK
(
ReadFile
(
binary_filename
,
true
,
&
binaries
));
*
program
=
cl
::
Program
(
this
->
context
(),
{
device
()},
{
binaries
});
}
else
if
(
std
::
ifstream
(
source_filename
).
is_open
())
{
VLOG
(
1
)
<<
"Create program with source: "
<<
source_filename
;
std
::
string
kernel_source
;
MACE_CHECK
(
ReadFile
(
source_filename
,
kernel_source
,
fals
e
));
std
::
vector
<
unsigned
char
>
kernel_source
;
MACE_CHECK
(
ReadFile
(
source_filename
,
false
,
&
kernel_sourc
e
));
cl
::
Program
::
Sources
sources
;
sources
.
push_back
(
{
kernel_source
.
c_str
(),
kernel_source
.
length
()}
);
sources
.
push_back
(
std
::
string
(
kernel_source
.
begin
(),
kernel_source
.
end
())
);
*
program
=
cl
::
Program
(
this
->
context
(),
sources
);
}
else
{
LOG
(
FATAL
)
<<
"Failed to open kernel file "
<<
binary_filename
<<
"
and
"
LOG
(
FATAL
)
<<
"Failed to open kernel file "
<<
binary_filename
<<
"
or
"
<<
source_filename
;
}
...
...
@@ -251,24 +254,30 @@ void OpenCLRuntime::BuildProgram(const std::string &program_file_name,
// Write binary if necessary
if
(
!
is_binary_filename_exist
)
{
size_t
deviceListSize
=
1
;
size_t
*
programBinarySizes
=
new
size_t
[
deviceListSize
];
size_t
device_list_size
=
1
;
std
::
unique_ptr
<
size_t
[]
>
program_binary_sizes
(
new
size_t
[
device_list_size
]);
cl_int
err
=
clGetProgramInfo
((
*
program
)(),
CL_PROGRAM_BINARY_SIZES
,
sizeof
(
size_t
)
*
device
ListS
ize
,
program
BinarySizes
,
nullptr
);
sizeof
(
size_t
)
*
device
_list_s
ize
,
program
_binary_sizes
.
get
()
,
nullptr
);
MACE_CHECK
(
err
==
CL_SUCCESS
)
<<
"Error code: "
<<
err
;
unsigned
char
**
programBinaries
=
new
unsigned
char
*
[
deviceListSize
];
for
(
cl_uint
i
=
0
;
i
<
deviceListSize
;
++
i
)
programBinaries
[
i
]
=
new
unsigned
char
[
programBinarySizes
[
i
]];
std
::
unique_ptr
<
std
::
unique_ptr
<
unsigned
char
[]
>
[]
>
program_binaries
(
new
std
::
unique_ptr
<
unsigned
char
[]
>
[
device_list_size
]);
for
(
cl_uint
i
=
0
;
i
<
device_list_size
;
++
i
)
{
program_binaries
[
i
]
=
std
::
unique_ptr
<
unsigned
char
[]
>
(
new
unsigned
char
[
program_binary_sizes
[
i
]]);
}
err
=
clGetProgramInfo
((
*
program
)(),
CL_PROGRAM_BINARIES
,
sizeof
(
unsigned
char
*
)
*
device
ListS
ize
,
program
Binaries
,
nullptr
);
sizeof
(
unsigned
char
*
)
*
device
_list_s
ize
,
program
_binaries
.
get
()
,
nullptr
);
MACE_CHECK
(
err
==
CL_SUCCESS
)
<<
"Error code: "
<<
err
;
std
::
string
content
(
reinterpret_cast
<
char
const
*>
(
programBinaries
[
0
]),
programBinarySizes
[
0
]);
std
::
vector
<
unsigned
char
>
content
(
reinterpret_cast
<
unsigned
char
const
*>
(
program_binaries
[
0
].
get
()),
reinterpret_cast
<
unsigned
char
const
*>
(
program_binaries
[
0
].
get
())
+
program_binary_sizes
[
0
]);
MACE_CHECK
(
WriteFile
(
binary_filename
,
content
,
true
));
MACE_CHECK
(
WriteFile
(
binary_filename
,
true
,
content
));
}
}
...
...
mace/core/runtime/opencl/opencl_runtime.h
浏览文件 @
79d940af
...
...
@@ -64,8 +64,6 @@ class OpenCLRuntime {
std
::
string
>
program_map_
;
mutable
std
::
map
<
std
::
string
,
cl
::
Program
>
built_program_map_
;
static
const
std
::
map
<
std
::
string
,
std
::
string
>
binary_map_
;
};
}
// namespace mace
...
...
tools/validate_gcn.sh
浏览文件 @
79d940af
...
...
@@ -49,7 +49,7 @@ bazel build -c opt --strip always mace/examples:mace_run \
adb shell
"mkdir -p
${
PHONE_DATA_DIR
}
"
adb shell
"mkdir -p
${
KERNEL_DIR
}
"
adb push mace/kernels/opencl/cl/
*
${
KERNEL_DIR
}
adb push mace/kernels/opencl/cl/
${
KERNEL_DIR
}
adb push
${
MODEL_DIR
}
/
${
MACE_OPT_MODEL_NAME
}
${
PHONE_DATA_DIR
}
adb push
${
MODEL_DIR
}
/
${
INPUT_FILE_NAME
}
${
PHONE_DATA_DIR
}
adb push bazel-bin/mace/examples/mace_run
${
PHONE_DATA_DIR
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录