From 3f9627f0de6fc224ac9c78f0b4f0bc0765b64464 Mon Sep 17 00:00:00 2001 From: yanghaoran Date: Fri, 20 Nov 2020 15:45:39 +0800 Subject: [PATCH] fix cc files naming convention and cmake errors --- src/common/graph/CMakeLists.txt | 2 +- .../src/{axis_util.cpp => axis_util.cc} | 24 +++++------ ... => transfer_shape_according_to_format.cc} | 40 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) rename src/common/graph/transformer/src/{axis_util.cpp => axis_util.cc} (94%) rename src/common/graph/transformer/src/{transfer_shape_according_to_format.cpp => transfer_shape_according_to_format.cc} (85%) diff --git a/src/common/graph/CMakeLists.txt b/src/common/graph/CMakeLists.txt index 1c8a26b4..5c6149fe 100644 --- a/src/common/graph/CMakeLists.txt +++ b/src/common/graph/CMakeLists.txt @@ -42,7 +42,7 @@ file(GLOB SRC_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} "detail/*.cc" "debug/*.cc" "option/*.cc" - "transformer/src/*cc" + "transformer/src/*.cc" ) # include directories diff --git a/src/common/graph/transformer/src/axis_util.cpp b/src/common/graph/transformer/src/axis_util.cc similarity index 94% rename from src/common/graph/transformer/src/axis_util.cpp rename to src/common/graph/transformer/src/axis_util.cc index 164a6b99..6f9a4d42 100644 --- a/src/common/graph/transformer/src/axis_util.cpp +++ b/src/common/graph/transformer/src/axis_util.cc @@ -105,8 +105,8 @@ bool AxisUtil::GetAxisValueByNCHW(const vector &originalDimVec, const u CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); /* C0 Must be set for case ND or 2D-NCHW to NZ */ axisValue[AXIS_C0] = c0; - CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED,"[ERROR]Parameter is invalid!"), - return false); + CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, + GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false); axisValue[AXIS_N] = originalDimVec[AXIS_NCHW_DIM_N]; axisValue[AXIS_C] = originalDimVec[AXIS_NCHW_DIM_C]; @@ -123,8 +123,8 @@ bool AxisUtil::GetAxisValueByNHWC(const vector &originalDimVec, const u CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); /* C0 Must be set for case ND or 2D-NHWC to NZ */ axisValue[AXIS_C0] = c0; - CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), - return false); + CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, + GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false); axisValue[AXIS_N] = originalDimVec[AXIS_NHWC_DIM_N]; axisValue[AXIS_C] = originalDimVec[AXIS_NHWC_DIM_C]; @@ -139,8 +139,8 @@ bool AxisUtil::GetAxisValueByNC1HWC0(const vector &originalDimVec, cons vector &axisValue, vector &ndValue) { CHECK(axisValue.empty(), GELOGI("AxisValue is empty!"), return true); CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); - CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED,"[ERROR]Parameter is invalid!"), - return false); + CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, + GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false); auto dimSize = originalDimVec.size(); if (dimSize == DIM_DEFAULT_SIZE + 1) { @@ -165,8 +165,8 @@ bool AxisUtil::GetAxisValueByHWCN(const vector &originalDimVec, const u CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); /* C0 Must be set for case ND or 2D-NHWC to NZ */ axisValue[AXIS_C0] = c0; - CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), - return false); + CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, + GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false); axisValue[AXIS_N] = originalDimVec[AXIS_HWCN_DIM_N]; axisValue[AXIS_C] = originalDimVec[AXIS_HWCN_DIM_C]; @@ -183,8 +183,8 @@ bool AxisUtil::GetAxisValueByC1HWNCoC0(const vector &originalDimVec, co CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); /* C0 Must be set for case ND or 2D-NHWC to NZ */ axisValue[AXIS_C0] = c0; - CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), - return false); + CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, + GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false); axisValue[AXIS_N] = originalDimVec[AXIS_C1HWNCoC0_DIM_N]; axisValue[AXIS_C] = originalDimVec[AXIS_C1HWNCoC0_DIM_C1] * c0; @@ -194,5 +194,5 @@ bool AxisUtil::GetAxisValueByC1HWNCoC0(const vector &originalDimVec, co axisValue[AXIS_Co] = originalDimVec[AXIS_C1HWNCoC0_DIM_Co]; return true; } -} // namespace transformer -} // namespace common +} // namespace transformer +} // namespace common diff --git a/src/common/graph/transformer/src/transfer_shape_according_to_format.cpp b/src/common/graph/transformer/src/transfer_shape_according_to_format.cc similarity index 85% rename from src/common/graph/transformer/src/transfer_shape_according_to_format.cpp rename to src/common/graph/transformer/src/transfer_shape_according_to_format.cc index eb57ad00..470d4848 100644 --- a/src/common/graph/transformer/src/transfer_shape_according_to_format.cpp +++ b/src/common/graph/transformer/src/transfer_shape_according_to_format.cc @@ -27,19 +27,19 @@ using namespace std; ShapeTransferAccordingToFormat::ShapeTransferAccordingToFormat(void) { getNewShapeFuncMap = { - {ge::FORMAT_NCHW, std::make_shared(GetNCHWShapeByAxisValue)}, - {ge::FORMAT_NHWC, std::make_shared(GetNHWCShapeByAxisValue)}, - {ge::FORMAT_NC1HWC0, std::make_shared(GetNC1HWC0ShapeByAxisValue)}, - {ge::FORMAT_FRACTAL_Z, std::make_shared(GetFzShapeByAxisValue)}, - {ge::FORMAT_HWCN, std::make_shared(GetHWCNShapeByAxisValue)}, - {ge::FORMAT_C1HWNCoC0, std::make_shared(GetC1HWNCoC0ShapeByAxisValue)}, - {ge::FORMAT_FRACTAL_NZ, std::make_shared(GetNzShapeByAxisValue)}}; + {ge::FORMAT_NCHW, std::make_shared(GetNCHWShapeByAxisValue)}, + {ge::FORMAT_NHWC, std::make_shared(GetNHWCShapeByAxisValue)}, + {ge::FORMAT_NC1HWC0, std::make_shared(GetNC1HWC0ShapeByAxisValue)}, + {ge::FORMAT_FRACTAL_Z, std::make_shared(GetFzShapeByAxisValue)}, + {ge::FORMAT_HWCN, std::make_shared(GetHWCNShapeByAxisValue)}, + {ge::FORMAT_C1HWNCoC0, std::make_shared(GetC1HWNCoC0ShapeByAxisValue)}, + {ge::FORMAT_FRACTAL_NZ, std::make_shared(GetNzShapeByAxisValue)}}; mapOfDtypeAndC0 = { - {ge::DT_FLOAT16, SHAPE_NUMBER_16}, {ge::DT_FLOAT, SHAPE_NUMBER_16}, {ge::DT_INT8, SHAPE_NUMBER_32}, - {ge::DT_INT16, SHAPE_NUMBER_16}, {ge::DT_INT32, SHAPE_NUMBER_16}, {ge::DT_INT64, SHAPE_NUMBER_16}, - {ge::DT_UINT8, SHAPE_NUMBER_16}, {ge::DT_UINT16, SHAPE_NUMBER_32}, {ge::DT_UINT32, SHAPE_NUMBER_16}, - {ge::DT_UINT64, SHAPE_NUMBER_16}, {ge::DT_BOOL, SHAPE_NUMBER_16}}; + {ge::DT_FLOAT16, SHAPE_NUMBER_16}, {ge::DT_FLOAT, SHAPE_NUMBER_16}, {ge::DT_INT8, SHAPE_NUMBER_32}, + {ge::DT_INT16, SHAPE_NUMBER_16}, {ge::DT_INT32, SHAPE_NUMBER_16}, {ge::DT_INT64, SHAPE_NUMBER_16}, + {ge::DT_UINT8, SHAPE_NUMBER_16}, {ge::DT_UINT16, SHAPE_NUMBER_32}, {ge::DT_UINT32, SHAPE_NUMBER_16}, + {ge::DT_UINT64, SHAPE_NUMBER_16}, {ge::DT_BOOL, SHAPE_NUMBER_16}}; } bool ShapeTransferAccordingToFormat::GetNCHWShapeByAxisValue(vector& newShape, const int64_t& implType, @@ -97,9 +97,9 @@ bool ShapeTransferAccordingToFormat::GetFzShapeByAxisValue(vector& newS /* sizeOfOriginalVec - 1 mean the last value of original vec * sizeOfOriginalVec - 2 mean the second last value of original vec */ newShape[sizeOfOriginalVec - MINUS_VALUE_ONE] = - DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_ONE], SHAPE_NUMBER_16); + DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_ONE], SHAPE_NUMBER_16); newShape[sizeOfOriginalVec - MINUS_VALUE_TWO] = - DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_TWO], axisValue[AXIS_C0]); + DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_TWO], axisValue[AXIS_C0]); newShape.push_back(SHAPE_NUMBER_16); newShape.push_back(axisValue[AXIS_C0]); } else { @@ -163,10 +163,10 @@ bool ShapeTransferAccordingToFormat::GetNzShapeByAxisValue(vector& newS /* sizeOfOriginalVec - 1 mean the last value of original vec * sizeOfOriginalVec - 2 mean the second last value of original vec */ newShape[sizeOfOriginalVec - MINUS_VALUE_ONE] = - DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_TWO], (int64_t)SHAPE_NUMBER_16); + DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_TWO], (int64_t)SHAPE_NUMBER_16); newShape[sizeOfOriginalVec - MINUS_VALUE_TWO] = - DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_ONE], axisValue[AXIS_C0]); + DivisionCeiling(ndValue[sizeOfOriginalVec - MINUS_VALUE_ONE], axisValue[AXIS_C0]); newShape.push_back(SHAPE_NUMBER_16); newShape.push_back(axisValue[AXIS_C0]); return true; @@ -177,7 +177,7 @@ bool ShapeTransferAccordingToFormat::GetShapeAccordingToFormat(ShapeAndFormat& s shapeAndFormatInfo.newShape = shapeAndFormatInfo.oldShape; if (shapeAndFormatInfo.oldFormat >= ge::FORMAT_RESERVED || shapeAndFormatInfo.newFormat >= ge::FORMAT_RESERVED) { GELOGE(GRAPH_FAILED, "Old format %u or new format %u is invalid!", shapeAndFormatInfo.oldFormat, - shapeAndFormatInfo.newFormat); + shapeAndFormatInfo.newFormat); return false; } @@ -223,8 +223,8 @@ bool ShapeTransferAccordingToFormat::GetShapeAccordingToFormat(ShapeAndFormat& s c0 = SHAPE_DIM_VALUE_C04; } - bool status = axisutil_object->GetAxisValueByOriginFormat( - shapeAndFormatInfo.oldFormat, shapeAndFormatInfo.oldShape, c0, axisValue, ndValue); + bool status = axisutil_object->GetAxisValueByOriginFormat(shapeAndFormatInfo.oldFormat, shapeAndFormatInfo.oldShape, + c0, axisValue, ndValue); if (status != true && shapeAndFormatInfo.newFormat != ge::FORMAT_FRACTAL_NZ) { delete axisutil_object; return true; @@ -238,5 +238,5 @@ bool ShapeTransferAccordingToFormat::GetShapeAccordingToFormat(ShapeAndFormat& s } return true; } -} // namespace transformer -} // namespace common +} // namespace transformer +} // namespace common