From 9d21f83938dc23e679e17a51db89b05578143b5e Mon Sep 17 00:00:00 2001 From: lichun Date: Sat, 23 Jan 2021 11:25:38 +0800 Subject: [PATCH] rectify error codes --- ge/common/helper/model_helper.cc | 14 +++++++------- ge/common/model_parser/base.cc | 2 +- ge/graph/load/model_manager/davinci_model.cc | 2 +- ge/graph/preprocess/insert_op/util_insert_aipp_op.cc | 2 +- tests/ut/ge/common/format_transfer_fractal_zz_unittest.cc | 4 ++-- tests/ut/ge/common/format_transfer_nchw_5d_unittest.cc | 2 +- tests/ut/ge/common/format_transfer_nhwc_5d_unittest.cc | 4 ++-- .../ut/ge/common/format_transfer_nhwc_fractalz_unittest.cc | 10 +++++----- tests/ut/ge/common/format_transfer_transpose_unittest.cc | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ge/common/helper/model_helper.cc b/ge/common/helper/model_helper.cc index 0584f4b3..9342ec4a 100644 --- a/ge/common/helper/model_helper.cc +++ b/ge/common/helper/model_helper.cc @@ -517,8 +517,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelHelper::LoadRootMod } if (is_assign_model_) { - GELOGE(GE_EXEC_LOAD_MODEL_REPEATED, "Model helper has already loaded!"); - return GE_EXEC_LOAD_MODEL_REPEATED; + GELOGE(ACL_ERROR_GE_EXEC_LOAD_MODEL_REPEATED, "Model helper has already loaded!"); + return ACL_ERROR_GE_EXEC_LOAD_MODEL_REPEATED; } if (ReleaseLocalModelData() != SUCCESS) { @@ -609,7 +609,7 @@ Status ModelHelper::GenerateGeRootModel(OmFileLoadHelper &om_load_helper) { GeModelPtr cur_model = ge::MakeShared(); Status ret = LoadModelData(om_load_helper, cur_model, mode_index); if (ret != SUCCESS) { - return GE_EXEC_LOAD_MODEL_PARTITION_FAILED; + return ACL_ERROR_GE_EXEC_LOAD_MODEL_PARTITION_FAILED; } if (is_first_model) { @@ -622,22 +622,22 @@ Status ModelHelper::GenerateGeRootModel(OmFileLoadHelper &om_load_helper) { ret = LoadWeights(om_load_helper, cur_model, mode_index); if (ret != SUCCESS) { - return GE_EXEC_LOAD_WEIGHT_PARTITION_FAILED; + return ACL_ERROR_GE_EXEC_LOAD_WEIGHT_PARTITION_FAILED; } ret = LoadTBEKernelStore(om_load_helper, cur_model, mode_index); if (ret != SUCCESS) { - return GE_EXEC_LOAD_KERNEL_PARTITION_FAILED; + return ACL_ERROR_GE_EXEC_LOAD_KERNEL_PARTITION_FAILED; } ret = LoadCustAICPUKernelStore(om_load_helper, cur_model, mode_index); if (ret != SUCCESS) { - return GE_EXEC_LOAD_KERNEL_PARTITION_FAILED; + return ACL_ERROR_GE_EXEC_LOAD_KERNEL_PARTITION_FAILED; } ret = LoadTask(om_load_helper, cur_model, mode_index); if (ret != SUCCESS) { - return GE_EXEC_LOAD_TASK_PARTITION_FAILED; + return ACL_ERROR_GE_EXEC_LOAD_TASK_PARTITION_FAILED; } root_model_->SetSubgraphInstanceNameToModel(cur_model->GetName(), cur_model); } diff --git a/ge/common/model_parser/base.cc b/ge/common/model_parser/base.cc index 64277199..22837be6 100644 --- a/ge/common/model_parser/base.cc +++ b/ge/common/model_parser/base.cc @@ -34,7 +34,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelParserBase::LoadFro ge::ModelData &model_data) { std::string real_path = RealPath(model_path); if (real_path.empty()) { - GELOGE(GE_EXEC_MODEL_PATH_INVALID, "Model file path '%s' is invalid", model_path); + GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "Model file path '%s' is invalid", model_path); return ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID; } diff --git a/ge/graph/load/model_manager/davinci_model.cc b/ge/graph/load/model_manager/davinci_model.cc index 0a92447b..ed7ce006 100755 --- a/ge/graph/load/model_manager/davinci_model.cc +++ b/ge/graph/load/model_manager/davinci_model.cc @@ -1814,7 +1814,7 @@ Status DavinciModel::InitAippInfo(uint32_t index, const OpDescPtr &op_desc) { domi::AippOpParams aipp_params; GeAttrValue::NAMED_ATTRS aipp_attr; - GE_CHK_BOOL_RET_STATUS(AttrUtils::GetNamedAttrs(op_desc, ATTR_NAME_AIPP, aipp_attr), GE_AIPP_NOT_EXIST, + GE_CHK_BOOL_RET_STATUS(AttrUtils::GetNamedAttrs(op_desc, ATTR_NAME_AIPP, aipp_attr), ACL_ERROR_GE_AIPP_NOT_EXIST, "Data node do not contain param aipp!"); GE_CHK_STATUS_RET(OpUtils::ConvertAippParams(aipp_attr, &aipp_params), "get aipp params failed"); GELOGI("node data: %s, type: %s, current index: %u, current node related input rank: %u", diff --git a/ge/graph/preprocess/insert_op/util_insert_aipp_op.cc b/ge/graph/preprocess/insert_op/util_insert_aipp_op.cc index 3b37003f..d25d8bea 100755 --- a/ge/graph/preprocess/insert_op/util_insert_aipp_op.cc +++ b/ge/graph/preprocess/insert_op/util_insert_aipp_op.cc @@ -540,7 +540,7 @@ Status InsertNewOpUtil::GetDataRelatedNode(NodePtr &node, std::map aipp_params(new (std::nothrow) domi::AippOpParams()); ge::GeAttrValue::NAMED_ATTRS aipp_attr; - GE_CHK_BOOL_RET_STATUS(AttrUtils::GetNamedAttrs(data_op, ATTR_NAME_AIPP, aipp_attr), GE_AIPP_NOT_EXIST, + GE_CHK_BOOL_RET_STATUS(AttrUtils::GetNamedAttrs(data_op, ATTR_NAME_AIPP, aipp_attr), ACL_ERROR_GE_AIPP_NOT_EXIST, "Data node do not contain param aipp!"); GE_CHK_STATUS_RET(OpUtils::ConvertAippParams(aipp_attr, aipp_params.get()), "get aipp params failed"); diff --git a/tests/ut/ge/common/format_transfer_fractal_zz_unittest.cc b/tests/ut/ge/common/format_transfer_fractal_zz_unittest.cc index 09917c53..8b1afa24 100644 --- a/tests/ut/ge/common/format_transfer_fractal_zz_unittest.cc +++ b/tests/ut/ge/common/format_transfer_fractal_zz_unittest.cc @@ -1894,7 +1894,7 @@ TEST_F(UtestFormatTransferNdFractZz, nd_shape4_fp16_1) { } EXPECT_EQ( transfer2.TransShape(args2.src_format, args2.src_shape, args2.src_data_type, args2.dst_format, args2.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); + ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); } TEST_F(UtestFormatTransferNdFractZz, nd_shape4_fp16) { @@ -2071,7 +2071,7 @@ TEST_F(UtestFormatTransferNdFractZz, nd_shape4_fp16) { } EXPECT_EQ( transfer2.TransShape(args2.src_format, args2.src_shape, args2.src_data_type, args2.dst_format, args2.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); + ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); } TEST_F(UtestFormatTransferNdFractZz, nd_shape5_fp16) { diff --git a/tests/ut/ge/common/format_transfer_nchw_5d_unittest.cc b/tests/ut/ge/common/format_transfer_nchw_5d_unittest.cc index 5ec0a8b4..610bd7d3 100644 --- a/tests/ut/ge/common/format_transfer_nchw_5d_unittest.cc +++ b/tests/ut/ge/common/format_transfer_nchw_5d_unittest.cc @@ -640,7 +640,7 @@ TEST_F(UtestFormatTransferNchw5d, invalid_data_format) { reinterpret_cast(data), FORMAT_NHWC, FORMAT_FRACTAL_Z, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_FLOAT16}; FormatTransferNchwNc1hwc0 transfer; EXPECT_EQ(transfer.TransShape(args.src_format, args.src_shape, args.src_data_type, args.dst_format, args.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); + ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); } } // namespace formats } // namespace ge diff --git a/tests/ut/ge/common/format_transfer_nhwc_5d_unittest.cc b/tests/ut/ge/common/format_transfer_nhwc_5d_unittest.cc index de820a53..bc5a8754 100644 --- a/tests/ut/ge/common/format_transfer_nhwc_5d_unittest.cc +++ b/tests/ut/ge/common/format_transfer_nhwc_5d_unittest.cc @@ -758,13 +758,13 @@ TEST_F(UtestFormatTransferNhwc5d, invalid_data_shape) { reinterpret_cast(data), FORMAT_NHWC, FORMAT_FRACTAL_Z, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_FLOAT16}; FormatTransferNhwcNc1hwc0 transfer; EXPECT_EQ(transfer.TransShape(args.src_format, args.src_shape, args.src_data_type, args.dst_format, args.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); TransArgs args2{ reinterpret_cast(data), FORMAT_NHWC, FORMAT_FRACTAL_Z, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_STRING}; FormatTransferNhwcNc1hwc0 transfer2; EXPECT_EQ(transfer2.TransShape(args2.src_format, args2.src_shape, args2.src_data_type, args2.dst_format, args2.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_DATATYPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_DATATYPE_INVALID); } } // namespace formats } // namespace ge diff --git a/tests/ut/ge/common/format_transfer_nhwc_fractalz_unittest.cc b/tests/ut/ge/common/format_transfer_nhwc_fractalz_unittest.cc index 5337d50c..a6dfffb0 100644 --- a/tests/ut/ge/common/format_transfer_nhwc_fractalz_unittest.cc +++ b/tests/ut/ge/common/format_transfer_nhwc_fractalz_unittest.cc @@ -5360,7 +5360,7 @@ TEST_F(UtestFormatTransferNhwcFz, invalid_data_type) { reinterpret_cast(data), FORMAT_NHWC, FORMAT_FRACTAL_NZ, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_VARIANT}; FormatTransferFractalZ transfer; EXPECT_EQ(transfer.TransShape(args.src_format, args.src_shape, args.src_data_type, args.dst_format, args.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_DATATYPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_DATATYPE_INVALID); } TEST_F(UtestFormatTransferNhwcFz, invalid_data_format) { @@ -5369,7 +5369,7 @@ TEST_F(UtestFormatTransferNhwcFz, invalid_data_format) { reinterpret_cast(data), FORMAT_CHWN, FORMAT_FRACTAL_NZ, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_FLOAT16}; FormatTransferFractalZ transfer; EXPECT_EQ(transfer.TransShape(args.src_format, args.src_shape, args.src_data_type, args.dst_format, args.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); + ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); } TEST_F(UtestFormatTransferNhwcFz, invalid_data_shape) { @@ -5378,19 +5378,19 @@ TEST_F(UtestFormatTransferNhwcFz, invalid_data_shape) { reinterpret_cast(data), FORMAT_NHWC, FORMAT_FRACTAL_Z, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_FLOAT16}; FormatTransferFractalZ transfer; EXPECT_EQ(transfer.TransShape(args.src_format, args.src_shape, args.src_data_type, args.dst_format, args.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); TransArgs args2{ reinterpret_cast(data), FORMAT_HWCN, FORMAT_FRACTAL_Z, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_FLOAT16}; FormatTransferFractalZ transfer2; EXPECT_EQ(transfer2.TransShape(args2.src_format, args2.src_shape, args2.src_data_type, args2.dst_format, args2.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); TransArgs args3{ reinterpret_cast(data), FORMAT_NCHW, FORMAT_FRACTAL_Z, {1, 4, 4}, {1, 1, 1, 16, 16}, DT_FLOAT16}; FormatTransferFractalZ transfer3; EXPECT_EQ(transfer3.TransShape(args3.src_format, args3.src_shape, args3.src_data_type, args3.dst_format, args3.dst_shape), - ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); } } // namespace formats } // namespace ge diff --git a/tests/ut/ge/common/format_transfer_transpose_unittest.cc b/tests/ut/ge/common/format_transfer_transpose_unittest.cc index 238c3d01..d56e06c0 100644 --- a/tests/ut/ge/common/format_transfer_transpose_unittest.cc +++ b/tests/ut/ge/common/format_transfer_transpose_unittest.cc @@ -4659,14 +4659,14 @@ TEST_F(UtestFormatTranspose, invalid_data_shape) { FormatTransferTranspose transfer; std::vector dst_shape; EXPECT_EQ(transfer.TransShape(FORMAT_NCHW, std::vector({}), DT_FLOAT16, FORMAT_HWCN, dst_shape), - ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); + ACL_ERROR_GE_TRANSSHAPE_SHAPE_INVALID); } TEST_F(UtestFormatTranspose, invalid_src_format) { FormatTransferTranspose transfer; std::vector dst_shape; EXPECT_EQ(transfer.TransShape(FORMAT_NC1HWC0, std::vector({1, 3, 8, 8}), DT_FLOAT16, FORMAT_HWCN, dst_shape), - ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); + ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); } TEST_F(UtestFormatTranspose, invalid_dst_format) { @@ -4674,7 +4674,7 @@ TEST_F(UtestFormatTranspose, invalid_dst_format) { std::vector dst_shape; std::vector src_shape; EXPECT_EQ(transfer.TransShape(FORMAT_NCHW, src_shape, DT_FLOAT16, FORMAT_C1HWNC0, dst_shape), - ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); + ACL_ERROR_GE_TRANSSHAPE_FORMAT_INVALID); } } // namespace formats } // namespace ge