From 56ff720fac6ed23db72d57c6a3634701ce923adc Mon Sep 17 00:00:00 2001 From: zhaoxinxin Date: Fri, 12 Mar 2021 11:23:16 +0800 Subject: [PATCH] modified: ../../tests/ut/ge/hybrid/ge_hybrid_unittest.cc --- tests/ut/ge/hybrid/ge_hybrid_unittest.cc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc index c6f9f4f1..5e754810 100644 --- a/tests/ut/ge/hybrid/ge_hybrid_unittest.cc +++ b/tests/ut/ge/hybrid/ge_hybrid_unittest.cc @@ -15,8 +15,8 @@ */ #include +#include #include - #include "runtime/rt.h" #define protected public @@ -25,7 +25,6 @@ #include "hybrid/model/hybrid_model.h" #include "model/ge_model.h" #include "model/ge_root_model.h" - #include "hybrid/node_executor/aicore/aicore_op_task.h" #include "framework/common/taskdown_common.h" #include "framework/common/debug/log.h" @@ -33,6 +32,8 @@ #include "hybrid/executor/hybrid_execution_context.h" #include "hybrid/node_executor/aicore/aicore_task_builder.h" #include "graph/load/model_manager/tbe_handle_store.h" +#include "graph/manager/graph_mem_allocator.h" +#include "hybrid/common/npu_memory_allocator.h" #include "graph/types.h" #include "graph/utils/tensor_utils.h" @@ -44,6 +45,7 @@ using namespace testing; using namespace ge; using namespace hybrid; + class UtestGeHybrid : public testing::Test { protected: void SetUp() {} @@ -194,14 +196,10 @@ TEST_F(UtestGeHybrid, index_taskdefs_success) { } TEST_F(UtestGeHybrid, init_weight_success) { + NpuMemoryAllocator::allocators_.emplace(make_pair(0, nullptr)); // make graph with sub_graph ComputeGraphPtr graph = std::make_shared("root_graph"); OpDescPtr op_desc = CreateOpDesc("if", IF); - /*std::vector kernelBin; - TBEKernelPtr tbe_kernel = std::make_shared("name/Add", std::move(kernelBin));*/ - //op_desc->SetExtAttr(ge::OP_EXTATTR_NAME_TBE_KERNEL, tbe_kernel); - //std::string kernel_name("kernel/Add"); - //AttrUtils::SetStr(op_desc, op_desc->GetName() + "_kernelname", kernel_name); NodePtr node = graph->AddNode(op_desc); // make sub graph ComputeGraphPtr sub_graph = std::make_shared("if_sub_graph"); @@ -218,9 +216,16 @@ TEST_F(UtestGeHybrid, init_weight_success) { graph->AddSubgraph("sub", sub_graph); GeRootModelPtr ge_root_model = make_shared(graph); - GeModelPtr ge_sub_model = make_shared(sub_graph); + GeModelPtr ge_sub_model = make_shared(); + //Buffer weight_buffer = Buffer(128,0); + //ge_sub_model->SetWeight(weight_buffer); ge_root_model->SetSubgraphInstanceNameToModel("sub",ge_sub_model); HybridModel hybrid_model(ge_root_model); HybridModelBuilder hybrid_model_builder(hybrid_model); auto ret = hybrid_model_builder.InitWeights(); + ASSERT_EQ(ret,SUCCESS); + Buffer weight_buffer = Buffer(128,0); + ge_sub_model->SetWeight(weight_buffer); + ret = hybrid_model_builder.InitWeights(); + ASSERT_EQ(ret,PARAM_INVALID); } \ No newline at end of file