From ee03aa5dec0711d13ce68bb7fb9473b4e05fbb1d Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Sat, 12 Dec 2020 19:41:36 +0800
Subject: [PATCH] update aicpu model builder

---
 ge/graph/build/model_builder.cc                  | 8 ++++----
 ge/graph/build/model_builder.h                   | 2 +-
 ge/graph/load/new_model_manager/model_manager.cc | 2 +-
 ge/hybrid/model/hybrid_model_builder.cc          | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ge/graph/build/model_builder.cc b/ge/graph/build/model_builder.cc
index 1eb758c3..b68b5f60 100755
--- a/ge/graph/build/model_builder.cc
+++ b/ge/graph/build/model_builder.cc
@@ -581,6 +581,8 @@ Status ModelBuilder::SaveDataToModel(ge::Model &model, ge::GeModel &ge_model) {
   // Add TBE Kernels and custom aicpu op bin
   std::set<std::string> tbe_name_set;
   std::set<std::string> aicpu_name_set;
+  std::set<std::string> aicpu_optype_set;
+  std::set<std::string> aicpu_tf_optype_set;
   for (const ge::NodePtr &n : compute_graph_->GetNodes(compute_graph_->GetGraphUnknownFlag())) {
     auto node_op_desc = n->GetOpDesc();
     GE_IF_BOOL_EXEC(node_op_desc == nullptr, continue);
@@ -607,7 +609,7 @@ Status ModelBuilder::SaveDataToModel(ge::Model &model, ge::GeModel &ge_model) {
     tbe_kernel_store_.AddTBEKernel(tbe_kernel);
   }
 
-  (void)SetModelAicpuCheckAttr(model);
+  (void)SetModelCheckAicpuAttr(model);
 
   for (const ge::NodePtr &n : compute_graph_->GetNodes(compute_graph_->GetGraphUnknownFlag())) {
     auto node_op_desc = n->GetOpDesc();
@@ -820,11 +822,9 @@ Status ModelBuilder::CollectCheckAicpuAttr(const OpDescPtr &op_desc, std::set<st
   return SUCCESS;
 }
 
-Status ModelBuilder::SetModelCheckAicpuAttr(ge::Model &model) {
+Status ModelBuilder::SetModelCheckAicpuAttr(ge::Model &model, std::set<std::string> &aicpu_optype_set, std::set<std::string> &aicpu_tf_optype_set) {
   std::vector<std::string> aicpu_optype_list;
   std::vector<std::string> aicpu_tf_optype_list;
-  std::set<std::string> aicpu_optype_set;
-  std::set<std::string> aicpu_tf_optype_set;
   if (ge::AttrUtils::GetListStr(&model, "needCheckCpu", aicpu_optype_list)) {
     GELOGI("Already have aicpu optype size: %zu", aicpu_optype_list.size());
     aicpu_optype_set.insert(aicpu_optype_list.begin(), aicpu_optype_list.end());
diff --git a/ge/graph/build/model_builder.h b/ge/graph/build/model_builder.h
index e4dfbf0f..b133b98b 100644
--- a/ge/graph/build/model_builder.h
+++ b/ge/graph/build/model_builder.h
@@ -85,7 +85,7 @@ class ModelBuilder {
 
   Status CollectCheckAicpuAttr(const OpDescPtr &op_desc, std::set<std::string> &cpue_check_set, std::set<std::string> &tf_engine_set);
 
-  Status SetModelCheckAicpuAttr(ge::Model &model);
+  Status SetModelCheckAicpuAttr(ge::Model &model, std::set<std::string> &aicpu_optype_set, std::set<std::string> &aicpu_tf_optype_set);
 
   uint64_t session_id_;
 
diff --git a/ge/graph/load/new_model_manager/model_manager.cc b/ge/graph/load/new_model_manager/model_manager.cc
index 7d776eb7..fc0ebb8a 100755
--- a/ge/graph/load/new_model_manager/model_manager.cc
+++ b/ge/graph/load/new_model_manager/model_manager.cc
@@ -1701,7 +1701,7 @@ Status ModelManager::LaunchKernelCheckAicpuOp(std::vector<std::string> &aicpu_op
   return SUCCESS;
 }
 
-Status ModelManager::CheckAicpuOp(GeModelPtr ge_model) {
+Status ModelManager::CheckAicpuOpList(GeModelPtr ge_model) {
   std::vector<std::string> aicpu_optype_list;
   std::vector<std::string> aicpu_tf_optype_list;
   bool aicpu_need_check = ge::AttrUtils::GetListStr(ge_model, "needCheckCpu", aicpu_optype_list);
diff --git a/ge/hybrid/model/hybrid_model_builder.cc b/ge/hybrid/model/hybrid_model_builder.cc
index 3ffb2dc6..e0d0913e 100755
--- a/ge/hybrid/model/hybrid_model_builder.cc
+++ b/ge/hybrid/model/hybrid_model_builder.cc
@@ -1566,7 +1566,6 @@ Status HybridModelBuilder::CheckAicpuOpList() {
   std::set<std::string> aicpu_optype_set;
   std::set<std::string> aicpu_tf_optype_set;
   for (auto &it : ge_root_model_->GetSubgraphInstanceNameToModel()) {
-    auto &name = it.first;
     auto &ge_model = it.second;
     GE_CHECK_NOTNULL(ge_model);
     if (ge::AttrUtils::GetListStr(*ge_model, "needCheckCpu", aicpu_optype_list)) {