p74368291
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade_ascend_0705

This commit is contained in:
dingpeifei 2021-07-05 20:13:39 +08:00 committed by zhoufeng
parent 7dffa5096c
commit 24ff7ab8b4
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphengine

@ -1 +1 @@
Subproject commit b4b7c454e6041e864cdc2cc0fb5e61d3b5223c30
Subproject commit acc2472c4119d70b579d7ac2f7a6bbf2c344af29

14
mindspore/_extends/parallel_compile/tbe_compiler/compiler.py
View File

@ -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):

5
mindspore/ccsrc/runtime/device/ascend/lic_manager.cc
View File

@ -17,10 +17,7 @@
#include <regex>
#include "utils/ms_context.h"
#include "runtime/dev.h"
namespace gelc {
uint32_t GetOptInfo(uint32_t, const std::string &, std::map<std::string, std::string> &); // NOLINT
} // namespace gelc
#include "opt_info/opt_info.h"
namespace mindspore {
namespace {

2
mindspore/run_check/_check_version.py
View File

@ -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"

2
tests/ut/cpp/stub/ge/ge_mock.cc
View File

@ -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<std::string, std::string> &opt_info_map) {
return 0;
}
} // extern C
} // namespace gelc
#endif