From df3bdf243b49a574227dcfef8f8436149f21a01e Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Fri, 9 Apr 2021 15:04:44 +0800 Subject: [PATCH 1/3] fix windows VB --- .../formats/format_transfers/format_transfer_nchw_fz_c04.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc b/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc index aa3b4c7b..3bb68547 100644 --- a/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc +++ b/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc @@ -305,7 +305,7 @@ Status PaddingNC(const TransArgs &args, TransArgs &args_tmp, std::shared_ptr Date: Fri, 9 Apr 2021 15:44:54 +0800 Subject: [PATCH 2/3] fix windows VB --- .../format_transfers/format_transfer_nc1hwc0_nhwc.cc | 2 +- .../formats/format_transfers/format_transfer_nchw_fz_c04.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc b/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc index 6066c250..30cf1990 100755 --- a/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc +++ b/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc @@ -66,7 +66,7 @@ Status CheckArgsForNc1hwc0ToNhwc(const TransArgs &args) { if (c0 <= 0) { GELOGE(ACL_ERROR_GE_DATATYPE_INVALID, "[Get][Cube]Failed, the data type %s is invalid", TypeUtils::DataTypeToSerialString(args.src_data_type).c_str()); - REPORT_CALL_ERROR("E19999", "Failed to get cube size， the data type %s is invalid", + REPORT_CALL_ERROR("E19999", "Failed to get cube size, the data type %s is invalid", TypeUtils::DataTypeToSerialString(args.src_data_type).c_str()); return ACL_ERROR_GE_DATATYPE_INVALID; } diff --git a/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc b/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc index 3bb68547..5efe486c 100644 --- a/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc +++ b/ge/common/formats/format_transfers/format_transfer_nchw_fz_c04.cc @@ -189,9 +189,9 @@ Status TransFormatFromNchwToFzC04(const TransArgs &args, TransResult &result) { ret = memcpy_s(p_d + k * stride, protectSize, p_s + k * block, block); if (ret != EOK) { GELOGE(ACL_ERROR_GE_MEMORY_OPERATE_FAILED, "[Set][Memcpy]Failed, block %zu, stride %zu, " - "protect_size %ld， error_code %d", block, stride, protectSize, ret); + "protect_size %ld, error_code %d", block, stride, protectSize, ret); REPORT_CALL_ERROR("E19999", "[Set][Memcpy]Failed, block %zu, stride %zu, " - "protect_size %ld， error_code %d", block, stride, protectSize, ret); + "protect_size %ld, error_code %d", block, stride, protectSize, ret); return ACL_ERROR_GE_MEMORY_OPERATE_FAILED; } protectSize = protectSize - block; @@ -304,7 +304,7 @@ Status PaddingNC(const TransArgs &args, TransArgs &args_tmp, std::shared_ptr Date: Fri, 9 Apr 2021 16:15:01 +0800 Subject: [PATCH 3/3] fot ut cov --- .../formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc b/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc index 30cf1990..e9e41cd1 100755 --- a/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc +++ b/ge/common/formats/format_transfers/format_transfer_nc1hwc0_nhwc.cc @@ -175,7 +175,8 @@ Status FormatTransferNc1hwc0Nhwc::TransFormat(const TransArgs &args, TransResult ShapeToString(args.dst_shape).c_str(), ShapeToString(args.src_shape).c_str()); return ACL_ERROR_GE_SHAPE_INVALID; } - GELOGD("Begin to trans format from NC1HWC0 to NCHW, src shape %s, data type %s, dst shape %s, memory size %ld", + GELOGD("[Trans][Format]Begin to trans format from NC1HWC0 to NCHW, " + "src shape %s, data type %s, dst shape %s, memory size %ld", ShapeToString(args.src_shape).c_str(), TypeUtils::DataTypeToSerialString(args.src_data_type).c_str(), ShapeToString(args.dst_shape).c_str(), total_size);