diff --git a/graphengine b/graphengine index b4b7c454e60..acc2472c411 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit b4b7c454e6041e864cdc2cc0fb5e61d3b5223c30 +Subproject commit acc2472c4119d70b579d7ac2f7a6bbf2c344af29 diff --git a/mindspore/_extends/parallel_compile/tbe_compiler/compiler.py b/mindspore/_extends/parallel_compile/tbe_compiler/compiler.py index 472377ff808..2a993d8ab35 100755 --- a/mindspore/_extends/parallel_compile/tbe_compiler/compiler.py +++ b/mindspore/_extends/parallel_compile/tbe_compiler/compiler.py @@ -73,6 +73,9 @@ def build_op(build_type, json_str, tune_mode=None): rl_tune_switch = kernel_info['op_info']['rl_tune_switch'] rl_tune_list = kernel_info['op_info']['rl_tune_list'] reset_op_info = kernel_info["reset_op_info"] + op_tune_switch = kernel_info['op_info']['op_tune_switch'] + op_tune_list = kernel_info['op_info']['op_tune_list'] + pass_list = kernel_info['op_info']['pass_list'] try: custom_flag = False @@ -147,7 +150,10 @@ def build_op(build_type, json_str, tune_mode=None): fuzz_build_info=None, reset_op_info=reset_op_info, switch_str=rl_tune_switch, - lic_opt_list=rl_tune_list) + lic_opt_list=rl_tune_list, + pass_opt_list=pass_list, + switch_optune=op_tune_switch, + optune_opt_list=op_tune_list) if tune_mode is not None: return None, (inputs_args, outputs_args, attrs_args), op_module_name return res @@ -177,8 +183,12 @@ def compile_fusion_op(json_str): fusion_op_arg = args['fusion_op'] rl_tune_switch = args['fusion_op']['rl_tune_switch'] rl_tune_list = args['fusion_op']['rl_tune_list'] + op_tune_switch = args['fusion_op']['op_tune_switch'] + op_tune_list = args['fusion_op']['op_tune_list'] + pass_list = args['fusion_op']['pass_list'] return fusion_op(json.dumps(fusion_op_arg), reset_op_info=reset_op_info, switch_str=rl_tune_switch, - lic_opt_list=rl_tune_list) + lic_opt_list=rl_tune_list, pass_opt_list=pass_list, + switch_optune=op_tune_switch, optune_opt_list=op_tune_list) def compile_with_json(json_str): diff --git a/mindspore/ccsrc/runtime/device/ascend/lic_manager.cc b/mindspore/ccsrc/runtime/device/ascend/lic_manager.cc index 06057af331b..50e4c6a7d27 100644 --- a/mindspore/ccsrc/runtime/device/ascend/lic_manager.cc +++ b/mindspore/ccsrc/runtime/device/ascend/lic_manager.cc @@ -17,10 +17,7 @@ #include #include "utils/ms_context.h" #include "runtime/dev.h" - -namespace gelc { -uint32_t GetOptInfo(uint32_t, const std::string &, std::map &); // NOLINT -} // namespace gelc +#include "opt_info/opt_info.h" namespace mindspore { namespace { diff --git a/mindspore/run_check/_check_version.py b/mindspore/run_check/_check_version.py index c7dfd2c72c8..af3ff030822 100644 --- a/mindspore/run_check/_check_version.py +++ b/mindspore/run_check/_check_version.py @@ -207,7 +207,7 @@ class AscendEnvChecker(EnvChecker): """ascend environment check""" def __init__(self): - self.version = ["1.78.23.1.230"] + self.version = ["1.78.23.2.230"] atlas_nnae_version = "/usr/local/Ascend/nnae/latest/fwkacllib/version.info" atlas_toolkit_version = "/usr/local/Ascend/ascend-toolkit/latest/fwkacllib/version.info" hisi_fwk_version = "/usr/local/Ascend/fwkacllib/version.info" diff --git a/tests/ut/cpp/stub/ge/ge_mock.cc b/tests/ut/cpp/stub/ge/ge_mock.cc index ed32606bb32..2a405c20073 100644 --- a/tests/ut/cpp/stub/ge/ge_mock.cc +++ b/tests/ut/cpp/stub/ge/ge_mock.cc @@ -53,8 +53,10 @@ Status Graph::SaveToFile(const string& file_name) const { return ge::GRAPH_SUCCE } // namespace ge namespace gelc { +extern "C" { uint32_t GetOptInfo(uint32_t mode, const std::string &soc_ver, std::map &opt_info_map) { return 0; } +} // extern C } // namespace gelc #endif