m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!349 fix cc files naming convention and cmake errors

Browse Source 
From: @nicholas_yhr
Reviewed-by: @youui,@liujunzhu
Signed-off-by: @liujunzhu
pull/349/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
parent 9153665631 3f9627f0de
commit 412ebe82c9
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
src/common/graph/CMakeLists.txt
Unescape View File

@ -42,7 +42,7 @@ file(GLOB SRC_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR}
"detail/*.cc" "detail/*.cc"
"debug/*.cc" "debug/*.cc"
"option/*.cc" "option/*.cc"
"transformer/src/*cc" "transformer/src/*.cc"
) )
# include directories # include directories

24
src/common/graph/transformer/src/axis_util.cpp → src/common/graph/transformer/src/axis_util.cc
Unescape View File

@ -105,8 +105,8 @@ bool AxisUtil::GetAxisValueByNCHW(const vector<int64_t> &originalDimVec, const u
CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true);
/* C0 Must be set for case ND or 2D-NCHW to NZ */ /* C0 Must be set for case ND or 2D-NCHW to NZ */
axisValue[AXIS_C0] = c0; axisValue[AXIS_C0] = c0;
CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED,"[ERROR]Parameter is invalid!"), CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true,
return false); GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false);
axisValue[AXIS_N] = originalDimVec[AXIS_NCHW_DIM_N]; axisValue[AXIS_N] = originalDimVec[AXIS_NCHW_DIM_N];
axisValue[AXIS_C] = originalDimVec[AXIS_NCHW_DIM_C]; axisValue[AXIS_C] = originalDimVec[AXIS_NCHW_DIM_C];
@ -123,8 +123,8 @@ bool AxisUtil::GetAxisValueByNHWC(const vector<int64_t> &originalDimVec, const u
CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true);
/* C0 Must be set for case ND or 2D-NHWC to NZ */ /* C0 Must be set for case ND or 2D-NHWC to NZ */
axisValue[AXIS_C0] = c0; axisValue[AXIS_C0] = c0;
CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true,
return false); GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false);
axisValue[AXIS_N] = originalDimVec[AXIS_NHWC_DIM_N]; axisValue[AXIS_N] = originalDimVec[AXIS_NHWC_DIM_N];
axisValue[AXIS_C] = originalDimVec[AXIS_NHWC_DIM_C]; axisValue[AXIS_C] = originalDimVec[AXIS_NHWC_DIM_C];
@ -139,8 +139,8 @@ bool AxisUtil::GetAxisValueByNC1HWC0(const vector<int64_t> &originalDimVec, cons
vector<int64_t> &axisValue, vector<int64_t> &ndValue) { vector<int64_t> &axisValue, vector<int64_t> &ndValue) {
CHECK(axisValue.empty(), GELOGI("AxisValue is empty!"), return true); CHECK(axisValue.empty(), GELOGI("AxisValue is empty!"), return true);
CHECK(originalDimVec.empty(), GELOGI("Original dim vector 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!"), CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true,
return false); GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false);
auto dimSize = originalDimVec.size(); auto dimSize = originalDimVec.size();
if (dimSize == DIM_DEFAULT_SIZE + 1) { if (dimSize == DIM_DEFAULT_SIZE + 1) {
@ -165,8 +165,8 @@ bool AxisUtil::GetAxisValueByHWCN(const vector<int64_t> &originalDimVec, const u
CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true);
/* C0 Must be set for case ND or 2D-NHWC to NZ */ /* C0 Must be set for case ND or 2D-NHWC to NZ */
axisValue[AXIS_C0] = c0; axisValue[AXIS_C0] = c0;
CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true,
return false); GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false);
axisValue[AXIS_N] = originalDimVec[AXIS_HWCN_DIM_N]; axisValue[AXIS_N] = originalDimVec[AXIS_HWCN_DIM_N];
axisValue[AXIS_C] = originalDimVec[AXIS_HWCN_DIM_C]; axisValue[AXIS_C] = originalDimVec[AXIS_HWCN_DIM_C];
@ -183,8 +183,8 @@ bool AxisUtil::GetAxisValueByC1HWNCoC0(const vector<int64_t> &originalDimVec, co
CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true); CHECK(originalDimVec.empty(), GELOGI("Original dim vector is empty!"), return true);
/* C0 Must be set for case ND or 2D-NHWC to NZ */ /* C0 Must be set for case ND or 2D-NHWC to NZ */
axisValue[AXIS_C0] = c0; axisValue[AXIS_C0] = c0;
CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true, GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), CHECK(CheckParams(originalDimVec, c0, axisValue, ndValue) != true,
return false); GELOGE(GRAPH_FAILED, "[ERROR]Parameter is invalid!"), return false);
axisValue[AXIS_N] = originalDimVec[AXIS_C1HWNCoC0_DIM_N]; axisValue[AXIS_N] = originalDimVec[AXIS_C1HWNCoC0_DIM_N];
axisValue[AXIS_C] = originalDimVec[AXIS_C1HWNCoC0_DIM_C1] * c0; axisValue[AXIS_C] = originalDimVec[AXIS_C1HWNCoC0_DIM_C1] * c0;
@ -194,5 +194,5 @@ bool AxisUtil::GetAxisValueByC1HWNCoC0(const vector<int64_t> &originalDimVec, co
axisValue[AXIS_Co] = originalDimVec[AXIS_C1HWNCoC0_DIM_Co]; axisValue[AXIS_Co] = originalDimVec[AXIS_C1HWNCoC0_DIM_Co];
return true; return true;
} }
} // namespace transformer } // namespace transformer
} // namespace common } // namespace common

40
src/common/graph/transformer/src/transfer_shape_according_to_format.cpp → src/common/graph/transformer/src/transfer_shape_according_to_format.cc
Unescape View File

