From 9df5c3fc804a3739912f0d1914c5203d8067106c Mon Sep 17 00:00:00 2001 From: wjm Date: Sun, 28 Feb 2021 18:02:52 +0800 Subject: [PATCH 1/8] fix dump --- ge/common/helper/model_helper.cc | 1 + ge/hybrid/model/hybrid_model_builder.cc | 4 ++-- ge/model/ge_root_model.h | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ge/common/helper/model_helper.cc b/ge/common/helper/model_helper.cc index 74238bc1..e95c3429 100644 --- a/ge/common/helper/model_helper.cc +++ b/ge/common/helper/model_helper.cc @@ -599,6 +599,7 @@ Status ModelHelper::GenerateGeRootModel(OmFileLoadHelper &om_load_helper) { is_first_model = false; root_model_->SetRootGraph(GraphUtils::GetComputeGraph(cur_model->GetGraph())); root_model_->SetModelId(cur_model->GetModelId()); + root_model_->SetModelName(cur_model->GetName()); model_ = cur_model; continue; } diff --git a/ge/hybrid/model/hybrid_model_builder.cc b/ge/hybrid/model/hybrid_model_builder.cc index edf9eb92..f9ffbaca 100755 --- a/ge/hybrid/model/hybrid_model_builder.cc +++ b/ge/hybrid/model/hybrid_model_builder.cc @@ -134,7 +134,7 @@ HybridModelBuilder::HybridModelBuilder(HybridModel &hybrid_model) Status HybridModelBuilder::Build() { GE_CHK_STATUS_RET(ValidateParams(), "[Invoke][ValidateParams] failed, model_name_:[%s]", GetGraphName()); - hybrid_model_.model_name_ = ge_root_model_->GetRootGraph()->GetName(); + hybrid_model_.model_name_ = ge_root_model_->GetModelName(); GELOGI("[%s] Start to build hybrid model.", GetGraphName()); GE_CHK_STATUS_RET(InitRuntimeParams(), "[Invoke][InitRuntimeParams] failed, model_name_:[%s]", GetGraphName()); GE_CHK_STATUS_RET(RecoverGraphUnknownFlag(), @@ -160,7 +160,7 @@ Status HybridModelBuilder::Build() { Status HybridModelBuilder::BuildForSingleOp() { GE_CHK_STATUS_RET(ValidateParams(), "[Invoke][ValidateParams] failed, model_name_:[%s]", GetGraphName()); - hybrid_model_.model_name_ = ge_root_model_->GetRootGraph()->GetName(); + hybrid_model_.model_name_ = ge_root_model_->GetModelName(); GELOGI("[%s] Start to build hybrid model.", GetGraphName()); auto ret = ge_root_model_->GetSubgraphInstanceNameToModel(); const GeModelPtr ge_model = ret[ge_root_model_->GetRootGraph()->GetName()]; diff --git a/ge/model/ge_root_model.h b/ge/model/ge_root_model.h index 0747d77c..899be5d6 100755 --- a/ge/model/ge_root_model.h +++ b/ge/model/ge_root_model.h @@ -42,6 +42,10 @@ class GeRootModel { std::vector GetAllModelId() const { return model_ids_; } + void SetModelName(const std::string &model_name) { model_name_ = model_name; } + + const std::string &GetModelName() const { return model_name_; }; + Status CheckIsUnknownShape(bool &is_dynamic_shape); void SetRootGraph(ComputeGraphPtr graph) { root_graph_ = graph; } @@ -57,6 +61,7 @@ class GeRootModel { // In multithread online secenario, same graph can owns different davinci_model for for concurrency std::vector model_ids_; bool train_flag_ = false; + std::string model_name_; }; } // namespace ge using GeRootModelPtr = std::shared_ptr; From 805999046ae4e76ade663f658406ba7aaa52e942 Mon Sep 17 00:00:00 2001 From: wjm Date: Sun, 28 Feb 2021 18:24:46 +0800 Subject: [PATCH 2/8] ut --- tests/ut/ge/hybrid/ge_hybrid_unittest.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc index 25115340..6fa17861 100644 --- a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc +++ b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc @@ -240,7 +240,8 @@ TEST_F(UtestGeHybrid, index_taskdefs_success) { GeRootModelPtr ge_root_model = make_shared(graph); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); - + hybrid_model_builder.build(); + hybrid_model_builder.BuildForSingleOp(); ASSERT_EQ(hybrid_model_builder.IndexTaskDefs(graph, ge_model), SUCCESS); } @@ -655,4 +656,4 @@ TEST_F(UtestGeHybrid, TestParseDependentInputNodesForHccl) { ASSERT_EQ(builder.ParseDependentInputNodes(*node_item_1, deps), SUCCESS); ASSERT_TRUE(model.GetNodeItem(node)->has_observer); ASSERT_EQ(node_item_1->dependents_for_execution.size(), 1); -} \ No newline at end of file +} From 69c9080c0493445c00e7bfe04aae6d6a1ed035f3 Mon Sep 17 00:00:00 2001 From: wjm Date: Sun, 28 Feb 2021 18:44:21 +0800 Subject: [PATCH 3/8] ut --- tests/ut/ge/hybrid/ge_hybrid_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc index 6fa17861..aec8ac22 100644 --- a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc +++ b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc @@ -240,7 +240,7 @@ TEST_F(UtestGeHybrid, index_taskdefs_success) { GeRootModelPtr ge_root_model = make_shared(graph); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); - hybrid_model_builder.build(); + hybrid_model_builder.Build(); hybrid_model_builder.BuildForSingleOp(); ASSERT_EQ(hybrid_model_builder.IndexTaskDefs(graph, ge_model), SUCCESS); } From e0759c0e0cc721e5b74a32b44d60cb044bc87043 Mon Sep 17 00:00:00 2001 From: wjm Date: Mon, 12 Apr 2021 14:05:14 +0800 Subject: [PATCH 4/8] ut --- tests/ut/ge/hybrid/ge_hybrid_unittest.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc index aec8ac22..c7fb2546 100644 --- a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc +++ b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc @@ -154,9 +154,10 @@ TEST_F(UtestGeHybrid, index_taskdefs_failed) { ComputeGraphPtr graph = std::make_shared("test"); GeRootModelPtr ge_root_model = make_shared(graph); + ge_root_model->SetModelName("test_name"); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); - + ASSERT_EQ(hybrid_model_builder.Build(), INTERNAL_ERROR); ASSERT_EQ(hybrid_model_builder.IndexTaskDefs(graph, ge_model), INTERNAL_ERROR); } @@ -240,8 +241,6 @@ TEST_F(UtestGeHybrid, index_taskdefs_success) { GeRootModelPtr ge_root_model = make_shared(graph); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); - hybrid_model_builder.Build(); - hybrid_model_builder.BuildForSingleOp(); ASSERT_EQ(hybrid_model_builder.IndexTaskDefs(graph, ge_model), SUCCESS); } From 37e4568ce3db3f19fff8febb883ee39a9299dd83 Mon Sep 17 00:00:00 2001 From: wjm Date: Mon, 12 Apr 2021 14:07:41 +0800 Subject: [PATCH 5/8] ut --- tests/ut/ge/hybrid/ge_hybrid_unittest.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc index c7fb2546..b5aac527 100644 --- a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc +++ b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc @@ -157,6 +157,7 @@ TEST_F(UtestGeHybrid, index_taskdefs_failed) { ge_root_model->SetModelName("test_name"); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); + ASSERT_EQ(hybrid_model_builder.Build(), INTERNAL_ERROR); ASSERT_EQ(hybrid_model_builder.IndexTaskDefs(graph, ge_model), INTERNAL_ERROR); } @@ -241,6 +242,7 @@ TEST_F(UtestGeHybrid, index_taskdefs_success) { GeRootModelPtr ge_root_model = make_shared(graph); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); + ASSERT_EQ(hybrid_model_builder.IndexTaskDefs(graph, ge_model), SUCCESS); } From 260c178e5b15000bd4c5b595ace35c30071845b9 Mon Sep 17 00:00:00 2001 From: wjm Date: Mon, 12 Apr 2021 14:44:22 +0800 Subject: [PATCH 6/8] ut --- ge/hybrid/model/hybrid_model_builder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/hybrid/model/hybrid_model_builder.cc b/ge/hybrid/model/hybrid_model_builder.cc index f9ffbaca..13cdbf14 100755 --- a/ge/hybrid/model/hybrid_model_builder.cc +++ b/ge/hybrid/model/hybrid_model_builder.cc @@ -277,7 +277,7 @@ Status HybridModelBuilder::ParseForceInfershapeNodes(const NodePtr &node, NodeIt auto op_desc = node->GetOpDesc(); GE_CHECK_NOTNULL(op_desc); // not care result, if no this attr, stand for the op does not need force infershape - (void)AttrUtils::GetBool(op_desc, kForceInfershape, node_item.is_need_force_infershape); + (void) AttrUtils::GetBool(op_desc, kForceInfershape, node_item.is_need_force_infershape); GELOGD("node [%s] is need do infershape, flag is %d", op_desc->GetName().c_str(), node_item.is_need_force_infershape); From c32d264de6ea07ce2bdf6bd792d158e18a7df92f Mon Sep 17 00:00:00 2001 From: wjm Date: Mon, 12 Apr 2021 16:21:31 +0800 Subject: [PATCH 7/8] ; --- ge/model/ge_root_model.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/model/ge_root_model.h b/ge/model/ge_root_model.h index 899be5d6..8c44272d 100755 --- a/ge/model/ge_root_model.h +++ b/ge/model/ge_root_model.h @@ -44,7 +44,7 @@ class GeRootModel { void SetModelName(const std::string &model_name) { model_name_ = model_name; } - const std::string &GetModelName() const { return model_name_; }; + const std::string &GetModelName() const { return model_name_; } Status CheckIsUnknownShape(bool &is_dynamic_shape); From f75d5bb0188400142be29b15ac46a84c94fcb066 Mon Sep 17 00:00:00 2001 From: wjm Date: Mon, 12 Apr 2021 19:40:32 +0800 Subject: [PATCH 8/8] remove single --- ge/hybrid/model/hybrid_model_builder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/hybrid/model/hybrid_model_builder.cc b/ge/hybrid/model/hybrid_model_builder.cc index 13cdbf14..9b3cb692 100755 --- a/ge/hybrid/model/hybrid_model_builder.cc +++ b/ge/hybrid/model/hybrid_model_builder.cc @@ -160,7 +160,7 @@ Status HybridModelBuilder::Build() { Status HybridModelBuilder::BuildForSingleOp() { GE_CHK_STATUS_RET(ValidateParams(), "[Invoke][ValidateParams] failed, model_name_:[%s]", GetGraphName()); - hybrid_model_.model_name_ = ge_root_model_->GetModelName(); + hybrid_model_.model_name_ = ge_root_model_->GetRootGraph()->GetName(); GELOGI("[%s] Start to build hybrid model.", GetGraphName()); auto ret = ge_root_model_->GetSubgraphInstanceNameToModel(); const GeModelPtr ge_model = ret[ge_root_model_->GetRootGraph()->GetName()];