【Bugfix】: Use Internal Error instead inner error-ge-AtomGit

Star669

Star669

已合并

【Bugfix】: Use Internal Error instead inner error #4340

zhanj创建于 20 天前从zhanj/ge： b_fix_inner_error 合入到 cann/ge： develop

【Bugfix】: Use Internal Error instead inner error #4340

已合并

zhanj创建于 20 天前

从zhanj/ge b_fix_inner_error合入到cann/ge develop

共 6 个文件变更+8-8

Mapi/acl/acl_op_executor/single_op/op_model_cache.cpp+1-1

	@@ -45,7 +45,7 @@ aclError OpModelCache::Add(const uint64_t opId, OpModel &operModel) {
45	auto mtx = std::make_shared<std::mutex>();	45	auto mtx = std::make_shared<std::mutex>();
46	ACL_REQUIRES_NOT_NULL(mtx);	46	ACL_REQUIRES_NOT_NULL(mtx);
47	auto ret = cachedModels_.insert(std::make_pair(opId, operModel));	47	auto ret = cachedModels_.insert(std::make_pair(opId, operModel));
48	- ACL_REQUIRES_TRUE(ret.second, ACL_ERROR_FAILURE, "ACL inner Error: OpModelCache Add has same opId!");	48	+ ACL_REQUIRES_TRUE(ret.second, ACL_ERROR_FAILURE, "ACL internal error: OpModelCache Add has same opId!");
49	ret.first->second.mtx = std::move(mtx);	49	ret.first->second.mtx = std::move(mtx);
50	return ACL_SUCCESS;	50	return ACL_SUCCESS;
51	}	51	}

Mcompiler/engines/cpu_engine/common/config/ops_json_file.cc+1-1

	@@ -36,7 +36,7 @@ aicpu::State OpsJsonFile::ParseUnderPath(const string &file_path, json &json_rea
36	AICPUE_LOGW("Read kernel json file failed, file_path[%s].", file_path.c_str());	36	AICPUE_LOGW("Read kernel json file failed, file_path[%s].", file_path.c_str());
37	return aicpu::State(ge::SUCCESS);	37	return aicpu::State(ge::SUCCESS);
38	}	38	}
39	- // inner error	39	+ // internal error
40	return ConvertJsonFormat(json_read) ? aicpu::State(ge::SUCCESS) : aicpu::State(ge::FAILED);	40	return ConvertJsonFormat(json_read) ? aicpu::State(ge::SUCCESS) : aicpu::State(ge::FAILED);
41	}	41	}
42		42

Mcompiler/engines/cpu_engine/common/config/ops_parallel_rule_json_file.cpp+1-1

	@@ -28,7 +28,7 @@ aicpu::State OpsParallelRuleJsonFile::ParseUnderPath(const string &file_path, js
28	AICPUE_LOGW("Read kernel json file failed, file_path[%s].", file_path.c_str());	28	AICPUE_LOGW("Read kernel json file failed, file_path[%s].", file_path.c_str());
29	return aicpu::State(ge::SUCCESS);	29	return aicpu::State(ge::SUCCESS);
30	}	30	}
31	- // inner error	31	+ // internal error
32	return ConvertOpsParallelRuleJsonFormat(json_read) ? aicpu::State(ge::SUCCESS) : aicpu::State(ge::FAILED);	32	return ConvertOpsParallelRuleJsonFormat(json_read) ? aicpu::State(ge::SUCCESS) : aicpu::State(ge::FAILED);
33	}	33	}
34		34

Mdocs/zh/user_guides/atc_tools/FAQ/model_input_size_too_large.md+1-1

	@@ -18,7 +18,7 @@ atc --model=xxxxxx.pb --framework=3 --output=xxxxxx --soc_version=xxxxxx --input
