【PR】: 整改目录日志不规范问题-ge-AtomGit

Mapi/session/jit_execution/utils/jit_infer_utils.cc+21-15

	@@ -27,7 +27,7 @@
27	namespace ge {	27	namespace ge {
28	namespace {	28	namespace {
29	/**	29	/**
30	- * 判断node是否为uninfered node, uninfered node会被切到下一张图	30	+ * 判断node是否为uninferred node, uninferred node会被切到下一张图
31	*	31	*
32	* 1、if/case节点, 符号化暂不支持对子图的推导, 因此if和case的输出必没有符号,	32	* 1、if/case节点, 符号化暂不支持对子图的推导, 因此if和case的输出必没有符号,
33	* 切到下一张图后可以根据上一张图的输出把cond构造成const, 然后对if/case做剪枝, 消除if/case节点, 把子图展平到根图上,	33	* 切到下一张图后可以根据上一张图的输出把cond构造成const, 然后对if/case做剪枝, 消除if/case节点, 把子图展平到根图上,
	@@ -43,16 +43,18 @@ bool IsUnInferredNode(const NodePtr &node) {
43	}	43	}
44	// 算子的任何一个输出有符号，说明推导成功，需要切到ep中执行	44	// 算子的任何一个输出有符号，说明推导成功，需要切到ep中执行
45	const auto &outputs = op_desc->GetAllOutputsDescPtr();	45	const auto &outputs = op_desc->GetAllOutputsDescPtr();
46	- const bool has_valid_output = std::any_of(outputs.begin(), outputs.end(),	46	+ const bool has_valid_output = std::any_of(outputs.begin(), outputs.end(), [](const GeTensorDescPtr &desc) {
47	- [](const GeTensorDescPtr &desc) { return desc->GetAttrsGroup<SymbolicDescAttr>() != nullptr; });	47	+ return desc->GetAttrsGroup<SymbolicDescAttr>() != nullptr;
		48	+ });
48	if (has_valid_output) {	49	if (has_valid_output) {
49	GELOGD("[%s][%s] is inferred successfully.", op_desc->GetNamePtr(), op_desc->GetTypePtr());	50	GELOGD("[%s][%s] is inferred successfully.", op_desc->GetNamePtr(), op_desc->GetTypePtr());
50	return false;	51	return false;
51	}	52	}
52	// 存在空输入，说明是受上游算子影响，切到下一张图	53	// 存在空输入，说明是受上游算子影响，切到下一张图
53	const auto &inputs = op_desc->GetAllInputsDescPtr();	54	const auto &inputs = op_desc->GetAllInputsDescPtr();
54	- const bool has_empty_input = std::any_of(inputs.begin(), inputs.end(),	55	+ const bool has_empty_input = std::any_of(inputs.begin(), inputs.end(), [](const GeTensorDescPtr &desc) {
55	- [](const GeTensorDescPtr &desc) { return desc->GetAttrsGroup<SymbolicDescAttr>() == nullptr; });	56	+ return desc->GetAttrsGroup<SymbolicDescAttr>() == nullptr;
		57	+ });
56	if (has_empty_input) {	58	if (has_empty_input) {
57	return true;	59	return true;
58	}	60	}
	@@ -81,10 +83,10 @@ bool ParentNodeInferred(const NodePtr &node, std::vector<NodePtr> &inferred_node
81	}	83	}
82		84
83	void DeleteNodesWithoutParentNode(std::vector<NodePtr> &inferred_nodes) {	85	void DeleteNodesWithoutParentNode(std::vector<NodePtr> &inferred_nodes) {
84	- // delete nodes whose parents node not infered	86	+ // delete nodes whose parents node not inferred
85	for (auto it = inferred_nodes.begin(); it != inferred_nodes.end();) {	87	for (auto it = inferred_nodes.begin(); it != inferred_nodes.end();) {
86	if (!ParentNodeInferred(*it, inferred_nodes)) {	88	if (!ParentNodeInferred(*it, inferred_nodes)) {
87	- GELOGD("Infer node:%s. Parent node uninfered", (*it)->GetName().c_str());	89	+ GELOGD("Infer node:%s. Parent node uninferred", (*it)->GetName().c_str());
88	it = inferred_nodes.erase(it);	90	it = inferred_nodes.erase(it);
89	} else {	91	} else {
90	++it;	92	++it;
	@@ -102,8 +104,11 @@ bool HasUnsuppliableInput(const NodePtr &node, const OpDescPtr &op_desc,
102	continue;	104	continue;
103	}	105	}
104	size_t ir_index = 0;	106	size_t ir_index = 0;
105	- const bool has_ir = (OpDescUtils::GetInputIrIndexByInstanceIndex(op_desc, i - invalid_index_num, ir_index) == SUCCESS);	107	+ const bool has_ir =
106	- if (!has_ir \|\| !func.IsInputDataDependency(ir_index)) { continue; }	108	+ (OpDescUtils::GetInputIrIndexByInstanceIndex(op_desc, i - invalid_index_num, ir_index) == SUCCESS);
		109	+ if (!has_ir \|\| !func.IsInputDataDependency(ir_index)) {
		110	+ continue;
		111	+ }
107	const auto source_node = in_anchor->GetPeerOutAnchor()->GetOwnerNode();	112	const auto source_node = in_anchor->GetPeerOutAnchor()->GetOwnerNode();
108	if (source_node == nullptr \|\| ConstantUtils::IsConstant(source_node) \|\|	113	if (source_node == nullptr \|\| ConstantUtils::IsConstant(source_node) \|\|
109	SymbolicKernelFactory::GetInstance().Create(source_node->GetType()) != nullptr) {	114	SymbolicKernelFactory::GetInstance().Create(source_node->GetType()) != nullptr) {
	@@ -128,7 +133,7 @@ bool ShouldKeepAsCutBoundary(const NodePtr &node, const OpDescPtr &op_desc) {
128	}	133	}
129		134
130	struct PullableCategories {	135	struct PullableCategories {
131	- std::unordered_set<NodePtr> no_callback; // 没注册回调（无compute且无infer）	136	+ std::unordered_set<NodePtr> no_callback; // 没注册回调（无compute且无infer）
132	std::unordered_set<NodePtr> unsuppliable_input; // 值依赖无法满足	137	std::unordered_set<NodePtr> unsuppliable_input; // 值依赖无法满足
133	std::unordered_set<NodePtr> no_lowering; // 没注册lowering	138	std::unordered_set<NodePtr> no_lowering; // 没注册lowering
134		139
	@@ -151,10 +156,9 @@ void ClassifyPullable(const NodePtr &node, PullableCategories &categories) {
151	return;	156	return;
152	}	157	}
153	const auto &outputs = op_desc->GetAllOutputsDescPtr();	158	const auto &outputs = op_desc->GetAllOutputsDescPtr();
154	- const bool all_static = std::all_of(outputs.begin(), outputs.end(),	159	+ const bool all_static = std::all_of(outputs.begin(), outputs.end(), [](const GeTensorDescPtr &desc) {
155	- [](const GeTensorDescPtr &desc) {	160	+ return desc->IsOriginShapeInitialized() && !desc->GetOriginShape().IsUnknownShape();
156	- return desc->IsOriginShapeInitialized() && !desc->GetOriginShape().IsUnknownShape();	161	+ });
157	- });
158	if (all_static) {	162	if (all_static) {
159	return;	163	return;
160	}	164	}
	@@ -248,7 +252,9 @@ void PropagatePullable(std::vector<NodePtr> &uninferred_nodes, std::vector<NodeP
248	it = uninferred_nodes.erase(it);	252	it = uninferred_nodes.erase(it);
249	changed = true;	253	changed = true;
250	}	254	}
251	- if (!changed) { break; }	255	+ if (!changed) {
		256	+ break;
		257	+ }
252	}	258	}
253	}	259	}
254	} // namespace	260	} // namespace

Mapi/session/jit_execution/utils/partitioner/binary_partitioner.cc+3-3

	@@ -26,7 +26,7 @@ Status BinaryPartitioner::Partition(const ComputeGraphPtr &graph, const std::vec
26		26
27	auto uninfer_nodes = GetRemainingNodes(graph, infered_nodes);	27	auto uninfer_nodes = GetRemainingNodes(graph, infered_nodes);
28	if (uninfer_nodes.empty()) {	28	if (uninfer_nodes.empty()) {
29	- GELOGI("Partition completed! remaining nodes is empty. graph name:%s", graph->GetName().c_str());	29	+ GELOGI("Partition completed! remaining nodes are empty. graph name:%s", graph->GetName().c_str());
30	p_ret.sliced_graph = graph;	30	p_ret.sliced_graph = graph;
31	return GRAPH_SUCCESS;	31	return GRAPH_SUCCESS;
32	}	32	}
	@@ -83,13 +83,13 @@ bool BinaryPartitioner::CheckNodesContainsCycle(const std::vector<NodePtr> &infe
83	const auto &ctrl_nodes = node->GetInControlNodes();	83	const auto &ctrl_nodes = node->GetInControlNodes();
84	const auto data_it = std::find_if(data_nodes.begin(), data_nodes.end(), in_uninfer);	84	const auto data_it = std::find_if(data_nodes.begin(), data_nodes.end(), in_uninfer);
85	if (data_it != data_nodes.end()) {	85	if (data_it != data_nodes.end()) {
86	- GELOGE(ge::FAILED, "CheckNodesContainsCycle node:%s is uninfered, but it is infered node:%s input",	86	+ GELOGE(ge::FAILED, "CheckNodesContainsCycle node:%s is uninferred, but it is inferred node:%s input",
87	(*data_it)->GetName().c_str(), node->GetName().c_str());	87	(*data_it)->GetName().c_str(), node->GetName().c_str());
88	return true;	88	return true;
89	}	89	}
90	const auto ctrl_it = std::find_if(ctrl_nodes.begin(), ctrl_nodes.end(), in_uninfer);	90	const auto ctrl_it = std::find_if(ctrl_nodes.begin(), ctrl_nodes.end(), in_uninfer);
91	if (ctrl_it != ctrl_nodes.end()) {	91	if (ctrl_it != ctrl_nodes.end()) {
92	- GELOGE(ge::FAILED, "CheckNodesContainsCycle node:%s is uninfered, but it is infered node:%s input",	92	+ GELOGE(ge::FAILED, "CheckNodesContainsCycle node:%s is uninferred, but it is inferred node:%s input",
93	(*ctrl_it)->GetName().c_str(), node->GetName().c_str());	93	(*ctrl_it)->GetName().c_str(), node->GetName().c_str());
94	return true;	94	return true;
95	}	95	}

Mcompiler/graph/manager/graph_manager.cc+1-1

	@@ -5451,7 +5451,7 @@ Status GraphManager::SetDefaultHcclOptions() const {
5451	if (graph_options.find(OPTION_EXEC_HCOM_GROUPLIST) != graph_options.end()) {	5451	if (graph_options.find(OPTION_EXEC_HCOM_GROUPLIST) != graph_options.end()) {
5452	GELOGE(FAILED,	5452	GELOGE(FAILED,
5453	"[Check][HcomGrouplist] OPTION_EXEC_HCOM_GROUPLIST conflicts with"	5453	"[Check][HcomGrouplist] OPTION_EXEC_HCOM_GROUPLIST conflicts with"
5454	- "OPTION_EXEC_HCOM_GROUPLIST_V2, cannot coexist.");	5454	+ " OPTION_EXEC_HCOM_GROUPLIST_V2, cannot coexist.");
5455	return FAILED;	5455	return FAILED;
5456	}	5456	}
5457	graph_options[OPTION_EXEC_RANK_TABLE] = HcclOfflineOptionBuilder::Instance().GetLogicRankTable();	5457	graph_options[OPTION_EXEC_RANK_TABLE] = HcclOfflineOptionBuilder::Instance().GetLogicRankTable();

Mcompiler/graph/optimize/autofuse/autofuse/lowering/lowerings.cpp+1-1

	@@ -611,7 +611,7 @@ graphStatus LoweringManager::PostPrecessAfterLoweringNode(const NodePtr &node, c
611		611
612	if (LoweringUtils::IsAnyKernelBoxOversize(kernel_boxes, config) \|\| LoweringUtils::IsNodeCoreNumDif(node)) {	612	if (LoweringUtils::IsAnyKernelBoxOversize(kernel_boxes, config) \|\| LoweringUtils::IsNodeCoreNumDif(node)) {
613	GELOGI(	613	GELOGI(
614	- "Try re-lowering for node %s, type %s after realize inputs as kernel box is oversize, or this node"	614	+ "Try re-lowering for node %s, type %s after realize inputs as kernel box is oversize, or this node "
615	"different core num scope with after nodes.",	615	"different core num scope with after nodes.",
616	node->GetName().c_str(), node->GetType().c_str());	616	node->GetName().c_str(), node->GetType().c_str());
617	if (RealizeInputsAndLowering(node) != GRAPH_SUCCESS) {	617	if (RealizeInputsAndLowering(node) != GRAPH_SUCCESS) {

Mruntime/custom_op/python_custom_op_bridge_loader.cc+2-2

	@@ -77,7 +77,7 @@ bool HasPythonCustomOpEntry(const std::string &path, const struct stat &path_sta
77		77
78	DIR *dir = opendir(path.c_str());	78	DIR *dir = opendir(path.c_str());
79	if (dir == nullptr) {	79	if (dir == nullptr) {
80	- GELOGI("Skip scanning python custom op directory[%s] because opendir failed.", path.c_str());	80	+ GELOGW("Skip scanning python custom op directory[%s] because opendir failed.", path.c_str());
81	return false;	81	return false;
82	}	82	}
83	struct dirent *entry = nullptr;	83	struct dirent *entry = nullptr;
	@@ -88,7 +88,7 @@ bool HasPythonCustomOpEntry(const std::string &path, const struct stat &path_sta
88	const std::string entry_path = path + "/" + entry->d_name;	88	const std::string entry_path = path + "/" + entry->d_name;
89	struct stat child_stat{};	89	struct stat child_stat{};
90	if (stat(entry_path.c_str(), &child_stat) != 0) {	90	if (stat(entry_path.c_str(), &child_stat) != 0) {
91	- GELOGI("Skip scanning python custom op path[%s] because stat failed.", entry_path.c_str());	91	+ GELOGW("Skip scanning python custom op path[%s] because stat failed.", entry_path.c_str());
92	continue;	92	continue;
93	}	93	}
94	if (S_ISREG(child_stat.st_mode) && IsPythonFile(entry_path)) {	94	if (S_ISREG(child_stat.st_mode) && IsPythonFile(entry_path)) {

Mruntime/om2/formats/format_transfers/om2_format_transfer_c1hwncoc0_hwcn.cc+1-1

	@@ -31,7 +31,7 @@ Status CheckArgsForC1hwncoc0ToHwcn(const TransArgs &args) {
31	const auto src_shape = args.src_shape;	31	const auto src_shape = args.src_shape;
32	const auto dst_shape = args.dst_shape;	32	const auto dst_shape = args.dst_shape;
33	if ((args.src_primary_format != FORMAT_C1HWNCoC0) \|\| (args.dst_primary_format != FORMAT_HWCN)) {	33	if ((args.src_primary_format != FORMAT_C1HWNCoC0) \|\| (args.dst_primary_format != FORMAT_HWCN)) {
34	- const std::string error = "Dose not support trans format from " +	34	+ const std::string error = "Does not support trans format from " +
35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_fracz_hwcn.cc+1-1

	@@ -33,7 +33,7 @@ Status CheckArgsForFracZToHwcn(const TransArgs &args) {
33	const auto src_shape = args.src_shape;	33	const auto src_shape = args.src_shape;
34	const auto dst_shape = args.dst_shape;	34	const auto dst_shape = args.dst_shape;
35	if ((args.src_primary_format != FORMAT_FRACTAL_Z) \|\| (args.dst_primary_format != FORMAT_HWCN)) {	35	if ((args.src_primary_format != FORMAT_FRACTAL_Z) \|\| (args.dst_primary_format != FORMAT_HWCN)) {
36	- const std::string error = "Dose not support trans format from " +	36	+ const std::string error = "Does not support trans format from " +
37	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	37	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
38	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	38	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
39	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	39	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_fracz_nchw.cc+1-1

	@@ -31,7 +31,7 @@ Status CheckArgsForFracZToNchw(const TransArgs &args) {
31	const auto src_shape = args.src_shape;	31	const auto src_shape = args.src_shape;
32	const auto dst_shape = args.dst_shape;	32	const auto dst_shape = args.dst_shape;
33	if ((args.src_primary_format != FORMAT_FRACTAL_Z) \|\| (args.dst_primary_format != FORMAT_NCHW)) {	33	if ((args.src_primary_format != FORMAT_FRACTAL_Z) \|\| (args.dst_primary_format != FORMAT_NCHW)) {
34	- const std::string error = "Dose not support trans format from " +	34	+ const std::string error = "Does not support trans format from " +
35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_fracz_nhwc.cc+1-1

	@@ -31,7 +31,7 @@ Status CheckArgsForFracZToNhwc(const TransArgs &args) {
31	const auto src_shape = args.src_shape;	31	const auto src_shape = args.src_shape;
32	const auto dst_shape = args.dst_shape;	32	const auto dst_shape = args.dst_shape;
33	if ((args.src_primary_format != FORMAT_FRACTAL_Z) \|\| (args.dst_primary_format != FORMAT_NHWC)) {	33	if ((args.src_primary_format != FORMAT_FRACTAL_Z) \|\| (args.dst_primary_format != FORMAT_NHWC)) {
34	- const std::string error = "Dose not support trans format from " +	34	+ const std::string error = "Does not support trans format from " +
35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_hwcn_c1hwncoc0.cc+1-1

	@@ -49,7 +49,7 @@ Status TransShapeHwcnToC1hwncoc0(const std::vector<int64_t> &src_shape, const in
49		49
50	Status CheckArgsForHwcnToC1hwncoc0(const TransArgs &args) {	50	Status CheckArgsForHwcnToC1hwncoc0(const TransArgs &args) {
51	if ((args.src_primary_format != FORMAT_HWCN) \|\| (args.dst_primary_format != FORMAT_C1HWNCoC0)) {	51	if ((args.src_primary_format != FORMAT_HWCN) \|\| (args.dst_primary_format != FORMAT_C1HWNCoC0)) {
52	- const std::string error = "Dose not support trans format from " +	52	+ const std::string error = "Does not support trans format from " +
53	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	53	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
54	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	54	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
55	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	55	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_nc1hwc0_nchw.cc+1-1

	@@ -31,7 +31,7 @@ Status CheckArgsForNc1hwc0ToNchw(const TransArgs &args) {
31	const auto &src_shape = args.src_shape;	31	const auto &src_shape = args.src_shape;
32	const auto &dst_shape = args.dst_shape;	32	const auto &dst_shape = args.dst_shape;
33	if ((args.src_primary_format != FORMAT_NC1HWC0) \|\| (args.dst_primary_format != FORMAT_NCHW)) {	33	if ((args.src_primary_format != FORMAT_NC1HWC0) \|\| (args.dst_primary_format != FORMAT_NCHW)) {
34	- const std::string error = "Dose not support trans format from " +	34	+ const std::string error = "Does not support trans format from " +
35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_nc1hwc0_nhwc.cc+1-1

	@@ -31,7 +31,7 @@ Status CheckArgsForNc1hwc0ToNhwc(const TransArgs &args) {
31	auto src_shape = args.src_shape;	31	auto src_shape = args.src_shape;
32	auto dst_shape = args.dst_shape;	32	auto dst_shape = args.dst_shape;
33	if ((args.src_primary_format != FORMAT_NC1HWC0) \|\| (args.dst_primary_format != FORMAT_NHWC)) {	33	if ((args.src_primary_format != FORMAT_NC1HWC0) \|\| (args.dst_primary_format != FORMAT_NHWC)) {
34	- const std::string error = "Dose not support trans format from " +	34	+ const std::string error = "Does not support trans format from " +
35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	35	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	36	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	37	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/formats/format_transfers/om2_format_transfer_nhwc_nc1hwc0.cc+1-1

	@@ -54,7 +54,7 @@ Status TransShapeNhwcToNc1hwc0(const std::vector<int64_t> &src_shape, const Data
54		54
55	Status CheckArgsForNhwcToNc1hwc0(const TransArgs &args) {	55	Status CheckArgsForNhwcToNc1hwc0(const TransArgs &args) {
56	if ((args.src_primary_format != FORMAT_NHWC) \|\| (args.dst_primary_format != FORMAT_NC1HWC0)) {	56	if ((args.src_primary_format != FORMAT_NHWC) \|\| (args.dst_primary_format != FORMAT_NC1HWC0)) {
57	- const std::string error = "Dose not support trans format from " +	57	+ const std::string error = "Does not support trans format from " +
58	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +	58	FmtToStr(TypeUtilsInner::FormatToSerialString(args.src_primary_format)) + " to " +
59	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));	59	FmtToStr(TypeUtilsInner::FormatToSerialString(args.dst_primary_format));
60	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());	60	GE_ERRORLOG_AND_ERRORMSG(ACL_ERROR_GE_FORMAT_INVALID, error.c_str());

Mruntime/om2/om2_model_executor.cc+1-1

	@@ -1618,7 +1618,7 @@ class Om2ModelExecutor::Impl {
1618	if (run_model_info_.unload_func != nullptr && run_model_info_.model_handle != nullptr) {	1618	if (run_model_info_.unload_func != nullptr && run_model_info_.model_handle != nullptr) {
1619	const auto unload_ret = run_model_info_.unload_func(run_model_info_.model_handle, nullptr, nullptr);	1619	const auto unload_ret = run_model_info_.unload_func(run_model_info_.model_handle, nullptr, nullptr);
1620	if (unload_ret != ge::GRAPH_SUCCESS) {	1620	if (unload_ret != ge::GRAPH_SUCCESS) {
1621	- GELOGI("[OM2] Resource release issue for so file: %s", run_model_info_.so_file.c_str());	1621	+ GELOGW("[OM2] Resource release issue for so file: %s", run_model_info_.so_file.c_str());
1622	}	1622	}
1623	} else {	1623	} else {
1624	GELOGI("[OM2] Unload func not found or model not created, so file: %s", run_model_info_.so_file.c_str());	1624	GELOGI("[OM2] Unload func not found or model not created, so file: %s", run_model_info_.so_file.c_str());

Mruntime/v1/graph/load/model_manager/model_manager.cc+2-2

	@@ -2136,7 +2136,7 @@ Status ModelManager::LaunchKernelCustAicpuSo(const std::string &kernel_name) {
2136	args_info.timeout = kNeverTimeout;	2136	args_info.timeout = kNeverTimeout;
2137	GE_CHK_RT(rtAicpuKernelLaunchExWithArgs(rtKernelType_t::KERNEL_TYPE_AICPU, kernel_name.c_str(), 1U, &args_info,	2137	GE_CHK_RT(rtAicpuKernelLaunchExWithArgs(rtKernelType_t::KERNEL_TYPE_AICPU, kernel_name.c_str(), 1U, &args_info,
2138	nullptr, stream, RT_KERNEL_USE_SPECIAL_TIMEOUT));	2138	nullptr, stream, RT_KERNEL_USE_SPECIAL_TIMEOUT));
2139	- GELOGI("Load cust so, soNameAddrOffset %u, kernelNameAddrOffset %u, timeout %u", args_info.soNameAddrOffset,	2139	+ GELOGI("Load cust so, soNameAddrOffset %u, kernelNameAddrOffset %u, timeout %us", args_info.soNameAddrOffset,
2140	args_info.kernelNameAddrOffset, args_info.timeout);	2140	args_info.kernelNameAddrOffset, args_info.timeout);
2141		2141
2142	GE_CHK_ACL_RET(aclrtSynchronizeStream(stream));	2142	GE_CHK_ACL_RET(aclrtSynchronizeStream(stream));
	@@ -2332,7 +2332,7 @@ Status ModelManager::LaunchKernelBuiltinAicpuSo(const std::string &kernel_name,
2332	nullptr, stream, RT_KERNEL_USE_SPECIAL_TIMEOUT));	2332	nullptr, stream, RT_KERNEL_USE_SPECIAL_TIMEOUT));
2333	GELOGI("[OpMasterDevice][BuiltIn]Launch so[%s], kernel_name[%s], stream[%" PRIu64 "].", so_name.c_str(),	2333	GELOGI("[OpMasterDevice][BuiltIn]Launch so[%s], kernel_name[%s], stream[%" PRIu64 "].", so_name.c_str(),
2334	kernel_name.c_str(), PtrToValue(stream));	2334	kernel_name.c_str(), PtrToValue(stream));
2335	- GELOGI("Load build in so, soNameAddrOffset %u, kernelNameAddrOffset %u, timeout %u", args_info.soNameAddrOffset,	2335	+ GELOGI("Load build in so, soNameAddrOffset %u, kernelNameAddrOffset %u, timeout %us", args_info.soNameAddrOffset,
2336	args_info.kernelNameAddrOffset, args_info.timeout);	2336	args_info.kernelNameAddrOffset, args_info.timeout);
2337	GE_CHK_ACL_RET(aclrtSynchronizeStream(stream));	2337	GE_CHK_ACL_RET(aclrtSynchronizeStream(stream));
2338	}	2338	}

Mruntime/v1/hybrid/executor/runtime_v2/rt_v2_pipeline_executor.cc+5-1

	@@ -373,7 +373,11 @@ ge::Status RtV2PipelineExecutor::Unload() {
373	for (auto &stage_executor : stage_executors_) {	373	for (auto &stage_executor : stage_executors_) {
374	GELOGI("Start stop stage state %s", stage_executor->Id().c_str());	374	GELOGI("Start stop stage state %s", stage_executor->Id().c_str());
375	auto status = stage_executor->Stop();	375	auto status = stage_executor->Stop();
376	- GELOGI("Stage state %s stop %s", stage_executor->Id().c_str(), ((status == ge::SUCCESS) ? "succeed" : "failed"));	376	+ if (status == ge::SUCCESS) {
		377	+ GELOGI("Stage state %s stop succeed", stage_executor->Id().c_str());
		378	+ } else {
		379	+ GELOGW("Stage state %s stop failed", stage_executor->Id().c_str());
		380	+ }
377	result = (status == ge::SUCCESS) ? result : status;	381	result = (status == ge::SUCCESS) ? result : status;
378	}	382	}
379	return result;	383	return result;

Mruntime/v2/engine/aicore/converter/aicore_node_converter.cc+4-4

	@@ -1039,7 +1039,7 @@ static LowerResult LoweringAiCoreNodeWithHandle(const ge::NodePtr &node, const L
1039	// 0. alloc rt arg	1039	// 0. alloc rt arg
1040	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);	1040	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);
1041	if (task_def == nullptr) {	1041	if (task_def == nullptr) {
1042	- return {HyperStatus::ErrorStatus(static_cast<const char *>("Not find AI core task def")), {}, {}, {}};	1042	+ return {HyperStatus::ErrorStatus(static_cast<const char *>("Failed to find AI core task def")), {}, {}, {}};
1043	}	1043	}
1044	ProcArgs proc_arg;	1044	ProcArgs proc_arg;
1045	proc_arg.launch_arg = bg::AllocRtArg(node, task_def->kernel_with_handle(), bg::kMaxTilingSize);	1045	proc_arg.launch_arg = bg::AllocRtArg(node, task_def->kernel_with_handle(), bg::kMaxTilingSize);
	@@ -1165,7 +1165,7 @@ static LowerResult LoweringAiCoreNodeWithFlag(const ge::NodePtr &node, const Low
1165	// 0. alloc rt arg	1165	// 0. alloc rt arg
1166	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);	1166	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);
1167	if (task_def == nullptr) {	1167	if (task_def == nullptr) {
1168	- return {HyperStatus::ErrorStatus(static_cast<const char *>("Not find AI core task def")), {}, {}, {}};	1168	+ return {HyperStatus::ErrorStatus(static_cast<const char *>("Failed to find AI core task def")), {}, {}, {}};
1169	}	1169	}
1170	ProcArgs proc_arg;	1170	ProcArgs proc_arg;
1171	proc_arg.launch_arg = bg::AllocRtArg(node, task_def->kernel(), bg::kMaxTilingSize);	1171	proc_arg.launch_arg = bg::AllocRtArg(node, task_def->kernel(), bg::kMaxTilingSize);
	@@ -1270,7 +1270,7 @@ LowerResult LoweringStaticAicoreNode(const ge::NodePtr &node, const LowerInput &
1270	auto compile_result = lower_input.global_data->FindCompiledResult(node);	1270	auto compile_result = lower_input.global_data->FindCompiledResult(node);
1271	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);	1271	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);
1272	if (task_def == nullptr) {	1272	if (task_def == nullptr) {
1273	- return {HyperStatus::ErrorStatus(static_cast<const char *>("Not find AI core task def")), {}, {}, {}};	1273	+ return {HyperStatus::ErrorStatus(static_cast<const char *>("Failed to find AI core task def")), {}, {}, {}};
1274	}	1274	}
1275	auto ctx = InitStaticAicoreContext(node, lower_input, task_def, compile_result);	1275	auto ctx = InitStaticAicoreContext(node, lower_input, task_def, compile_result);
1276	if (!ctx.has_value()) {	1276	if (!ctx.has_value()) {
	@@ -1303,7 +1303,7 @@ LowerResult LoweringAiCoreNode(const ge::NodePtr &node, const LowerInput &lower_
1303	}	1303	}
1304	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);	1304	const domi::TaskDef *task_def = GetTaskDef(node, compile_result, TaskDefType::kAICore);
1305	if (task_def == nullptr) {	1305	if (task_def == nullptr) {
1306	- return {HyperStatus::ErrorStatus(static_cast<const char *>("Not find AI core taskdef.")), {}, {}, {}};	1306	+ return {HyperStatus::ErrorStatus(static_cast<const char *>("Failed to find AI core taskdef.")), {}, {}, {}};
1307	}	1307	}
1308	const auto &op_desc = node->GetOpDesc();	1308	const auto &op_desc = node->GetOpDesc();
1309	if (op_desc == nullptr) {	1309	if (op_desc == nullptr) {

Mruntime/v2/engine/gelocal/if_case_converter.cc+5-5

Mruntime/v2/kernel/common_kernel_impl/build_tensor.cc+1-1

	@@ -65,7 +65,7 @@ ge::graphStatus GetShapeOutputValue(const KernelContext *context, std::stringstr
65	} else if (out_data_type == ge::DataType::DT_INT64) {	65	} else if (out_data_type == ge::DataType::DT_INT64) {
66	GetTensorValue<uint64_t>(tensor_data->GetAddr(), in_shape->GetOriginShape().GetDimNum(), ss);	66	GetTensorValue<uint64_t>(tensor_data->GetAddr(), in_shape->GetOriginShape().GetDimNum(), ss);
67	} else {	67	} else {
68	- ss << "not support dtype";	68	+ ss << "dtype is not supported";
69	}	69	}
70	ss << "]";	70	ss << "]";
71	}	71	}

Mruntime/v2/kernel/common_kernel_impl/infer_shape_range.cc+1-1

	@@ -29,7 +29,7 @@ void ShapeRangeToStringStream(std::stringstream &ss, const Range<Shape> &shape_r
29	return;	29	return;
30	}	30	}
31	if (max->GetDimNum() != min->GetDimNum()) {	31	if (max->GetDimNum() != min->GetDimNum()) {
32	- ss << "dim num not match. max dim num: " << max->GetDimNum() << ", min dim num: " << min->GetDimNum();	32	+ ss << "dim num does not match. max dim num: " << max->GetDimNum() << ", min dim num: " << min->GetDimNum();
33	return;	33	return;
34	}	34	}
35	ss << "[";	35	ss << "[";

	@@ -37,12 +37,12 @@ std::vector<bg::ValueHolderPtr> BuildSubgraph(const ge::NodePtr &node, int32_t s
37	}	37	}
38	auto lower_result = ConvertComputeSubgraphToExecuteGraph(subgraph, global_data, 1, parent_inputs_placement);	38	auto lower_result = ConvertComputeSubgraphToExecuteGraph(subgraph, global_data, 1, parent_inputs_placement);
39	if (lower_result == nullptr) {	39	if (lower_result == nullptr) {
40	- GELOGE(ge::FAILED, "Failed to lowering subgraph index %d for %s node %s, return nullptr", subgraph_index,	40	+ GELOGE(ge::FAILED, "Failed to lower subgraph index %d for %s node %s, return nullptr", subgraph_index,
41	node->GetType().c_str(), node->GetName().c_str());	41	node->GetType().c_str(), node->GetName().c_str());
42	return {};	42	return {};
43	}	43	}
44	if (!lower_result->result.IsSuccess()) {	44	if (!lower_result->result.IsSuccess()) {
45	- GELOGE(ge::FAILED, "Failed to lowering subgraph index %d for %s node %s, reason %s", subgraph_index,	45	+ GELOGE(ge::FAILED, "Failed to lower subgraph index %d for %s node %s, reason %s", subgraph_index,
46	node->GetType().c_str(), node->GetName().c_str(), lower_result->result.GetErrorMessage());	46	node->GetType().c_str(), node->GetName().c_str(), lower_result->result.GetErrorMessage());
47	return {};	47	return {};
48	}	48	}
	@@ -52,14 +52,14 @@ std::vector<bg::ValueHolderPtr> BuildSubgraph(const ge::NodePtr &node, int32_t s
52	}	52	}
53	LowerResult CheckOutputsAndReturn(const ge::NodePtr &node, const vector<bg::DevMemValueHolderPtr> &outputs) {	53	LowerResult CheckOutputsAndReturn(const ge::NodePtr &node, const vector<bg::DevMemValueHolderPtr> &outputs) {
54	if (outputs.empty()) {	54	if (outputs.empty()) {
55	- return CreateErrorLowerResult("Failed to lowering %s node %s, empty outputs", node->GetType().c_str(),	55	+ return CreateErrorLowerResult("Failed to lower %s node %s, empty outputs", node->GetType().c_str(),
56	node->GetName().c_str());	56	node->GetName().c_str());
57	}	57	}
58		58
59	auto data_out_count = static_cast<size_t>(node->GetAllOutDataAnchorsSize());	59	auto data_out_count = static_cast<size_t>(node->GetAllOutDataAnchorsSize());
60	if (data_out_count == 0UL) {	60	if (data_out_count == 0UL) {
61	if (outputs.size() != 1UL) {	61	if (outputs.size() != 1UL) {
62	- return CreateErrorLowerResult("Failed to lowering %s node %s, the output count %zu, expect only one output",	62	+ return CreateErrorLowerResult("Failed to lower %s node %s, the output count %zu, expect only one output",
63	node->GetTypePtr(), node->GetNamePtr(), outputs.size());	63	node->GetTypePtr(), node->GetNamePtr(), outputs.size());
64	}	64	}
65	std::vector<bg::ValueHolderPtr> order_holders(outputs.cbegin(), outputs.cend());	65	std::vector<bg::ValueHolderPtr> order_holders(outputs.cbegin(), outputs.cend());
	@@ -67,7 +67,7 @@ LowerResult CheckOutputsAndReturn(const ge::NodePtr &node, const vector<bg::DevM
67	} else {	67	} else {
68	if (outputs.size() != data_out_count * 2UL) {	68	if (outputs.size() != data_out_count * 2UL) {
69	return CreateErrorLowerResult(	69	return CreateErrorLowerResult(
70	- "Failed to lowering %s node %s, the output count %zu not match with 2 times of if output count %u",	70	+ "Failed to lower %s node %s, the output count %zu not match with 2 times of if output count %u",
71	node->GetType().c_str(), node->GetName().c_str(), outputs.size(), data_out_count);	71	node->GetType().c_str(), node->GetName().c_str(), outputs.size(), data_out_count);
72	}	72	}
73	auto addr_start = outputs.cbegin() + static_cast<int64_t>(data_out_count);	73	auto addr_start = outputs.cbegin() + static_cast<int64_t>(data_out_count);