pull/750/head
zhangxiaokun 4 years ago
parent 408496dd18
commit 82cb3e1b8c

@ -388,6 +388,7 @@ set(DISTINCT_GRAPH_LOAD_SRC_FILES
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/kernel_ex_task_info.cc"
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/kernel_task_info.cc"
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/label_set_task_info.cc"
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/memcpy_addr_async_task_info.cc"
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/memcpy_async_task_info.cc"
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/profiler_trace_task_info.cc"
"${GE_CODE_DIR}/ge/graph/load/new_model_manager/task_info/stream_active_task_info.cc"

@ -20,17 +20,8 @@
#define protected public
#include "graph/load/new_model_manager/davinci_model.h"
#include "graph/load/new_model_manager/task_info/kernel_task_info.h"
#include "graph/load/new_model_manager/task_info/hccl_task_info.h"
using domi::EventExDef;
using domi::KernelContext;
using domi::KernelDef;
using domi::LogTimeStampDef;
using domi::ModelTaskDef;
using domi::StreamActiveDef;
using domi::TaskDef;
namespace ge {
class UtestHcclTaskInfo : public testing::Test {
protected:
@ -49,18 +40,16 @@ TEST_F(UtestHcclTaskInfo, success_get_task_id) {
EXPECT_EQ(task_info->GetTaskID(), 0);
KernelTaskInfo kernel_task_info;
EXPECT_EQ(kernel_task_info.GetTaskID(), 0);
HcclTaskInfo hccl_task_info;
EXPECT_EQ(hccl_task_info.GetTaskID(), 0);
}
// test init EventRecordTaskInfo
TEST_F(UtestHcclTaskInfo, success_create_stream) {
DavinciModel *model1 = nullptr;
KernelTaskInfo kernel_task_info;
EXPECT_EQ(kernel_task_info.CreateStream(3, &model, 0), SUCCESS);
DavinciModel model(0, nullptr);
HcclTaskInfo hccl_task_info;
EXPECT_EQ(hccl_task_info.CreateStream(3, &model, 0), SUCCESS);
}
// test hccl_Distribute
@ -95,7 +84,7 @@ TEST_F(UtestHcclTaskInfo, success_distribute7_with_hccl_type) {
domi::KernelHcclDef *kernel_hccl_def = task_def.mutable_kernel_hccl();
kernel_hccl_def->set_op_index(0);
kernel_hccl_def->set_hccl_type("HcomBroadcast")
kernel_hccl_def->set_hccl_type("HcomBroadcast");
model.op_list_[0] = std::make_shared<OpDesc>("FrameworkOp", "FrameworkOp");
EXPECT_EQ(hccl_task_info.Init(task_def, &model), SUCCESS);
@ -107,7 +96,7 @@ TEST_F(UtestHcclTaskInfo, success_hccl_get_private_def_by_task_def) {
DavinciModel model(0, nullptr);
domi::ModelTaskDef model_task_def;
TaskDef *task7 = model_task_def.add_task();
domi::TaskDef *task7 = model_task_def.add_task();
task7->set_type(RT_MODEL_TASK_HCCL);
// for SetStream
rtStream_t stream = nullptr;

@ -25,6 +25,8 @@
#include "cce/aicpu_engine_struct.h"
namespace ge {
extern OpDescPtr CreateOpDesc(string name, string type);
class UtestKernelExTaskInfo : public testing::Test {
protected:
void SetUp() {}
@ -39,7 +41,7 @@ TEST_F(UtestKernelExTaskInfo, success_kernel_ex_task_init) {
EXPECT_EQ(kernel_ex_task_info.Init(task_def, nullptr), PARAM_INVALID);
DavinciModel model(0, nullptr);
EXPECT_EQ(kernel_ex_task_info1.Init(task_def, &model), FAILED);
EXPECT_EQ(kernel_ex_task_info.Init(task_def, &model), FAILED);
rtStream_t stream = nullptr;
rtStreamCreate(&stream, 0);
@ -136,7 +138,7 @@ TEST_F(UtestKernelExTaskInfo, kernel_ex_task_info_calculate_args) {
AttrUtils::SetStr(model.op_list_[0], ATTR_DYNAMIC_SHAPE_FIXED_ADDR, "Hello Mr Tree");
KernelExTaskInfo kernel_ex_task_info;
EXPECT_EQ(kernel_task_info.CalculateArgs(task_def, &model), SUCCESS);
EXPECT_EQ(kernel_ex_task_info.CalculateArgs(task_def, &model), FAILED);
}
} // namespace ge

File diff suppressed because it is too large Load Diff

@ -54,7 +54,7 @@ TEST_F(UtestMemcpyAddrAsyncTaskInfo, success_memcpy_addr_async_task_init) {
// DavinciModel is null
MemcpyAddrAsyncTaskInfo memcpy_addr_async_task_info;
EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, nullptr), INTERNAL_ERROR);
EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, nullptr), PARAM_INVALID);
// SetStream failed.
EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, &model), FAILED);
@ -113,7 +113,7 @@ TEST_F(UtestMemcpyAddrAsyncTaskInfo, success_memcpy_async_task_init_failed) {
// DavinciModel is null
MemcpyAddrAsyncTaskInfo memcpy_addr_async_task_info;
EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, &model), SUCCESS);
EXPECT_EQ(memcpy_addr_async_task_info.Init(task_def, &model), PARAM_INVALID);
task_def.clear_memcpy_async();
}

@ -78,6 +78,8 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) {
model.runtime_param_.weight_size = 0x6000;
model.runtime_param_.var_size = 0x1000;
MemcpyAsyncTaskInfo memcpy_async_task_info;
// GetOpByIndex src failed
rtStream_t stream = nullptr;
rtStreamCreate(&stream, 0);
@ -100,7 +102,7 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) {
memcpy_async->set_dst_max(0);
model.op_list_[6]->SetInputOffset({1024});
model.op_list_[6]->SetOutputOffset({5120});
EXPECT_EQ(memcpy_async_task_info.Init(task_def, &model), PARAM_INVALID);
EXPECT_EQ(memcpy_async_task_info.Init(task_def, &model), FAILED);
task_def.clear_memcpy_async();
@ -132,7 +134,7 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init_failed) {
EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), PARAM_INVALID);
// SetStream failed
EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), FAILED);
EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), PARAM_INVALID);
// GetOpByIndex failed
rtStream_t stream = nullptr;
@ -151,7 +153,7 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init_failed) {
std::vector<int64_t> memory_type = { RT_MEMORY_TS_4G };
AttrUtils::SetListInt(model.op_list_[6], ATTR_NAME_OUTPUT_MEM_TYPE_LIST, memory_type);
memcpy_async->set_dst_max(0);
EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), FAILED);
EXPECT_EQ(memcpy_async_task_info.Init(task_def, nullptr), PARAM_INVALID);
memcpy_async->set_dst_max(512);
@ -168,9 +170,9 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init_failed) {
task_def.clear_memcpy_async();
}
TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) {
TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_distribute) {
DavinciModel model(0, nullptr);
model.SetKnownNode(trues);
model.SetKnownNode(true);
domi::TaskDef task_def;
task_def.set_stream_id(0);
@ -189,6 +191,8 @@ TEST_F(UtestMemcpyAsyncTaskInfo, success_memcpy_async_task_init) {
model.runtime_param_.weight_size = 0x6000;
model.runtime_param_.var_size = 0x1000;
MemcpyAsyncTaskInfo memcpy_async_task_info;
// GetOpByIndex src failed
rtStream_t stream = nullptr;
rtStreamCreate(&stream, 0);

Loading…
Cancel
Save