提交 07b7faaf 编写于 作者: 叶剑武

Merge branch 'fix-host-bug' into 'master'

Fix host with target_soc bug.

See merge request !624
...@@ -963,7 +963,7 @@ def run_specific_target(flags, configs, target_abi, ...@@ -963,7 +963,7 @@ def run_specific_target(flags, configs, target_abi,
embed_model_data = configs[YAMLKeyword.embed_model_data] embed_model_data = configs[YAMLKeyword.embed_model_data]
opencl_output_bin_path = "" opencl_output_bin_path = ""
linkshared = configs[YAMLKeyword.linkshared] linkshared = configs[YAMLKeyword.linkshared]
if not configs[YAMLKeyword.target_socs]: if not configs[YAMLKeyword.target_socs] or target_abi == ABIType.host:
build_tmp_binary_dir = get_build_binary_dir(library_name, target_abi, build_tmp_binary_dir = get_build_binary_dir(library_name, target_abi,
None, None) None, None)
else: else:
...@@ -1000,7 +1000,7 @@ def run_specific_target(flags, configs, target_abi, ...@@ -1000,7 +1000,7 @@ def run_specific_target(flags, configs, target_abi,
model_runtime = model_config[YAMLKeyword.runtime] model_runtime = model_config[YAMLKeyword.runtime]
subgraphs = model_config[YAMLKeyword.subgraphs] subgraphs = model_config[YAMLKeyword.subgraphs]
if not configs[YAMLKeyword.target_socs]: if not configs[YAMLKeyword.target_socs] or target_abi == ABIType.host:
model_output_base_dir, model_output_dir, mace_model_dir = \ model_output_base_dir, model_output_dir, mace_model_dir = \
get_build_model_dirs(library_name, model_name, target_abi, get_build_model_dirs(library_name, model_name, target_abi,
None, None, None, None,
...@@ -1125,7 +1125,7 @@ def bm_specific_target(flags, configs, target_abi, target_soc, serial_num): ...@@ -1125,7 +1125,7 @@ def bm_specific_target(flags, configs, target_abi, target_soc, serial_num):
embed_model_data = configs[YAMLKeyword.embed_model_data] embed_model_data = configs[YAMLKeyword.embed_model_data]
opencl_output_bin_path = "" opencl_output_bin_path = ""
linkshared = configs[YAMLKeyword.linkshared] linkshared = configs[YAMLKeyword.linkshared]
if not configs[YAMLKeyword.target_socs]: if not configs[YAMLKeyword.target_socs] or target_abi == ABIType.host:
build_tmp_binary_dir = get_build_binary_dir(library_name, target_abi, build_tmp_binary_dir = get_build_binary_dir(library_name, target_abi,
None, None) None, None)
else: else:
...@@ -1151,7 +1151,7 @@ def bm_specific_target(flags, configs, target_abi, target_soc, serial_num): ...@@ -1151,7 +1151,7 @@ def bm_specific_target(flags, configs, target_abi, target_soc, serial_num):
model_runtime = model_config[YAMLKeyword.runtime] model_runtime = model_config[YAMLKeyword.runtime]
subgraphs = model_config[YAMLKeyword.subgraphs] subgraphs = model_config[YAMLKeyword.subgraphs]
if not configs[YAMLKeyword.target_socs]: if not configs[YAMLKeyword.target_socs] or target_abi == ABIType.host:
model_output_base_dir, model_output_dir, mace_model_dir = \ model_output_base_dir, model_output_dir, mace_model_dir = \
get_build_model_dirs(library_name, model_name, target_abi, get_build_model_dirs(library_name, model_name, target_abi,
None, None, None, None,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册