Browse Source

Fix error.

tags/v1.3.0
unknown 4 years ago
parent
commit
bdb093ea8a
3 changed files with 22 additions and 14 deletions
  1. +14
    -14
      ge/generator/ge_generator.cc
  2. +1
    -0
      inc/framework/generator/ge_generator.h
  3. +7
    -0
      tests/ut/ge/generator/ge_generator_unittest.cc

+ 14
- 14
ge/generator/ge_generator.cc View File

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


+ 1
- 0
inc/framework/generator/ge_generator.h View File

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


+ 7
- 0
tests/ut/ge/generator/ge_generator_unittest.cc View File

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


Loading…
Cancel
Save