Pre Merge pull request !1861 from 陈华/r1.5.0

ge/CMakeLists.txt

@@ -774,7 +774,7 @@ target_include_directories(ge_runner SYSTEM PRIVATE
     ${GE_CODE_DIR}/../inc/cce
     ${GE_CODE_DIR}/../toolchain/ide/ide-daemon/external
     ${GE_CODE_DIR}/../abl/adump/external
-    ${GE_CODE_DIR}/../abl/licctrll
+    ${GE_CODE_DIR}/../abl/licctrl
     #### blue zone
     ${ASCEND_DIR}/driver/include
     ${ASCEND_DIR}/fwkacllib/include

ge/ge_opt_info/ge_opt_info.cc

@@ -33,15 +33,13 @@ Status GeOptInfo::SetOptInfo() {
     return FAILED;
   }
   GELOGD("Soc version:%s.", soc_ver.c_str());
-  std::map<std::string, std::string> opt_info;
-  // the first arg does not work at present.
-  if (gelc::GetOptInfo(gelc::kOffline, soc_ver, opt_info) != gelc::SUCCESS) {
-    REPORT_CALL_ERROR("E19999", "Get optional information failed, is_offline:%d, soc version:%s",
-                      gelc::kOffline, soc_ver.c_str());
-    GELOGE(FAILED, "[Get][OptInfo]Get optional information failed, is_offline:%d, soc version:%s",
-           gelc::kOffline, soc_ver.c_str());
-    return FAILED;
-  }
+  std::map<std::string, std::string> opt_info = {
+    {"opt_module.pass", "ALL"},
+    {"opt_module.aoe", "ALL"},
+    {"opt_module.op_tune", "ALL"},
+    {"opt_module.rl_tune", "ALL"},
+    {"opt_module.fe", "ALL"},
+  };
   // do nothing if get empty information
   if (opt_info.empty()) {
     GELOGI("Optional information is empty.");