nn仓日志可读性修改-ops-nn-AtomGit

已合并

nn仓日志可读性修改 #9144

gaomingyuan创建于 8月25日从qq_52874943/dynamic_block_quant： master 合入到 cann/ops-nn： master

nn仓日志可读性修改 #9144

已合并

gaomingyuan创建于 8月25日

从qq_52874943/dynamic_block_quant master合入到cann/ops-nn master

共 3 个文件变更+10-14

Mactivation/softmax_grad_ext/op_host/arch35/softmax_grad_ext_tiling_base_arch35.cpp+10-11

	@@ -76,16 +76,15 @@ ge::graphStatus SoftmaxGradExtTilingBase::GetAndCheckDtypes()
76	OP_CHECK_NULL_WITH_CONTEXT(context_, yDesc);	76	OP_CHECK_NULL_WITH_CONTEXT(context_, yDesc);
77	yDtype_ = yDesc->GetDataType();	77	yDtype_ = yDesc->GetDataType();
78		78
79	- OP_TILING_CHECK(	79	+ OP_TILING_CHECK(xDtype_ != yDtype_ \|\| xDtype_ != xDtype1 \|\| xDtype_ != xDtype2,
80	- xDtype_ != yDtype_ \|\| xDtype_ != xDtype1 \|\| xDtype_ != xDtype2,	80	+ VECTOR_INNER_ERR_REPORT_TILIING(
81	- VECTOR_INNER_ERR_REPORT_TILIING(	81	+ context_->GetNodeName(),
82	- context_->GetNodeName(),	82	+ "Input0 dtype [%s], Input1 dtype [%s], Input2 dtype [%s] and Output dtype [%s] should be same.",
83	- "Input0 dtype [%s], Input1 dtype [%s], InInput2 dtype [%s] and Output dtype [%s] should be same.",	83	+ ge::TypeUtils::DataTypeToSerialString(xDtype_).c_str(),
84	- ge::TypeUtils::DataTypeToSerialString(xDtype_).c_str(),	84	+ ge::TypeUtils::DataTypeToSerialString(xDtype1).c_str(),
85	- ge::TypeUtils::DataTypeToSerialString(xDtype1).c_str(),	85	+ ge::TypeUtils::DataTypeToSerialString(xDtype2).c_str(),
86	- ge::TypeUtils::DataTypeToSerialString(xDtype2).c_str(),	86	+ ge::TypeUtils::DataTypeToSerialString(yDtype_).c_str()),
87	- ge::TypeUtils::DataTypeToSerialString(yDtype_).c_str()),	87	+ return ge::GRAPH_FAILED);
88	- return ge::GRAPH_FAILED);
89	OP_TILING_CHECK(xDtype_ != ge::DT_FLOAT16 && xDtype_ != ge::DT_FLOAT && xDtype_ != ge::DT_BF16,	88	OP_TILING_CHECK(xDtype_ != ge::DT_FLOAT16 && xDtype_ != ge::DT_FLOAT && xDtype_ != ge::DT_BF16,
90	VECTOR_INNER_ERR_REPORT_TILIING(	89	VECTOR_INNER_ERR_REPORT_TILIING(
91	context_->GetNodeName(),	90	context_->GetNodeName(),
	@@ -317,7 +316,7 @@ ge::graphStatus TilingPrepareForSoftmaxGradExtAscendC(gert::TilingParseContext*
317	ascendcPlatform.GetCoreMemSize(platform_ascendc::CoreMemType::UB, ubSizeTemp); // 获取每个核心的通用缓冲区大小	316	ascendcPlatform.GetCoreMemSize(platform_ascendc::CoreMemType::UB, ubSizeTemp); // 获取每个核心的通用缓冲区大小
318	compileInfoPtr->ubSize = static_cast<int64_t>(ubSizeTemp);	317	compileInfoPtr->ubSize = static_cast<int64_t>(ubSizeTemp);
319	OP_TILING_CHECK((compileInfoPtr->ubSize <= CONST_ZERO),	318	OP_TILING_CHECK((compileInfoPtr->ubSize <= CONST_ZERO),
320	- VECTOR_INNER_ERR_REPORT_TILIING(context->GetNodeName(), "Get ub size failed, ub size: %u",	319	+ VECTOR_INNER_ERR_REPORT_TILIING(context->GetNodeName(), "Get ub size failed, ub size: %uB",
321	static_cast<uint32_t>(compileInfoPtr->ubSize)),	320	static_cast<uint32_t>(compileInfoPtr->ubSize)),
322	return ge::GRAPH_FAILED);	321	return ge::GRAPH_FAILED);
323		322

Mactivation/softmax_grad_ext/tests/ut/op_graph/test_softmax_grad_ext_fusion_pass.cpp+0-1

	@@ -725,7 +725,6 @@ TEST_F(SoftmaxGradExtFusionPassTest, v1_axes_from_op_depending_on_mulgrad_cycle)
725	CustomPassContext ctx;	725	CustomPassContext ctx;
726	SoftmaxGradExtFusionPass pass;	726	SoftmaxGradExtFusionPass pass;
727	auto status = pass.Run(graph, ctx);	727	auto status = pass.Run(graph, ctx);
728	- fprintf(stderr, "[STATUS-axes-cycle] %d\n", static_cast<int32_t>(status));
729	// If WillCauseCycleIfFuse catches it -> GRAPH_NOT_CHANGED.	728	// If WillCauseCycleIfFuse catches it -> GRAPH_NOT_CHANGED.
730	// If not -> SUCCESS but graph has cycle (bad), or FAILED.	729	// If not -> SUCCESS but graph has cycle (bad), or FAILED.
731	EXPECT_TRUE(status == SUCCESS \|\| status == GRAPH_NOT_CHANGED);	730	EXPECT_TRUE(status == SUCCESS \|\| status == GRAPH_NOT_CHANGED);

Mactivation/softmax_grad_ext/tests/ut/op_host/arch35/test_softmax_grad_ext_tiling.cpp+0-2

	@@ -35,14 +35,12 @@ protected:
35	{	35	{
36	setenv("ASCEND_SLOG_PRINT_TO_STDOUT", "1", true);	36	setenv("ASCEND_SLOG_PRINT_TO_STDOUT", "1", true);
37	setenv("ASCEND_GLOBAL_LOG_LEVEL", "0", true);	37	setenv("ASCEND_GLOBAL_LOG_LEVEL", "0", true);
38	- std::cout << " SoftmaxGradExtTiling SetUp" << std::endl;
39	}	38	}
40		39
41	static void TearDownTestCase()	40	static void TearDownTestCase()
42	{	41	{
43	setenv("ASCEND_SLOG_PRINT_TO_STDOUT", "0", true);	42	setenv("ASCEND_SLOG_PRINT_TO_STDOUT", "0", true);
44	setenv("ASCEND_GLOBAL_LOG_LEVEL", "1", true);	43	setenv("ASCEND_GLOBAL_LOG_LEVEL", "1", true);
45	- std::cout << " SoftmaxGradExtTiling TearDown" << std::endl;
46	}	44	}
47	};	45	};
48		46