From: @dimitri_rose Reviewed-by: @xchu42,@ji_chen Signed-off-by: @ji_chentags/v1.2.0
| @@ -47,7 +47,7 @@ void GetGeTensorDescFromDomiInfo(std::vector<ge::TensorDesc> &ge_descs, | |||||
| uint32_t idx = 0; | uint32_t idx = 0; | ||||
| for (auto desc_item : domi_descs) { | for (auto desc_item : domi_descs) { | ||||
| ge::TensorDesc ge_desc; | ge::TensorDesc ge_desc; | ||||
| ge_desc.SetName(desc_item.name); | |||||
| ge_desc.SetName(desc_item.name.c_str()); | |||||
| ge_desc.SetDataType(static_cast<ge::DataType>(desc_item.data_type)); | ge_desc.SetDataType(static_cast<ge::DataType>(desc_item.data_type)); | ||||
| ge_desc.SetFormat(static_cast<ge::Format>(formats[idx])); | ge_desc.SetFormat(static_cast<ge::Format>(formats[idx])); | ||||
| std::vector<int64_t> shape_dims; | std::vector<int64_t> shape_dims; | ||||
| @@ -527,25 +527,25 @@ Status DavinciModel::DoTaskSink() { | |||||
| } | } | ||||
| GE_CHK_RT_RET(rtGetAicpuDeploy(&deploy_type_)); | GE_CHK_RT_RET(rtGetAicpuDeploy(&deploy_type_)); | ||||
| GELOGI("do task_sink. AiCpu deploy type is: %x.", deploy_type_); | |||||
| GELOGI("Do task_sink. AiCpu deploy type is: %x.", deploy_type_); | |||||
| GE_CHK_STATUS_RET(BindModelStream(), "Bind model stream failed"); | |||||
| GE_CHK_STATUS_RET(BindModelStream(), "Bind model stream failed."); | |||||
| if (known_node_) { | if (known_node_) { | ||||
| GE_CHK_STATUS_RET(MallocKnownArgs(), "Mallloc known node args failed"); | |||||
| GE_CHK_STATUS_RET(MallocKnownArgs(), "Mallloc known node args failed."); | |||||
| } | } | ||||
| GE_CHK_STATUS_RET(InitTaskInfo(*model_task_def.get()), "InitTaskInfo failed"); | |||||
| GE_CHK_STATUS_RET(InitTaskInfo(*model_task_def.get()), "InitTaskInfo failed."); | |||||
| GE_CHK_STATUS_RET(ModelManager::GetInstance()->LaunchCustAicpuSo(), "Launch cust aicpu so failed"); | |||||
| GE_CHK_STATUS_RET(ModelManager::GetInstance()->LaunchCustAicpuSo(), "Launch cust aicpu so failed."); | |||||
| GE_CHK_STATUS_RET(ModelManager::GetInstance()->CheckAicpuOpList(ge_model_), "Check aicpu op type failed"); | |||||
| GE_CHK_STATUS_RET(ModelManager::GetInstance()->CheckAicpuOpList(ge_model_), "Check aicpu op type failed."); | |||||
| GE_CHK_STATUS_RET(InitEntryTask(), "InitEntryTask failed"); | |||||
| GE_CHK_STATUS_RET(InitEntryTask(), "InitEntryTask failed."); | |||||
| GE_CHK_STATUS_RET(InitL1DataDumperArgs(), "InitL1DataDumperArgs failed"); | |||||
| GE_CHK_STATUS_RET(InitL1DataDumperArgs(), "InitL1DataDumperArgs failed."); | |||||
| GE_CHK_STATUS_RET(DistributeTask(), "Distribute failed"); | |||||
| GE_CHK_STATUS_RET(DistributeTask(), "Distribute failed."); | |||||
| GE_CHK_RT_RET(rtModelLoadComplete(rt_model_handle_)); | GE_CHK_RT_RET(rtModelLoadComplete(rt_model_handle_)); | ||||
| @@ -558,7 +558,7 @@ Status DavinciModel::SetTSDevice() { | |||||
| int64_t value = 0; | int64_t value = 0; | ||||
| bool ret = ge::AttrUtils::GetInt(ge_model_, ATTR_MODEL_CORE_TYPE, value); | bool ret = ge::AttrUtils::GetInt(ge_model_, ATTR_MODEL_CORE_TYPE, value); | ||||
| uint32_t core_type = ret ? static_cast<uint32_t>(value) : 0; | uint32_t core_type = ret ? static_cast<uint32_t>(value) : 0; | ||||
| GELOGD("SetTSDevice: %u", core_type); | |||||
| GELOGD("SetTSDevice: %u.", core_type); | |||||
| rtError_t rt_ret = rtSetTSDevice(core_type); | rtError_t rt_ret = rtSetTSDevice(core_type); | ||||
| if (rt_ret != RT_ERROR_NONE) { | if (rt_ret != RT_ERROR_NONE) { | ||||
| GELOGE(RT_FAILED, "SetTSDevice failed, ret: 0x%X", rt_ret); | GELOGE(RT_FAILED, "SetTSDevice failed, ret: 0x%X", rt_ret); | ||||
| @@ -570,7 +570,7 @@ Status DavinciModel::SetTSDevice() { | |||||
| Status DavinciModel::OpDebugRegister() { | Status DavinciModel::OpDebugRegister() { | ||||
| bool is_op_debug = false; | bool is_op_debug = false; | ||||
| (void)ge::AttrUtils::GetBool(ge_model_, ATTR_OP_DEBUG_FLAG, is_op_debug); | (void)ge::AttrUtils::GetBool(ge_model_, ATTR_OP_DEBUG_FLAG, is_op_debug); | ||||
| GELOGD("The value of op debug in ge_model is %d", is_op_debug); | |||||
| GELOGD("The value of op debug in ge_model is %d.", is_op_debug); | |||||
| if (is_op_debug) { | if (is_op_debug) { | ||||
| debug_reg_mutex_.lock(); | debug_reg_mutex_.lock(); | ||||
| rtError_t rt_ret = rtMalloc(&op_debug_addr_, kOpDebugMemorySize, RT_MEMORY_DDR); | rtError_t rt_ret = rtMalloc(&op_debug_addr_, kOpDebugMemorySize, RT_MEMORY_DDR); | ||||
| @@ -3196,7 +3196,7 @@ Status GraphManager::SaveVariables(const Graph &graph, const std::vector<std::st | |||||
| return FAILED; | return FAILED; | ||||
| } else { | } else { | ||||
| auto var_tensor = var_results[var_name].GetTensorDesc(); | auto var_tensor = var_results[var_name].GetTensorDesc(); | ||||
| var_tensor.SetName(var_name); | |||||
| var_tensor.SetName(var_name.c_str()); | |||||
| var_results[var_name].SetTensorDesc(var_tensor); | var_results[var_name].SetTensorDesc(var_tensor); | ||||
| var_values.emplace_back(var_results[var_name]); | var_values.emplace_back(var_results[var_name]); | ||||
| } | } | ||||
| @@ -3205,7 +3205,7 @@ Status GraphManager::SaveVariables(const Graph &graph, const std::vector<std::st | |||||
| for (auto iter = var_results.begin(); iter != var_results.end(); ++iter) { | for (auto iter = var_results.begin(); iter != var_results.end(); ++iter) { | ||||
| string var_name = iter->first; | string var_name = iter->first; | ||||
| auto var_tensor = iter->second.GetTensorDesc(); | auto var_tensor = iter->second.GetTensorDesc(); | ||||
| var_tensor.SetName(var_name); | |||||
| var_tensor.SetName(var_name.c_str()); | |||||
| iter->second.SetTensorDesc(var_tensor); | iter->second.SetTensorDesc(var_tensor); | ||||
| var_values.emplace_back(iter->second); | var_values.emplace_back(iter->second); | ||||
| } | } | ||||
| @@ -601,6 +601,8 @@ std::string Cluster::DebugString() const { | |||||
| case KNOWN_SHAPE: | case KNOWN_SHAPE: | ||||
| ss << "KNOW"; | ss << "KNOW"; | ||||
| break; | break; | ||||
| default: | |||||
| break; | |||||
| } | } | ||||
| ss << "[" << id_ << "](size:" << nodes_.size() << ")"; | ss << "[" << id_ << "](size:" << nodes_.size() << ")"; | ||||
| ss << "(" << min_ << "," << max_ << ")("; | ss << "(" << min_ << "," << max_ << ")("; | ||||
| @@ -67,7 +67,7 @@ OpDescPtr SameTransdataBreadthFusionPass::GetCastOp(const GeTensorDesc &in_desc, | |||||
| auto fusion_cast_op_count = atomic_fusion_cast_op_count.fetch_add(1); | auto fusion_cast_op_count = atomic_fusion_cast_op_count.fetch_add(1); | ||||
| std::stringstream cast_op_name; | std::stringstream cast_op_name; | ||||
| cast_op_name << "fusion_cast_" << fusion_cast_op_count; | cast_op_name << "fusion_cast_" << fusion_cast_op_count; | ||||
| auto node_op = ge::OperatorFactory::CreateOperator(cast_op_name.str(), CAST); | |||||
| auto node_op = ge::OperatorFactory::CreateOperator(cast_op_name.str().c_str(), CAST); | |||||
| auto cast_op = ge::OpDescUtils::GetOpDescFromOperator(node_op); | auto cast_op = ge::OpDescUtils::GetOpDescFromOperator(node_op); | ||||
| node_op.BreakConnect(); | node_op.BreakConnect(); | ||||
| if (cast_op == nullptr) { | if (cast_op == nullptr) { | ||||
| @@ -600,7 +600,7 @@ Status MultiBatchGraphCopyer::LabelInBatchBranchStatus() { | |||||
| for (auto &in_node : node->GetInDataNodes()) { | for (auto &in_node : node->GetInDataNodes()) { | ||||
| if (origin_nodes_status_.find(in_node.get()) != origin_nodes_status_.end()) { | if (origin_nodes_status_.find(in_node.get()) != origin_nodes_status_.end()) { | ||||
| if (origin_nodes_status_.find(node.get()) == origin_nodes_status_.end()) { | if (origin_nodes_status_.find(node.get()) == origin_nodes_status_.end()) { | ||||
| origin_nodes_status_[node.get()] == kNodeInBatchBranch; | |||||
| origin_nodes_status_[node.get()] = kNodeInBatchBranch; | |||||
| ResetEnterStatus(frame_enters, node); | ResetEnterStatus(frame_enters, node); | ||||
| changed = true; | changed = true; | ||||
| } | } | ||||
| @@ -554,6 +554,7 @@ Status GEInit::Finalize() { | |||||
| if (instance_ptr != nullptr) { | if (instance_ptr != nullptr) { | ||||
| return instance_ptr->Finalize(); | return instance_ptr->Finalize(); | ||||
| } | } | ||||
| return SUCCESS; | |||||
| } | } | ||||
| string GEInit::GetPath() { | string GEInit::GetPath() { | ||||