Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mr.Vain
Mace
提交
773ff815
Mace
项目概览
Mr.Vain
/
Mace
与 Fork 源项目一致
Fork自
Xiaomi / Mace
通知
1
Star
1
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,发现更多精彩内容 >>
提交
773ff815
编写于
4月 26, 2018
作者:
吴
吴承辉
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'update_build_flow_for_non-gpu' into 'master'
Update build flow for non gpu See merge request !427
上级
d3ccb99b
61e5698f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
42 deletion
+49
-42
tools/mace_tools.py
tools/mace_tools.py
+44
-34
tools/sh_commands.py
tools/sh_commands.py
+5
-8
未找到文件。
tools/mace_tools.py
浏览文件 @
773ff815
...
...
@@ -199,41 +199,51 @@ def build_mace_run_prod(hexagon_mode, runtime, target_abi,
input_shapes
,
output_shapes
,
model_name
,
device_type
,
running_round
,
restart_round
,
tuning
,
limit_opencl_kernel_time
,
phone_data_dir
):
gen_opencl_and_tuning_code
(
target_abi
,
serialno
,
[],
False
)
production_or_not
=
False
mace_run_target
=
"//mace/tools/validation:mace_run"
sh_commands
.
bazel_build
(
mace_run_target
,
abi
=
target_abi
,
model_tag
=
model_name
,
production_mode
=
False
,
hexagon_mode
=
hexagon_mode
)
sh_commands
.
update_mace_run_lib
(
model_output_dir
,
target_abi
,
model_name
,
embed_model_data
)
tuning_run
(
runtime
,
target_abi
,
serialno
,
vlog_level
,
embed_model_data
,
model_output_dir
,
input_nodes
,
output_nodes
,
input_shapes
,
output_shapes
,
model_name
,
device_type
,
running_round
=
0
,
restart_round
=
1
,
out_of_range_check
=
True
,
phone_data_dir
=
phone_data_dir
,
tuning
=
False
)
tuning_run
(
runtime
,
target_abi
,
serialno
,
vlog_level
,
embed_model_data
,
model_output_dir
,
input_nodes
,
output_nodes
,
input_shapes
,
output_shapes
,
model_name
,
device_type
,
running_round
=
0
,
restart_round
=
1
,
out_of_range_check
=
False
,
phone_data_dir
=
phone_data_dir
,
tuning
=
tuning
,
limit_opencl_kernel_time
=
limit_opencl_kernel_time
)
gen_opencl_and_tuning_code
(
target_abi
,
serialno
,
[
model_output_dir
],
True
)
production_or_not
=
True
sh_commands
.
bazel_build
(
mace_run_target
,
abi
=
target_abi
,
model_tag
=
model_name
,
production_mode
=
True
,
hexagon_mode
=
hexagon_mode
)
sh_commands
.
update_mace_run_lib
(
model_output_dir
,
target_abi
,
model_name
,
embed_model_data
)
if
runtime
==
"gpu"
:
gen_opencl_and_tuning_code
(
target_abi
,
serialno
,
[],
False
)
sh_commands
.
bazel_build
(
mace_run_target
,
abi
=
target_abi
,
model_tag
=
model_name
,
production_mode
=
False
,
hexagon_mode
=
hexagon_mode
)
sh_commands
.
update_mace_run_lib
(
model_output_dir
,
target_abi
,
model_name
,
embed_model_data
)
tuning_run
(
runtime
,
target_abi
,
serialno
,
vlog_level
,
embed_model_data
,
model_output_dir
,
input_nodes
,
output_nodes
,
input_shapes
,
output_shapes
,
model_name
,
device_type
,
running_round
=
0
,
restart_round
=
1
,
out_of_range_check
=
True
,
phone_data_dir
=
phone_data_dir
,
tuning
=
False
)
tuning_run
(
runtime
,
target_abi
,
serialno
,
vlog_level
,
embed_model_data
,
model_output_dir
,
input_nodes
,
output_nodes
,
input_shapes
,
output_shapes
,
model_name
,
device_type
,
running_round
=
0
,
restart_round
=
1
,
out_of_range_check
=
False
,
phone_data_dir
=
phone_data_dir
,
tuning
=
tuning
,
limit_opencl_kernel_time
=
limit_opencl_kernel_time
)
gen_opencl_and_tuning_code
(
target_abi
,
serialno
,
[
model_output_dir
],
True
)
sh_commands
.
bazel_build
(
mace_run_target
,
abi
=
target_abi
,
model_tag
=
model_name
,
production_mode
=
True
,
hexagon_mode
=
hexagon_mode
)
sh_commands
.
update_mace_run_lib
(
model_output_dir
,
target_abi
,
model_name
,
embed_model_data
)
else
:
gen_opencl_and_tuning_code
(
target_abi
,
serialno
,
[],
False
)
sh_commands
.
bazel_build
(
mace_run_target
,
abi
=
target_abi
,
model_tag
=
model_name
,
production_mode
=
True
,
hexagon_mode
=
hexagon_mode
)
sh_commands
.
update_mace_run_lib
(
model_output_dir
,
target_abi
,
model_name
,
embed_model_data
)
def
merge_libs_and_tuning_results
(
target_soc
,
...
...
tools/sh_commands.py
浏览文件 @
773ff815
...
...
@@ -643,6 +643,11 @@ def validate_model(abi,
sh
.
docker
(
"build"
,
"-t"
,
image_name
,
"docker/caffe"
)
container_id
=
sh
.
docker
(
"ps"
,
"-qa"
,
"-f"
,
"name=%s"
%
container_name
)
if
container_id
and
not
sh
.
docker
(
"ps"
,
"-qa"
,
"--filter"
,
"status=running"
,
"-f"
,
"name=%s"
%
container_name
):
sh
.
docker
(
"rm"
,
"-f"
,
container_name
)
container_id
=
""
if
not
container_id
:
print
(
"Run caffe container"
)
sh
.
docker
(
...
...
@@ -654,14 +659,6 @@ def validate_model(abi,
image_name
,
"/bin/bash"
)
container_status
=
sh
.
docker
(
"inspect"
,
"-f"
,
"{{.State.Running}}"
,
container_name
)
if
container_status
==
"false"
:
print
(
"Start caffe container"
)
sh
.
docker
(
"start"
,
container_name
)
for
input_name
in
input_nodes
:
formatted_input_name
=
formatted_file_name
(
input_name
,
input_file_name
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录