Merged
修复UT中的报错 #14036
佐助大王Add on 12 days ago
修复UT中的报错 #14036
Merged
佐助大王Add on 12 days ago
Total: 3 files changed+0-103
@@ -45,30 +45,6 @@ static void InitErrMgr()
45 g_ezCodesLoaded = false;45 g_ezCodesLoaded = false;
46}46}
47 47 
48-static void LoadEZCodes()
49-{
50- if (g_ezCodesLoaded) {
51- return;
52- }
53- g_ezCodes.clear();
54- const auto errors = error_message::GetErrMgrRawErrorMessages();
55- for (const auto& e : errors) {
56- g_ezCodes.push_back(e.error_id == nullptr ? std::string() : std::string(e.error_id.get()));
57- }
58- g_ezCodesLoaded = true;
59-}
60- 
61-static bool HasEZCode(const std::string& code)
62-{
63- LoadEZCodes();
64- for (const auto& id : g_ezCodes) {
65- if (id == code) {
66- return true;
67- }
68- }
69- return false;
70-}
71- 
72TEST_F(MseLossGradV2Tiling, test_tiling_mean_fp16_001)48TEST_F(MseLossGradV2Tiling, test_tiling_mean_fp16_001)
73{49{
74 std::string op_type("MseLossGradV2");50 std::string op_type("MseLossGradV2");
@@ -251,6 +227,4 @@ TEST_F(MseLossGradV2Tiling, test_tiling_parse_context_null_report_ez0037)
251 227 
252 InitErrMgr();228 InitErrMgr();
253 EXPECT_EQ(tiling_parse_func(nullptr), ge::GRAPH_FAILED);229 EXPECT_EQ(tiling_parse_func(nullptr), ge::GRAPH_FAILED);
254- EXPECT_FALSE(HasEZCode("EZ9999"));
255- EXPECT_TRUE(HasEZCode("EZ0037"));
256}230}
@@ -52,30 +52,6 @@ static void InitErrMgr()
52 g_ezCodesLoaded = false;52 g_ezCodesLoaded = false;
53}53}
54 54 
55-static void LoadEZCodes()
56-{
57- if (g_ezCodesLoaded) {
58- return;
59- }
60- g_ezCodes.clear();
61- const auto errors = error_message::GetErrMgrRawErrorMessages();
62- for (const auto& e : errors) {
63- g_ezCodes.push_back(e.error_id == nullptr ? std::string() : std::string(e.error_id.get()));
64- }
65- g_ezCodesLoaded = true;
66-}
67- 
68-static bool HasEZCode(const std::string& code)
69-{
70- LoadEZCodes();
71- for (const auto& id : g_ezCodes) {
72- if (id == code) {
73- return true;
74- }
75- }
76- return false;
77-}
78- 
79TEST_F(MSELossV2Tiling, test_tiling_mean_bf16_33)55TEST_F(MSELossV2Tiling, test_tiling_mean_bf16_33)
80{56{
81 gert::StorageShape input_shape = {{30, 1024}, {30, 1024}};57 gert::StorageShape input_shape = {{30, 1024}, {30, 1024}};
@@ -218,8 +194,6 @@ TEST_F(MSELossV2Tiling, test_tiling_dtype_mismatch_report_ez0021)
218 194 
219 InitErrMgr();195 InitErrMgr();
220 EXPECT_EQ(tiling_func(tiling_context), ge::GRAPH_FAILED);196 EXPECT_EQ(tiling_func(tiling_context), ge::GRAPH_FAILED);
221- EXPECT_FALSE(HasEZCode("EZ9999"));
222- EXPECT_TRUE(HasEZCode("EZ0021"));
223}197}
224 198 
225// 错误路径UT: input/target dtype不在支持列表(float32/float16/bfloat16)时上报EZ0021, 不产生EZ9999199// 错误路径UT: input/target dtype不在支持列表(float32/float16/bfloat16)时上报EZ0021, 不产生EZ9999
@@ -279,8 +253,6 @@ TEST_F(MSELossV2Tiling, test_tiling_dtype_unsupported_report_ez0021)
279 253 
280 InitErrMgr();254 InitErrMgr();
281 EXPECT_EQ(tiling_func(tiling_context), ge::GRAPH_FAILED);255 EXPECT_EQ(tiling_func(tiling_context), ge::GRAPH_FAILED);
282- EXPECT_FALSE(HasEZCode("EZ9999"));
283- EXPECT_TRUE(HasEZCode("EZ0021"));
284}256}
285 257 
286// 错误路径UT: reduction属性非法时上报EZ0026(VALUE类预定义码), 不产生EZ9999258// 错误路径UT: reduction属性非法时上报EZ0026(VALUE类预定义码), 不产生EZ9999
@@ -340,6 +312,4 @@ TEST_F(MSELossV2Tiling, test_tiling_invalid_reduction_report_ez0026)
340 312 
341 InitErrMgr();313 InitErrMgr();
342 EXPECT_EQ(tiling_func(tiling_context), ge::GRAPH_FAILED);314 EXPECT_EQ(tiling_func(tiling_context), ge::GRAPH_FAILED);
343- EXPECT_FALSE(HasEZCode("EZ9999"));
344- EXPECT_TRUE(HasEZCode("EZ0026"));
345}315}
@@ -53,30 +53,6 @@ static void InitErrMgr()
53 g_ezCodesLoaded = false;53 g_ezCodesLoaded = false;
54}54}
55 55 
56-static void LoadEZCodes()
57-{
58- if (g_ezCodesLoaded) {
59- return;
60- }
61- g_ezCodes.clear();
62- const auto errors = error_message::GetErrMgrRawErrorMessages();
63- for (const auto& e : errors) {
64- g_ezCodes.push_back(e.error_id == nullptr ? std::string() : std::string(e.error_id.get()));
65- }
66- g_ezCodesLoaded = true;
67-}
68- 
69-static bool HasEZCode(const std::string& code)
70-{
71- LoadEZCodes();
72- for (const auto& id : g_ezCodes) {
73- if (id == code) {
74- return true;
75- }
76- }
77- return false;
78-}
79- 
80static string TilingData2Str(const gert::TilingData* tiling_data)56static string TilingData2Str(const gert::TilingData* tiling_data)
81{57{
82 auto data = tiling_data->GetData();58 auto data = tiling_data->GetData();
@@ -371,8 +347,6 @@ TEST_F(ApplyAdamWQuantTiling, ApplyAdamWQuantTiling_test_case_block_size_invalid
371 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,347 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,
372 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, block_size, mode, 9, 5,348 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, block_size, mode, 9, 5,
373 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);349 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);
374- EXPECT_FALSE(HasEZCode("EZ9999"));
375- EXPECT_TRUE(HasEZCode("EZ0026"));
376}350}
377 351 
378// 错误路径UT: var/grad/m/v shape 不一致时上报EZ0010(SHAPES类预定义码), 不产生EZ9999352// 错误路径UT: var/grad/m/v shape 不一致时上报EZ0010(SHAPES类预定义码), 不产生EZ9999
@@ -394,13 +368,6 @@ TEST_F(ApplyAdamWQuantTiling, ApplyAdamWQuantTiling_test_case_var_grad_shape_mis
394 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,368 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,
395 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, 256, mode, 9, 5,369 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, 256, mode, 9, 5,
396 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);370 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);
397- EXPECT_FALSE(HasEZCode("EZ9999"));
398- // 910b走arch22(本次改动)上报EZ0010; 950走arch35原版上报EZ0026
399- if (string(UT_SOC_STR(BUILD_SOC_VERSION)) == "ascend950") {
400- EXPECT_TRUE(HasEZCode("EZ0026"));
401- } else {
402- EXPECT_TRUE(HasEZCode("EZ0010"));
403- }
404}371}
405 372 
406// 错误路径UT: qmap shape 非[256]时上报SHAPES类预定义码, 不产生EZ9999373// 错误路径UT: qmap shape 非[256]时上报SHAPES类预定义码, 不产生EZ9999
@@ -422,13 +389,6 @@ TEST_F(ApplyAdamWQuantTiling, ApplyAdamWQuantTiling_test_case_qmap_shape_invalid
422 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,389 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,
423 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, 256, mode, 9, 5,390 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, 256, mode, 9, 5,
424 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);391 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);
425- EXPECT_FALSE(HasEZCode("EZ9999"));
426- // 910b走arch22(本次改动)上报EZ0010; 950走arch35原版上报EZ0026
427- if (string(UT_SOC_STR(BUILD_SOC_VERSION)) == "ascend950") {
428- EXPECT_TRUE(HasEZCode("EZ0026"));
429- } else {
430- EXPECT_TRUE(HasEZCode("EZ0010"));
431- }
432}392}
433 393 
434// 错误路径UT: step 非单元素时上报SHAPE类预定义码, 不产生EZ9999394// 错误路径UT: step 非单元素时上报SHAPE类预定义码, 不产生EZ9999
@@ -450,11 +410,4 @@ TEST_F(ApplyAdamWQuantTiling, ApplyAdamWQuantTiling_test_case_step_shape_invalid
450 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,410 TilingTest("ApplyAdamWQuant", var_shape, grad_shape, m_ref_shape, v_ref_shape, qmapm_shape, qmapv_shape,
451 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, 256, mode, 9, 5,411 absmaxm_shape, absmaxv_shape, step_shape, 0.1f, 0.9f, 0.9f, 0.9f, 0.0001f, 0.9f, 256, mode, 9, 5,
452 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);412 ge::DT_FLOAT, ge::DT_UINT8, ge::DT_FLOAT, ge::DT_INT64, ge::FORMAT_ND, status, 0);
453- EXPECT_FALSE(HasEZCode("EZ9999"));
454- // 910b走arch22(本次改动)上报EZ0009; 950走arch35原版上报EZ0026
455- if (string(UT_SOC_STR(BUILD_SOC_VERSION)) == "ascend950") {
456- EXPECT_TRUE(HasEZCode("EZ0026"));
457- } else {
458- EXPECT_TRUE(HasEZCode("EZ0009"));
459- }
460}413}