From 88d7a9038cb73ce30df564279c6405c0448493e8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 21 Jan 2021 17:13:40 +0800 Subject: [PATCH] remove specific process when swtich control edge to other node --- parser/tensorflow/tensorflow_parser.cc | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/parser/tensorflow/tensorflow_parser.cc b/parser/tensorflow/tensorflow_parser.cc index 4304723..0342f2b 100644 --- a/parser/tensorflow/tensorflow_parser.cc +++ b/parser/tensorflow/tensorflow_parser.cc @@ -721,23 +721,15 @@ Status TensorFlowModelParser::AddEdges(ge::ComputeGraphPtr &graph) { GELOGD("Start add contorl edge: from %s to %s.", src->GetName().c_str(), dest->GetName().c_str()); ge::InControlAnchorPtr in_archor_ptr = dest->GetInControlAnchor(); GE_CHECK_NOTNULL(in_archor_ptr); - GE_IF_BOOL_EXEC(nodedef_map_[src_op_name]->op() != TENSORFLOWF_NODE_OP_SWITCH, - ge::OutControlAnchorPtr out_archor_ptr = src->GetOutControlAnchor(); - GE_CHECK_NOTNULL(out_archor_ptr); GE_CHK_BOOL_TRUE_EXEC_WITH_LOG( - ge::GraphUtils::AddEdge(out_archor_ptr, in_archor_ptr) != ge::GRAPH_SUCCESS, - ErrorManager::GetInstance().ATCReportErrMessage("E12014", {"opname1", "opname2"}, - {src->GetName(), dest->GetName()}); - return INTERNAL_ERROR, "Add link failed from op[%s] to op[%s].", src->GetName().c_str(), - dest->GetName().c_str());); - - GE_IF_BOOL_EXEC(nodedef_map_[src_op_name]->op() == TENSORFLOWF_NODE_OP_SWITCH, - ge::OutDataAnchorPtr out_data_archor_ptr = src->GetOutDataAnchor(outputpair.first); - GE_CHECK_NOTNULL(out_data_archor_ptr); GE_CHK_BOOL_TRUE_EXEC_WITH_LOG( - ge::GraphUtils::AddEdge(out_data_archor_ptr, in_archor_ptr) != ge::GRAPH_SUCCESS, - ErrorManager::GetInstance().ATCReportErrMessage("E12014", {"opname1", "opname2"}, - {src->GetName(), dest->GetName()}); - return INTERNAL_ERROR, "Add link failed from op[%s] to op[%s].", src->GetName().c_str(), - dest->GetName().c_str());); + ge::OutControlAnchorPtr out_archor_ptr = src->GetOutControlAnchor(); + GE_CHECK_NOTNULL(out_archor_ptr); + GE_CHK_BOOL_TRUE_EXEC_WITH_LOG( + ge::GraphUtils::AddEdge(out_archor_ptr, in_archor_ptr) != ge::GRAPH_SUCCESS, + ErrorManager::GetInstance().ATCReportErrMessage("E12014", {"opname1", "opname2"}, + {src->GetName(), dest->GetName()}); + return INTERNAL_ERROR, "Add link failed from op[%s] to op[%s].", src->GetName().c_str(), + dest->GetName().c_str() + ); } } dest_input_map.erase(input_iter);