From bdb093ea8aa6b720ed9670d4db7e3e327cce5030 Mon Sep 17 00:00:00 2001
From: unknown <zhaozhixuan2@hisilicon.com>
Date: Fri, 19 Mar 2021 16:34:53 +0800
Subject: [PATCH] Fix error.

---
 ge/generator/ge_generator.cc                  | 28 +++++++++----------
 inc/framework/generator/ge_generator.h        |  1 +
 .../ut/ge/generator/ge_generator_unittest.cc  |  7 +++++
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ge/generator/ge_generator.cc b/ge/generator/ge_generator.cc
index 2dc9c810..075cd922 100644
--- a/ge/generator/ge_generator.cc
+++ b/ge/generator/ge_generator.cc
@@ -663,23 +663,23 @@ namespace {
     }
     return SUCCESS;
   }
+}
 
-  bool CheckNoAicore(const ComputeGraphPtr &graph) {
-    for (const auto &node : graph->GetDirectNode()) {
-      if (node == nullptr) {
-        continue;
-      }
-      auto op_desc = node->GetOpDesc();
-      if (op_desc == nullptr) {
-        continue;
-      }
-      if (op_desc->GetOpEngineName() == kAIcoreEngine) {
-        return false;
-      }
+bool GeGenerator::CheckNoAicore(const ComputeGraphPtr &graph) {
+  for (const auto &node : graph->GetDirectNode()) {
+    if (node == nullptr) {
+      continue;
+    }
+    auto op_desc = node->GetOpDesc();
+    if (op_desc == nullptr) {
+      continue;
+    }
+    if (op_desc->GetOpEngineName() == kAIcoreEngine) {
+      return false;
     }
-    return true;
   }
-}  // namespace
+  return true;
+}
 
 Status GeGenerator::CheckForSingleOp(OpDescPtr &op_desc, const vector<GeTensor> &inputs,
                                      const vector<GeTensor> &outputs) {
diff --git a/inc/framework/generator/ge_generator.h b/inc/framework/generator/ge_generator.h
index 2d7d007b..77109e5f 100644
--- a/inc/framework/generator/ge_generator.h
+++ b/inc/framework/generator/ge_generator.h
@@ -97,6 +97,7 @@ class GE_FUNC_VISIBILITY GeGenerator {
   Status BuildSingleOp(OpDescPtr &op_desc, const vector<GeTensor> &inputs, const vector<GeTensor> &outputs,
                        const string &model_file_name, OpEngineType engine_type, ModelBufferData &model_buff,
                        bool is_offline = true);
+  bool CheckNoAicore(const ComputeGraphPtr &graph);
   Status CheckForSingleOp(OpDescPtr &op_desc, const vector<GeTensor> &inputs, const vector<GeTensor> &outputs);
 
   class Impl;
diff --git a/tests/ut/ge/generator/ge_generator_unittest.cc b/tests/ut/ge/generator/ge_generator_unittest.cc
index 598ac8dd..775cf2f3 100644
--- a/tests/ut/ge/generator/ge_generator_unittest.cc
+++ b/tests/ut/ge/generator/ge_generator_unittest.cc
@@ -87,6 +87,13 @@ TEST_F(UtestGeGenerator, test_build_single_op_online) {
   EXPECT_EQ(generator.BuildSingleOpModel(op_desc, inputs, outputs, ENGINE_AIVECTOR, model_buffer), FAILED);
 }
 
+TEST_F(UtestGeGenerator, test_build_single_op_online) {
+  GeGenerator generator;
+  generator.Initialize({});
+  auto graph = MakeGraph();
+  EXPECT_EQ(generator.CheckNoAicore(graph), true);
+}
+
 TEST_F(UtestGeGenerator, test_graph_manager) {
   GraphManager graph_manager;
   GraphPartitioner graph_partitioner;