Browse Source

fix error code and add complex128 support

tags/v1.5.1
lichun 3 years ago
parent
commit
927439cb92
5 changed files with 8 additions and 7 deletions
  1. +0
    -1
      ge/generator/ge_generator.cc
  2. +1
    -1
      ge/graph/build/memory/graph_mem_assigner.cc
  3. +3
    -2
      ge/graph/build/memory/memory_assigner.cc
  4. +2
    -2
      ge/graph/manager/graph_manager.cc
  5. +2
    -1
      ge/offline/single_op_parser.cc

+ 0
- 1
ge/generator/ge_generator.cc View File

@@ -1157,7 +1157,6 @@ Status GeGenerator::Impl::BuildModel(const Graph &graph, const vector<GeTensor>
if (ret != SUCCESS) {
REPORT_CALL_ERROR("E19999", "build graph failed, graph id:%u, ret:%d", graph_id, ret);
GELOGE(GE_GENERATOR_GRAPH_MANAGER_BUILD_GRAPH_FAILED, "[Build][Graph] fail, graph id: %u", graph_id);
ret = GE_GENERATOR_GRAPH_MANAGER_BUILD_GRAPH_FAILED;
}

RtContextUtil::GetInstance().DestroyRtContexts(session_id);


+ 1
- 1
ge/graph/build/memory/graph_mem_assigner.cc View File

@@ -275,7 +275,7 @@ Status GraphMemoryAssigner::ReAssignMemory(bool is_loop_graph, map<uint64_t, siz
"E19022", std::vector<std::string>({"size", "item", "maxsize"}),
std::vector<std::string>({std::to_string(total_mem_offset), "featuremap",
std::to_string(VarManager::Instance(session_id)->GetGraphMemoryMaxSize())}));
return ge::FAILED;
return ACL_ERROR_GE_MEMORY_ALLOCATION;
}
return SUCCESS;
}


+ 3
- 2
ge/graph/build/memory/memory_assigner.cc View File

@@ -29,9 +29,10 @@ Status MemoryAssigner::AssignMemory(bool is_loop_graph, map<uint64_t, size_t> &m
}

// Reassign memory for special nodes
if (graph_mem_assigner.ReAssignMemory(is_loop_graph, mem_offset) != ge::SUCCESS) {
Status ret = graph_mem_assigner.ReAssignMemory(is_loop_graph, mem_offset)
if (ret != ge::SUCCESS) {
GELOGE(ge::FAILED, "[ReAssign][Memory] failed, graph:%s", compute_graph_->GetName().c_str());
return ge::FAILED;
return ret;
}

// Assign memory (block and offset) for zero copy nodes


+ 2
- 2
ge/graph/manager/graph_manager.cc View File

@@ -1482,8 +1482,8 @@ Status GraphManager::BuildGraph(const GraphId &graph_id, const std::vector<GeTen
ret = StartForRunGraph(graph_node, inputs, ge_root_model, session_id);
graph_node->SetRunFlag(false);
if (ret != SUCCESS) {
GELOGE(GE_GRAPH_PRERUN_FAILED, "[Call][StartForRunGraph] failed! graph_id:%u.", graph_id);
return GE_GRAPH_PRERUN_FAILED;
GELOGE(ret, "[Call][StartForRunGraph] failed! graph_id:%u.", graph_id);
return ret;
}

GELOGI("[BuildGraph] build graph success, graph_id=%u.", graph_id);


+ 2
- 1
ge/offline/single_op_parser.cc View File

@@ -89,7 +89,8 @@ map<string, DataType> kDataTypeDict = {
{"float", DT_FLOAT},
{"float32", DT_FLOAT},
{"double", DT_DOUBLE},
{"complex64", DT_COMPLEX64}
{"complex64", DT_COMPLEX64},
{"complex128", DT_COMPLEX128}
};

map<string, Format> kFormatDict = {


Loading…
Cancel
Save