From: @zhou_chao1993 Reviewed-by: @liujunzhu,@youui Signed-off-by: @ji_chenpull/907/MERGE
@@ -108,4 +108,5 @@ message DumpData{ | |||||
repeated OpOutput output = 3; | repeated OpOutput output = 3; | ||||
repeated OpInput input = 4; | repeated OpInput input = 4; | ||||
repeated OpBuffer buffer = 5; | repeated OpBuffer buffer = 5; | ||||
string op_name = 6; | |||||
} | } |
@@ -891,6 +891,7 @@ Status DataDumper::DumpExceptionInfo(const std::vector<rtExceptionInfo> exceptio | |||||
toolkit::dumpdata::DumpData dump_data; | toolkit::dumpdata::DumpData dump_data; | ||||
dump_data.set_version("2.0"); | dump_data.set_version("2.0"); | ||||
dump_data.set_dump_time(GetNowTime()); | dump_data.set_dump_time(GetNowTime()); | ||||
dump_data.set_op_name(op_desc_info.op_name); | |||||
for (size_t i = 0; i < op_desc_info.input_format.size(); ++i) { | for (size_t i = 0; i < op_desc_info.input_format.size(); ++i) { | ||||
toolkit::dumpdata::OpInput input; | toolkit::dumpdata::OpInput input; | ||||
input.set_data_type(toolkit::dumpdata::OutputDataType(GetIrDataType(op_desc_info.input_data_type[i]))); | input.set_data_type(toolkit::dumpdata::OutputDataType(GetIrDataType(op_desc_info.input_data_type[i]))); | ||||
@@ -539,7 +539,7 @@ Status DavinciModel::OpDebugRegister() { | |||||
uint32_t op_debug_mode = 0; | uint32_t op_debug_mode = 0; | ||||
(void)ge::AttrUtils::GetInt(ge_model_, ATTR_OP_DEBUG_MODE, op_debug_mode); | (void)ge::AttrUtils::GetInt(ge_model_, ATTR_OP_DEBUG_MODE, op_debug_mode); | ||||
GELOGD("The value of op_debug_mode in ge_model_ is %u.", op_debug_mode); | |||||
GELOGD("The value of op debug mode in ge_model is %u.", op_debug_mode); | |||||
uint32_t debug_task_id = 0; | uint32_t debug_task_id = 0; | ||||
uint32_t debug_stream_id = 0; | uint32_t debug_stream_id = 0; | ||||
rt_ret = rtDebugRegister(rt_model_handle_, op_debug_mode, op_debug_addr_, &debug_stream_id, &debug_task_id); | rt_ret = rtDebugRegister(rt_model_handle_, op_debug_mode, op_debug_addr_, &debug_stream_id, &debug_task_id); | ||||
@@ -607,7 +607,7 @@ Status DavinciModel::Init(void *dev_ptr, size_t mem_size, void *weight_ptr, size | |||||
version_ = ge_model_->GetVersion(); | version_ = ge_model_->GetVersion(); | ||||
name_ = ge_model_->GetName(); | name_ = ge_model_->GetName(); | ||||
(void)ge::AttrUtils::GetBool(ge_model_, ATTR_NAME_SWITCH_FOR_L1_FUSION, is_l1_fusion_enable_); | (void)ge::AttrUtils::GetBool(ge_model_, ATTR_NAME_SWITCH_FOR_L1_FUSION, is_l1_fusion_enable_); | ||||
GELOGD("The value of ge.l1Fusion in ge_model_ is %d.", is_l1_fusion_enable_); | |||||
GELOGD("The value of ge.l1Fusion in ge_model is %d.", is_l1_fusion_enable_); | |||||
CheckHasHcomOp(); | CheckHasHcomOp(); | ||||
vector<int64_t> huge_stream_list; | vector<int64_t> huge_stream_list; | ||||
@@ -108,4 +108,6 @@ message DumpData{ | |||||
repeated OpOutput output = 3; | repeated OpOutput output = 3; | ||||
repeated OpInput input = 4; | repeated OpInput input = 4; | ||||
repeated OpBuffer buffer = 5; | repeated OpBuffer buffer = 5; | ||||
string op_name = 6; | |||||
} | } |
@@ -1 +1 @@ | |||||
Subproject commit bb65bddc85d786d59553cdd56e3cf70ce8c9ead4 | |||||
Subproject commit af156f825aa53a24bd30ae4065e3ea356cf555ef |
@@ -1 +1 @@ | |||||
Subproject commit 8f4e489a61d06f9bb9a1164a39868d4db4b3d669 | |||||
Subproject commit 55cdc9afc7a476258cd512ca7b5fb36e78f3dc50 |