@ -27,19 +27,19 @@ using namespace std;
ShapeTransferAccordingToFormat::ShapeTransferAccordingToFormat(void) { ShapeTransferAccordingToFormat::ShapeTransferAccordingToFormat(void) {
getNewShapeFuncMap = { getNewShapeFuncMap = {
{ge::FORMAT_NCHW, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNCHWShapeByAxisValue)}, {ge::FORMAT_NCHW, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNCHWShapeByAxisValue)},
{ge::FORMAT_NHWC, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNHWCShapeByAxisValue)}, {ge::FORMAT_NHWC, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNHWCShapeByAxisValue)},
{ge::FORMAT_NC1HWC0, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNC1HWC0ShapeByAxisValue)}, {ge::FORMAT_NC1HWC0, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNC1HWC0ShapeByAxisValue)},
{ge::FORMAT_FRACTAL_Z, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetFzShapeByAxisValue)}, {ge::FORMAT_FRACTAL_Z, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetFzShapeByAxisValue)},
{ge::FORMAT_HWCN, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetHWCNShapeByAxisValue)}, {ge::FORMAT_HWCN, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetHWCNShapeByAxisValue)},
{ge::FORMAT_C1HWNCoC0, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetC1HWNCoC0ShapeByAxisValue)}, {ge::FORMAT_C1HWNCoC0, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetC1HWNCoC0ShapeByAxisValue)},
{ge::FORMAT_FRACTAL_NZ, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNzShapeByAxisValue)}}; {ge::FORMAT_FRACTAL_NZ, std::make_shared<GetNewShapeByAxisValueAndFormat>(GetNzShapeByAxisValue)}};
mapOfDtypeAndC0 = { mapOfDtypeAndC0 = {
{ge::DT_FLOAT16, SHAPE_NUMBER_16}, {ge::DT_FLOAT, SHAPE_NUMBER_16}, {ge::DT_INT8, SHAPE_NUMBER_32}, {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_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_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_UINT64, SHAPE_NUMBER_16}, {ge::DT_BOOL, SHAPE_NUMBER_16}};
} }
bool ShapeTransferAccordingToFormat::GetNCHWShapeByAxisValue(vector<int64_t>& newShape, const int64_t& implType, bool ShapeTransferAccordingToFormat::GetNCHWShapeByAxisValue(vector<int64_t>& newShape, const int64_t& implType,
@ -97,9 +97,9 @@ bool ShapeTransferAccordingToFormat::GetFzShapeByAxisValue(vector<int64_t>& newS
/* sizeOfOriginalVec - 1 mean the last value of original vec /* sizeOfOriginalVec - 1 mean the last value of original vec
* sizeOfOriginalVec - 2 mean the second last value of original vec */ * sizeOfOriginalVec - 2 mean the second last value of original vec */
newShape[sizeOfOriginalVec - MINUS_VALUE_ONE] = 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] = 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(SHAPE_NUMBER_16);
newShape.push_back(axisValue[AXIS_C0]); newShape.push_back(axisValue[AXIS_C0]);
} else { } else {
@ -163,10 +163,10 @@ bool ShapeTransferAccordingToFormat::GetNzShapeByAxisValue(vector<int64_t>& newS
/* sizeOfOriginalVec - 1 mean the last value of original vec /* sizeOfOriginalVec - 1 mean the last value of original vec
* sizeOfOriginalVec - 2 mean the second last value of original vec */ * sizeOfOriginalVec - 2 mean the second last value of original vec */
newShape[sizeOfOriginalVec - MINUS_VALUE_ONE] = 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] = 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(SHAPE_NUMBER_16);
newShape.push_back(axisValue[AXIS_C0]); newShape.push_back(axisValue[AXIS_C0]);
return true; return true;
@ -177,7 +177,7 @@ bool ShapeTransferAccordingToFormat::GetShapeAccordingToFormat(ShapeAndFormat& s
shapeAndFormatInfo.newShape = shapeAndFormatInfo.oldShape; shapeAndFormatInfo.newShape = shapeAndFormatInfo.oldShape;
if (shapeAndFormatInfo.oldFormat >= ge::FORMAT_RESERVED || shapeAndFormatInfo.newFormat >= ge::FORMAT_RESERVED) { 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, GELOGE(GRAPH_FAILED, "Old format %u or new format %u is invalid!", shapeAndFormatInfo.oldFormat,
shapeAndFormatInfo.newFormat); shapeAndFormatInfo.newFormat);
return false; return false;
} }
@ -223,8 +223,8 @@ bool ShapeTransferAccordingToFormat::GetShapeAccordingToFormat(ShapeAndFormat& s
c0 = SHAPE_DIM_VALUE_C04; c0 = SHAPE_DIM_VALUE_C04;
} }
bool status = axisutil_object->GetAxisValueByOriginFormat( bool status = axisutil_object->GetAxisValueByOriginFormat(shapeAndFormatInfo.oldFormat, shapeAndFormatInfo.oldShape,
shapeAndFormatInfo.oldFormat, shapeAndFormatInfo.oldShape, c0, axisValue, ndValue); c0, axisValue, ndValue);
if (status != true && shapeAndFormatInfo.newFormat != ge::FORMAT_FRACTAL_NZ) { if (status != true && shapeAndFormatInfo.newFormat != ge::FORMAT_FRACTAL_NZ) {
delete axisutil_object; delete axisutil_object;
return true; return true;
@ -238,5 +238,5 @@ bool ShapeTransferAccordingToFormat::GetShapeAccordingToFormat(ShapeAndFormat& s
} }
return true; return true;
} }
} // namespace transformer } // namespace transformer
} // namespace common } // namespace common
Write Preview
Loading…
Cancel
Save