From a77ecde682a000d9ba8a5cfa25b161e2ca118bea Mon Sep 17 00:00:00 2001 From: lichun Date: Tue, 23 Mar 2021 16:09:38 +0800 Subject: [PATCH] Bugfix: support unknown control op subgraph --- tests/ut/ge/hybrid/ge_hybrid_unittest.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc index e244eb2f..7e6da9e0 100644 --- a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc +++ b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc @@ -260,11 +260,6 @@ TEST_F(UtestGeHybrid, hybrid_model_executor) { TEST_F(UtestGeHybrid, unfold_subgraphs_success) { ComputeGraphPtr merged_graph = nullptr; - ComputeGraphPtr sub_graph = std::make_shared("sub_graph"); - OpDescPtr sub_graph_while_op_desc = CreateOpDesc("while", WHILE); - NodePtr sub_graph_while_node = sub_graph->AddNode(sub_graph_while_op_desc); - sub_graph->SetGraphUnknownFlag(true); - ComputeGraphPtr sub_sub_graph1 = std::make_shared("while_cond"); OpDescPtr sub_sub_graph_while_cond_data_op_desc = CreateOpDesc("cond_data", DATA); NodePtr sub_sub_graph_while_cond_data_node = sub_sub_graph1->AddNode(sub_sub_graph_while_cond_data_op_desc); @@ -279,6 +274,13 @@ TEST_F(UtestGeHybrid, unfold_subgraphs_success) { sub_sub_graph_while_body_add_node->AddLinkFrom(sub_sub_graph_while_body_data_node); sub_sub_graph_while_body_add_node->AddLinkFrom(sub_sub_graph_while_body_const_node); + ComputeGraphPtr sub_graph = std::make_shared("sub_graph"); + OpDescPtr sub_graph_while_op_desc = CreateOpDesc("while", WHILE); + NodePtr sub_graph_while_node = sub_graph->AddNode(sub_graph_while_op_desc); + sub_graph->SetGraphUnknownFlag(true); + sub_graph_while_node->GetOpDesc()->SetSubgraphInstanceName(0, "while_cond"); + sub_graph_while_node->GetOpDesc()->SetSubgraphInstanceName(1, "while_body"); + ComputeGraphPtr root_graph = std::make_shared("root_graph"); auto partitioned_call_op_desc = MakeShared("partitioned_call", PARTITIONEDCALL); auto partitioned_call_node = root_graph->AddNode(partitioned_call_op_desc);