18	[ERROR] AMCT(757013,atc.bin):2023-03-14-14:15:55[quantize_api.cpp:378]Do Calibration failed.	18	[ERROR] AMCT(757013,atc.bin):2023-03-14-14:15:55[quantize_api.cpp:378]Do Calibration failed.
19	[ERROR] AMCT(757013,atc.bin):2023-03-14-14:15:56[inner_graph_calibration.cpp:77]Failed to execute InnerQuantizeGraph failed.	19	[ERROR] AMCT(757013,atc.bin):2023-03-14-14:15:56[inner_graph_calibration.cpp:77]Failed to execute InnerQuantizeGraph failed.
20	ATC run failed, Please check the detail log, Try 'atc --help' for more information	20	ATC run failed, Please check the detail log, Try 'atc --help' for more information
21	-EZ9999: Inner Error!	21	+EZ9999: Internal Error!
22	EZ9999 Aicore kernel execute failed, device_id=0, stream_id=11, report_stream_id=2, task_id=209, flip_num=0, fault kernel_name=17786444594805609729-1_0_1_vgg_16/conv1/conv1_2/Conv2D_histo, program id=206, hash=1846532111878224358.[FUNC:GetError][FILE:stream.cc][LINE:1131]	22	EZ9999 Aicore kernel execute failed, device_id=0, stream_id=11, report_stream_id=2, task_id=209, flip_num=0, fault kernel_name=17786444594805609729-1_0_1_vgg_16/conv1/conv1_2/Conv2D_histo, program id=206, hash=1846532111878224358.[FUNC:GetError][FILE:stream.cc][LINE:1131]
23	TraceBack (most recent call last):	23	TraceBack (most recent call last):
24	Model synchronize execute failed, model_id=1![FUNC:GetStreamToSyncExecute][FILE:model.cc][LINE:630]	24	Model synchronize execute failed, model_id=1![FUNC:GetStreamToSyncExecute][FILE:model.cc][LINE:630]

Mdocs/zh/user_guides/atc_tools/FAQ/operator_library_version_error.md+1-1

	@@ -5,7 +5,7 @@
5	加载单算子报错失败，日志显示如下类似信息：	5	加载单算子报错失败，日志显示如下类似信息：
6		6
7	```console	7	```console
8	-E19999: Inner Error	8	+E19999: Internal Error
9	E19999 The opp version of the model does not match the current opp run package, Model is [6.4.T11.0.B300], opp run package is [7.0.T3.0.B107], try to convert the om again!	9	E19999 The opp version of the model does not match the current opp run package, Model is [6.4.T11.0.B300], opp run package is [7.0.T3.0.B107], try to convert the om again!
10	```	10	```
11		11

Mtests/test_c/c_base/src/error_manager.c+3-3

	@@ -351,7 +351,7 @@ static size_t GetFirstCode(size_t errorItemNum) {
351	}	351	}
352		352
353	static int32_t ComputeAllocate(ErrorItem *firstItem) {	353	static int32_t ComputeAllocate(ErrorItem *firstItem) {
354	- g_errorThread->errorMsgLen += (ERRCODE_LENGTH + sizeof(": Inner Error!\r\n") + strlen(firstItem->errorMessage) +	354	+ g_errorThread->errorMsgLen += (ERRCODE_LENGTH + sizeof(": Internal Error!\r\n") + strlen(firstItem->errorMessage) +
355	NEWLINE_LEN + sizeof(" TraceBack (most recent call last): \r\n"));	355	NEWLINE_LEN + sizeof(" TraceBack (most recent call last): \r\n"));
356		356
357	if (!IsInnerErrorCode(firstItem->errorId)) {	357	if (!IsInnerErrorCode(firstItem->errorId)) {
	@@ -371,8 +371,8 @@ static int32_t FormatTraceBefore(ErrorItem *firstItem) {
371	int32_t nFirstCause = 0;	371	int32_t nFirstCause = 0;
372	int32_t nFirstSolution = 0;	372	int32_t nFirstSolution = 0;
373	if (IsInnerErrorCode(firstItem->errorId)) {	373	if (IsInnerErrorCode(firstItem->errorId)) {
374	- n = sprintf_s(g_errorThread->errorMsg, g_errorThread->errorMsgLen, "%s: Inner Error!\r\n%s\r\n", firstItem->errorId,	374	+ n = sprintf_s(g_errorThread->errorMsg, g_errorThread->errorMsgLen, "%s: Internal Error!\r\n%s\r\n",
375	- firstItem->errorMessage);	375	+ firstItem->errorId, firstItem->errorMessage);
376	if (n < 0) {	376	if (n < 0) {
377	return -1;	377	return -1;
378	}	378	}