!1092 Add root_graph output_edges.

From: @zhao_zhixuan
Reviewed-by: @xchu42,@ji_chen
Signed-off-by: @ji_chen
pull/1092/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
commit 3d89947d75

@ -702,9 +702,32 @@ Status HybridModelBuilder::UnfoldSubgraph(ComputeGraph &root_graph,
}
Status HybridModelBuilder::BuildOutputMapping(GraphItem &graph_item,
const NodeItem &node_item) {
auto output_size = node_item.op_desc->GetAllInputsSize();
GE_CHECK_LE(output_size, UINT32_MAX);
const NodeItem &node_item,
bool is_root_graph) {
auto output_size = node_item.num_inputs;
graph_item.output_edges_.resize(output_size);
for (auto &in_data_anchor : node_item.node->GetAllInDataAnchors()) {
auto peer_out_anchor = in_data_anchor->GetPeerOutAnchor();
GE_CHECK_NOTNULL(peer_out_anchor);
auto src_node = peer_out_anchor->GetOwnerNode();
GE_CHECK_NOTNULL(src_node);
auto src_node_item = GetNodeItem(src_node);
GE_CHECK_NOTNULL(src_node_item);
auto output_idx = in_data_anchor->GetIdx();
auto output_offset = src_node_item->output_start + peer_out_anchor->GetIdx();
GELOGI("Output[%d], node = %s, output_index = %d, output_offset = %d ",
output_idx,
src_node_item->NodeName().c_str(),
peer_out_anchor->GetIdx(),
output_offset);
GE_CHECK_LE(output_idx, output_size - 1);
graph_item.output_edges_[output_idx] = {src_node_item, peer_out_anchor->GetIdx()};
}
if (!is_root_graph) {
for (uint32_t i = 0; i < static_cast<uint32_t>(output_size); ++i) {
uint32_t p_index = i;
// Net output of Subgraph of while do not have parent index
@ -714,6 +737,7 @@ Status HybridModelBuilder::BuildOutputMapping(GraphItem &graph_item,
graph_item.output_index_mapping_.emplace_back(p_index);
}
}
return SUCCESS;
}
@ -1876,9 +1900,7 @@ Status HybridModelBuilder::LoadDynamicSubgraph(ComputeGraph &graph, bool is_root
data_nodes.emplace_back(node_item);
} else if (op_type == NETOUTPUT) {
graph_item->output_node_ = node_item;
if (!is_root_graph) {
GE_CHK_STATUS_RET_NOLOG(BuildOutputMapping(*graph_item, *node_item));
}
GE_CHK_STATUS_RET_NOLOG(BuildOutputMapping(*graph_item, *node_item, is_root_graph));
}
GE_CHK_STATUS_RET_NOLOG(CreateProfilingNodeBefore(*graph_item, node));
graph_item->node_items_.emplace_back(node_item);

@ -53,7 +53,7 @@ class HybridModelBuilder {
std::vector<NodeItem *> &data_nodes,
bool is_root_graph);
static Status ResolveRefIo(NodeItem &node_item);
Status BuildOutputMapping(GraphItem &partitioned_call, const NodeItem &node_item);
Status BuildOutputMapping(GraphItem &partitioned_call, const NodeItem &node_item, bool is_root_graph);
Status ValidateParams();
Status LoadGraph();
Status LoadGeModel(ComputeGraph &graph, const GeModelPtr &ge_model);

Loading…
Cancel
Save