已合并
针对nn仓部分算子存在错误日志问题进行统一整改 #9248
gaomingyuan创建于 7 天前
针对nn仓部分算子存在错误日志问题进行统一整改 #9248
已合并
共 7 个文件变更+21-34
| @@ -89,7 +89,6 @@ ge::graphStatus EluTiling::CalcOutputDtype() | |||
| 89 | 89 | ||
| 90 | ge::graphStatus EluTiling::CheckShape() | 90 | ge::graphStatus EluTiling::CheckShape() |
| 91 | { | 91 | { |
| 92 | - OP_LOGD(tilingContext->GetNodeName(), "EluTiling CheckShape enter."); | ||
| 93 | auto inputStorageShape = tilingContext->GetInputShape(0); | 92 | auto inputStorageShape = tilingContext->GetInputShape(0); |
| 94 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, inputStorageShape); | 93 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, inputStorageShape); |
| 95 | const gert::Shape& inputShape = EnsureNotScalar(inputStorageShape->GetStorageShape()); | 94 | const gert::Shape& inputShape = EnsureNotScalar(inputStorageShape->GetStorageShape()); |
| @@ -132,7 +131,10 @@ ge::graphStatus EluTiling::RunTiling() | |||
| 132 | return ge::GRAPH_FAILED; | 131 | return ge::GRAPH_FAILED; |
| 133 | } | 132 | } |
| 134 | 133 | ||
| 135 | - OP_CHECK_IF(res != ge::GRAPH_SUCCESS, OP_LOGE(tilingContext, "DoTiling failed"), return ge::GRAPH_FAILED); | 134 | + OP_CHECK_IF(res != ge::GRAPH_SUCCESS, |
| 135 | + OP_LOGE(tilingContext->GetNodeName(), "DoTiling failed, output dtype: %s.", | ||
| 136 | + ge::TypeUtils::DataTypeToSerialString(this->outputDtype).c_str()), | ||
| 137 | + return ge::GRAPH_FAILED); | ||
| 136 | 138 | ||
| 137 | auto runtimeAttrs = tilingContext->GetAttrs(); | 139 | auto runtimeAttrs = tilingContext->GetAttrs(); |
| 138 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, runtimeAttrs); | 140 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, runtimeAttrs); |
| @@ -163,10 +165,9 @@ static ge::graphStatus TilingForElu(gert::TilingContext* context) | |||
| 163 | 165 | ||
| 164 | auto compileInfo = context->GetCompileInfo<EluCompileInfo>(); | 166 | auto compileInfo = context->GetCompileInfo<EluCompileInfo>(); |
| 165 | OP_CHECK_NULL_WITH_CONTEXT(context, compileInfo); | 167 | OP_CHECK_NULL_WITH_CONTEXT(context, compileInfo); |
| 166 | - OP_LOGD("EluTiling", "Enter new EluTiling"); | ||
| 167 | EluTiling eluTiling(context); | 168 | EluTiling eluTiling(context); |
| 168 | return eluTiling.RunTiling(); | 169 | return eluTiling.RunTiling(); |
| 169 | } | 170 | } |
| 170 | 171 | ||
| 171 | IMPL_OP_OPTILING(Elu).Tiling(TilingForElu).TilingParse<EluCompileInfo>(TilingPrepareForElu); | 172 | IMPL_OP_OPTILING(Elu).Tiling(TilingForElu).TilingParse<EluCompileInfo>(TilingPrepareForElu); |
| 172 | -} // namespace optiling | 173 | +} // namespace optiling |
| @@ -38,7 +38,6 @@ inline const gert::Shape& EnsureNotScalar(const gert::Shape& in_shape) | |||
| 38 | 38 | ||
| 39 | ge::graphStatus EluGradTiling::CalcInputDtype() | 39 | ge::graphStatus EluGradTiling::CalcInputDtype() |
| 40 | { | 40 | { |
| 41 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradTiling CalcInputDtype enter."); | ||
| 42 | auto gradsDesc = tilingContext->GetInputDesc(0); | 41 | auto gradsDesc = tilingContext->GetInputDesc(0); |
| 43 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsDesc); | 42 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsDesc); |
| 44 | auto activationsDesc = tilingContext->GetInputDesc(1); | 43 | auto activationsDesc = tilingContext->GetInputDesc(1); |
| @@ -63,7 +62,6 @@ ge::graphStatus EluGradTiling::CalcInputDtype() | |||
| 63 | 62 | ||
| 64 | ge::graphStatus EluGradTiling::CalcOutputDtype() | 63 | ge::graphStatus EluGradTiling::CalcOutputDtype() |
| 65 | { | 64 | { |
| 66 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradTiling CalcOutputDtype enter."); | ||
| 67 | auto outputDesc = tilingContext->GetOutputDesc(0); | 65 | auto outputDesc = tilingContext->GetOutputDesc(0); |
| 68 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, outputDesc); | 66 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, outputDesc); |
| 69 | this->outputDtype = outputDesc->GetDataType(); | 67 | this->outputDtype = outputDesc->GetDataType(); |
| @@ -85,7 +83,6 @@ ge::graphStatus EluGradTiling::CalcOutputDtype() | |||
| 85 | 83 | ||
| 86 | ge::graphStatus EluGradTiling::CheckShape() | 84 | ge::graphStatus EluGradTiling::CheckShape() |
| 87 | { | 85 | { |
| 88 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradTiling CheckShape enter."); | ||
| 89 | auto gradsStorageShape = tilingContext->GetInputShape(0); | 86 | auto gradsStorageShape = tilingContext->GetInputShape(0); |
| 90 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsStorageShape); | 87 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsStorageShape); |
| 91 | const gert::Shape& gradsShape = EnsureNotScalar(gradsStorageShape->GetStorageShape()); | 88 | const gert::Shape& gradsShape = EnsureNotScalar(gradsStorageShape->GetStorageShape()); |
| @@ -110,7 +107,6 @@ ge::graphStatus EluGradTiling::CheckShape() | |||
| 110 | 107 | ||
| 111 | ge::graphStatus EluGradTiling::RunTiling() | 108 | ge::graphStatus EluGradTiling::RunTiling() |
| 112 | { | 109 | { |
| 113 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradTiling RunTiling enter."); | ||
| 114 | ElewiseBaseTiling elewiseBaseTiling(tilingContext); | 110 | ElewiseBaseTiling elewiseBaseTiling(tilingContext); |
| 115 | // 获取tiling计算所需的参数 | 111 | // 获取tiling计算所需的参数 |
| 116 | ge::graphStatus status = ge::GRAPH_FAILED; | 112 | ge::graphStatus status = ge::GRAPH_FAILED; |
| @@ -140,7 +136,9 @@ ge::graphStatus EluGradTiling::RunTiling() | |||
| 140 | "The dtype of y must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); | 136 | "The dtype of y must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); |
| 141 | return ge::GRAPH_FAILED; | 137 | return ge::GRAPH_FAILED; |
| 142 | } | 138 | } |
| 143 | - OP_CHECK_IF(status == ge::GRAPH_FAILED, OP_LOGE(tilingContext, "ElewiseBaseTiling failed"), | 139 | + OP_CHECK_IF(status == ge::GRAPH_FAILED, |
| 140 | + OP_LOGE(tilingContext->GetNodeName(), "ElewiseBaseTiling failed, output dtype: %s.", | ||
| 141 | + ge::TypeUtils::DataTypeToSerialString(this->outputDtype).c_str()), | ||
| 144 | return ge::GRAPH_FAILED); | 142 | return ge::GRAPH_FAILED); |
| 145 | 143 | ||
| 146 | const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType); | 144 | const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType); |
| @@ -160,7 +158,6 @@ static ge::graphStatus Tiling4EluGrad(gert::TilingContext* tilingContextSelf) | |||
| 160 | OP_LOGD(tilingContextSelf->GetNodeName(), "Tiling4EluGrad rt2.0 is running."); | 158 | OP_LOGD(tilingContextSelf->GetNodeName(), "Tiling4EluGrad rt2.0 is running."); |
| 161 | auto compileInfo = tilingContextSelf->GetCompileInfo<EluGradCompileInfo>(); | 159 | auto compileInfo = tilingContextSelf->GetCompileInfo<EluGradCompileInfo>(); |
| 162 | OP_CHECK_NULL_WITH_CONTEXT(tilingContextSelf, compileInfo); | 160 | OP_CHECK_NULL_WITH_CONTEXT(tilingContextSelf, compileInfo); |
| 163 | - OP_LOGD("EluGradTiling", "Enter new EluTiling"); | ||
| 164 | EluGradTiling eluGradTiling(tilingContextSelf); | 161 | EluGradTiling eluGradTiling(tilingContextSelf); |
| 165 | return eluGradTiling.RunTiling(); | 162 | return eluGradTiling.RunTiling(); |
| 166 | } | 163 | } |
| @@ -53,7 +53,6 @@ inline const gert::Shape& EnsureNotScalar(const gert::Shape& in_shape) | |||
| 53 | 53 | ||
| 54 | ge::graphStatus EluGradV2Tiling::CalcInputDtype() | 54 | ge::graphStatus EluGradV2Tiling::CalcInputDtype() |
| 55 | { | 55 | { |
| 56 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradV2Tiling CalcInputDtype enter."); | ||
| 57 | auto gradsDesc = tilingContext->GetInputDesc(0); | 56 | auto gradsDesc = tilingContext->GetInputDesc(0); |
| 58 | auto activationsDesc = tilingContext->GetInputDesc(1); | 57 | auto activationsDesc = tilingContext->GetInputDesc(1); |
| 59 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsDesc); | 58 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsDesc); |
| @@ -78,7 +77,6 @@ ge::graphStatus EluGradV2Tiling::CalcInputDtype() | |||
| 78 | 77 | ||
| 79 | ge::graphStatus EluGradV2Tiling::CalcOutputDtype() | 78 | ge::graphStatus EluGradV2Tiling::CalcOutputDtype() |
| 80 | { | 79 | { |
| 81 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradV2Tiling CalcOutputDtype enter."); | ||
| 82 | auto outputDesc = tilingContext->GetOutputDesc(0); | 80 | auto outputDesc = tilingContext->GetOutputDesc(0); |
| 83 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, outputDesc); | 81 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, outputDesc); |
| 84 | this->outputDtype = outputDesc->GetDataType(); | 82 | this->outputDtype = outputDesc->GetDataType(); |
| @@ -100,7 +98,6 @@ ge::graphStatus EluGradV2Tiling::CalcOutputDtype() | |||
| 100 | 98 | ||
| 101 | ge::graphStatus EluGradV2Tiling::CheckShape() | 99 | ge::graphStatus EluGradV2Tiling::CheckShape() |
| 102 | { | 100 | { |
| 103 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradV2Tiling CheckShape enter."); | ||
| 104 | auto gradsStorageShapeV2 = tilingContext->GetInputShape(0); | 101 | auto gradsStorageShapeV2 = tilingContext->GetInputShape(0); |
| 105 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsStorageShapeV2); | 102 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, gradsStorageShapeV2); |
| 106 | const gert::Shape& gradsShape = EnsureNotScalar(gradsStorageShapeV2->GetStorageShape()); | 103 | const gert::Shape& gradsShape = EnsureNotScalar(gradsStorageShapeV2->GetStorageShape()); |
| @@ -125,7 +122,6 @@ ge::graphStatus EluGradV2Tiling::CheckShape() | |||
| 125 | 122 | ||
| 126 | ge::graphStatus EluGradV2Tiling::SetTilingData(bool is_result) | 123 | ge::graphStatus EluGradV2Tiling::SetTilingData(bool is_result) |
| 127 | { | 124 | { |
| 128 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradV2Tiling SetTilingData enter."); | ||
| 129 | if (this->outputDtype == ge::DT_FLOAT16 && is_result) { | 125 | if (this->outputDtype == ge::DT_FLOAT16 && is_result) { |
| 130 | dType = static_cast<uint64_t>(EluGradV2_TPL_FP16); | 126 | dType = static_cast<uint64_t>(EluGradV2_TPL_FP16); |
| 131 | } else if (this->outputDtype == ge::DT_BF16 && is_result) { | 127 | } else if (this->outputDtype == ge::DT_BF16 && is_result) { |
| @@ -149,7 +145,6 @@ ge::graphStatus EluGradV2Tiling::SetTilingData(bool is_result) | |||
| 149 | 145 | ||
| 150 | ge::graphStatus EluGradV2Tiling::SetAttr() | 146 | ge::graphStatus EluGradV2Tiling::SetAttr() |
| 151 | { | 147 | { |
| 152 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradV2Tiling SetAttr enter."); | ||
| 153 | auto attrs = tilingContext->GetAttrs(); | 148 | auto attrs = tilingContext->GetAttrs(); |
| 154 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, attrs); | 149 | OP_CHECK_NULL_WITH_CONTEXT(tilingContext, attrs); |
| 155 | const float* alphaValueAttr = attrs->GetAttrPointer<float>(ALPHA_ATTR_IDX); | 150 | const float* alphaValueAttr = attrs->GetAttrPointer<float>(ALPHA_ATTR_IDX); |
| @@ -177,7 +172,6 @@ ge::graphStatus EluGradV2Tiling::SetAttr() | |||
| 177 | 172 | ||
| 178 | ge::graphStatus EluGradV2Tiling::RunTiling() | 173 | ge::graphStatus EluGradV2Tiling::RunTiling() |
| 179 | { | 174 | { |
| 180 | - OP_LOGD(tilingContext->GetNodeName(), "EluGradV2Tiling RunTiling enter."); | ||
| 181 | ElewiseBaseTiling elewiseBaseTiling(tilingContext); | 175 | ElewiseBaseTiling elewiseBaseTiling(tilingContext); |
| 182 | ge::graphStatus status = ge::GRAPH_FAILED; | 176 | ge::graphStatus status = ge::GRAPH_FAILED; |
| 183 | tiling = tilingContext->GetTilingData<EluGradV2TilingData>(); | 177 | tiling = tilingContext->GetTilingData<EluGradV2TilingData>(); |
| @@ -211,7 +205,9 @@ ge::graphStatus EluGradV2Tiling::RunTiling() | |||
| 211 | "The dtype of y must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); | 205 | "The dtype of y must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); |
| 212 | return ge::GRAPH_FAILED; | 206 | return ge::GRAPH_FAILED; |
| 213 | } | 207 | } |
| 214 | - OP_CHECK_IF(status == ge::GRAPH_FAILED, OP_LOGE(tilingContext, "elewiseBaseTiling failed"), | 208 | + OP_CHECK_IF(status == ge::GRAPH_FAILED, |
| 209 | + OP_LOGE(tilingContext->GetNodeName(), "elewiseBaseTiling failed, output dtype: %s.", | ||
| 210 | + ge::TypeUtils::DataTypeToSerialString(this->outputDtype).c_str()), | ||
| 215 | return ge::GRAPH_FAILED); | 211 | return ge::GRAPH_FAILED); |
| 216 | schMode = tiling->baseTiling.scheMode; | 212 | schMode = tiling->baseTiling.scheMode; |
| 217 | const uint64_t tilingKey = GET_TPL_TILING_KEY(schMode, dType); | 213 | const uint64_t tilingKey = GET_TPL_TILING_KEY(schMode, dType); |
| @@ -232,7 +228,6 @@ static ge::graphStatus Tiling4EluGradV2(gert::TilingContext* tilingContextSelf) | |||
| 232 | OP_LOGD(tilingContextSelf->GetNodeName(), "Tiling4EluGradV2 rt2.0 is running."); | 228 | OP_LOGD(tilingContextSelf->GetNodeName(), "Tiling4EluGradV2 rt2.0 is running."); |
| 233 | auto compileInfo = tilingContextSelf->GetCompileInfo<EluGradV2CompileInfo>(); | 229 | auto compileInfo = tilingContextSelf->GetCompileInfo<EluGradV2CompileInfo>(); |
| 234 | OP_CHECK_NULL_WITH_CONTEXT(tilingContextSelf, compileInfo); | 230 | OP_CHECK_NULL_WITH_CONTEXT(tilingContextSelf, compileInfo); |
| 235 | - OP_LOGD("EluGradV2Tiling", "Enter new EluGradV2Tiling"); | ||
| 236 | EluGradV2Tiling eluGradV2Tiling(tilingContextSelf); | 231 | EluGradV2Tiling eluGradV2Tiling(tilingContextSelf); |
| 237 | return eluGradV2Tiling.RunTiling(); | 232 | return eluGradV2Tiling.RunTiling(); |
| 238 | } | 233 | } |
| @@ -125,7 +125,9 @@ ge::graphStatus FastGeluTiling::RunTiling() | |||
| 125 | "The dtype of y must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); | 125 | "The dtype of y must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); |
| 126 | return ge::GRAPH_FAILED; | 126 | return ge::GRAPH_FAILED; |
| 127 | } | 127 | } |
| 128 | - OP_CHECK_IF(status == ge::GRAPH_FAILED, OP_LOGE(tilingContext, "elewiseBaseTiling failed"), | 128 | + OP_CHECK_IF(status == ge::GRAPH_FAILED, |
| 129 | + OP_LOGE(tilingContext->GetNodeName(), "elewiseBaseTiling failed, output dtype: %s.", | ||
| 130 | + ge::TypeUtils::DataTypeToSerialString(static_cast<ge::DataType>(this->outputDtype)).c_str()), | ||
| 129 | return ge::GRAPH_FAILED); | 131 | return ge::GRAPH_FAILED); |
| 130 | const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType); | 132 | const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType); |
| 131 | OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%ld.", tilingKey); | 133 | OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%ld.", tilingKey); |
| @@ -155,4 +157,4 @@ ge::graphStatus TilingPrepareForFastGelu([[maybe_unused]] gert::TilingParseConte | |||
| 155 | } | 157 | } |
| 156 | 158 | ||
| 157 | IMPL_OP_OPTILING(FastGelu).Tiling(TilingFuncFastGelu).TilingParse<ElewiseCompileInfo>(TilingPrepareForFastGelu); | 159 | IMPL_OP_OPTILING(FastGelu).Tiling(TilingFuncFastGelu).TilingParse<ElewiseCompileInfo>(TilingPrepareForFastGelu); |
| 158 | -} // namespace optiling | 160 | +} // namespace optiling |
| @@ -158,7 +158,9 @@ ge::graphStatus FastGeluGradTiling::RunTiling() | |||
| 158 | "The dtype of z must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); | 158 | "The dtype of z must be DT_FLOAT16, DT_BF16, or DT_FLOAT"); |
| 159 | return ge::GRAPH_FAILED; | 159 | return ge::GRAPH_FAILED; |
| 160 | } | 160 | } |
| 161 | - OP_CHECK_IF(status == ge::GRAPH_FAILED, OP_CHECK_NULL_WITH_CONTEXT(tilingContext, "elewiseBaseTiling failed"), | 161 | + OP_CHECK_IF(status == ge::GRAPH_FAILED, |
| 162 | + OP_LOGE(tilingContext->GetNodeName(), "elewiseBaseTiling failed, output dtype: %s.", | ||
| 163 | + ge::TypeUtils::DataTypeToSerialString(static_cast<ge::DataType>(this->outputDtype)).c_str()), | ||
| 162 | return ge::GRAPH_FAILED); | 164 | return ge::GRAPH_FAILED); |
| 163 | const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType); | 165 | const uint64_t tilingKey = GET_TPL_TILING_KEY(tiling->scheMode, dType); |
| 164 | OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%ld.", tilingKey); | 166 | OP_LOGD(tilingContext->GetNodeName(), "[TilingData] : tilingKey=%ld.", tilingKey); |
| @@ -190,4 +192,4 @@ ge::graphStatus TilingPrepareForFastGeluGrad([[maybe_unused]] gert::TilingParseC | |||
| 190 | IMPL_OP_OPTILING(FastGeluGrad) | 192 | IMPL_OP_OPTILING(FastGeluGrad) |
| 191 | .Tiling(TilingFuncFastGeluGrad) | 193 | .Tiling(TilingFuncFastGeluGrad) |
| 192 | .TilingParse<ElewiseCompileInfo>(TilingPrepareForFastGeluGrad); | 194 | .TilingParse<ElewiseCompileInfo>(TilingPrepareForFastGeluGrad); |
| 193 | -} // namespace optiling | 195 | +} // namespace optiling |
| @@ -76,7 +76,7 @@ static const std::map<ge::DataType, int32_t> DTYPE_BUF_CNT_MAP_ERF_950 = { | |||
| 76 | 76 | ||
| 77 | class GeGluGradV2Tiling { | 77 | class GeGluGradV2Tiling { |
| 78 | public: | 78 | public: |
| 79 | - explicit GeGluGradV2Tiling(gert::TilingContext* context) : tilingContext(context){}; | 79 | + explicit GeGluGradV2Tiling(gert::TilingContext* context) : tilingContext(context) {}; |
| 80 | ge::graphStatus RunTiling4GeGluGradV2(); | 80 | ge::graphStatus RunTiling4GeGluGradV2(); |
| 81 | 81 | ||
| 82 | private: | 82 | private: |
| @@ -371,12 +371,10 @@ void GeGluGradV2Tiling::ProcessTilingCore() | |||
| 371 | 371 | ||
| 372 | ge::graphStatus Tiling4GeGluGradV2(gert::TilingContext* context) | 372 | ge::graphStatus Tiling4GeGluGradV2(gert::TilingContext* context) |
| 373 | { | 373 | { |
| 374 | - OP_LOGD(NODE_NAME, "Tiling4GeGluGradV2 tiling begin."); | ||
| 375 | context->SetScheduleMode(BATCH_MODE); | 374 | context->SetScheduleMode(BATCH_MODE); |
| 376 | GeGluGradV2Tiling tilingObject(context); | 375 | GeGluGradV2Tiling tilingObject(context); |
| 377 | OP_CHECK_IF(tilingObject.RunTiling4GeGluGradV2() != ge::GRAPH_SUCCESS, | 376 | OP_CHECK_IF(tilingObject.RunTiling4GeGluGradV2() != ge::GRAPH_SUCCESS, |
| 378 | - OP_LOGE(NODE_NAME, "RunTiling4GeGluGradV2 failed."), return ge::GRAPH_FAILED); | 377 | + OP_LOGE(context->GetNodeName(), "RunTiling4GeGluGradV2 failed."), return ge::GRAPH_FAILED); |
| 379 | - OP_LOGD(NODE_NAME, "Tiling4GeGluGradV2 tiling end."); | ||
| 380 | return ge::GRAPH_SUCCESS; | 378 | return ge::GRAPH_SUCCESS; |
| 381 | } | 379 | } |
| 382 | 380 | ||
| @@ -284,19 +284,15 @@ static ge::graphStatus CheckInputParams(gert::TilingContext* context) | |||
| 284 | 284 | ||
| 285 | static ge::graphStatus TilingPrepare4GeGluV2(gert::TilingParseContext* context) | 285 | static ge::graphStatus TilingPrepare4GeGluV2(gert::TilingParseContext* context) |
| 286 | { | 286 | { |
| 287 | - OP_LOGD(context, "TilingPrepare4GeGluV2 enter."); | ||
| 288 | - | ||
| 289 | auto compileInfo = context->GetCompiledInfo<GeGluV2CompileInfo>(); | 287 | auto compileInfo = context->GetCompiledInfo<GeGluV2CompileInfo>(); |
| 290 | OP_CHECK_NULL_WITH_CONTEXT(context, compileInfo); | 288 | OP_CHECK_NULL_WITH_CONTEXT(context, compileInfo); |
| 291 | auto platformInfo = context->GetPlatformInfo(); | 289 | auto platformInfo = context->GetPlatformInfo(); |
| 292 | OP_CHECK_NULL_WITH_CONTEXT(context, platformInfo); | 290 | OP_CHECK_NULL_WITH_CONTEXT(context, platformInfo); |
| 293 | auto ascendcPlatform = platform_ascendc::PlatformAscendC(platformInfo); | 291 | auto ascendcPlatform = platform_ascendc::PlatformAscendC(platformInfo); |
| 294 | compileInfo->totalCoreNum = ascendcPlatform.GetCoreNumAiv(); | 292 | compileInfo->totalCoreNum = ascendcPlatform.GetCoreNumAiv(); |
| 295 | - OP_LOGD(context, "Tiling totalCoreNum: %d", compileInfo->totalCoreNum); | ||
| 296 | if (ascendcPlatform.GetCurNpuArch() == NpuArch::DAV_2002) { | 293 | if (ascendcPlatform.GetCurNpuArch() == NpuArch::DAV_2002) { |
| 297 | compileInfo->totalCoreNum = compileInfo->totalCoreNum + ascendcPlatform.GetCoreNumVector(); | 294 | compileInfo->totalCoreNum = compileInfo->totalCoreNum + ascendcPlatform.GetCoreNumVector(); |
| 298 | } | 295 | } |
| 299 | - OP_LOGD(context, "Tiling totalCoreNum: %d", compileInfo->totalCoreNum); | ||
| 300 | 296 | ||
| 301 | OP_CHECK_IF((compileInfo->totalCoreNum <= 0), OP_LOGE(context, "TilingPrepare4GeGluV2 fail to get core num."), | 297 | OP_CHECK_IF((compileInfo->totalCoreNum <= 0), OP_LOGE(context, "TilingPrepare4GeGluV2 fail to get core num."), |
| 302 | return ge::GRAPH_FAILED); | 298 | return ge::GRAPH_FAILED); |
| @@ -309,8 +305,6 @@ static ge::graphStatus TilingPrepare4GeGluV2(gert::TilingParseContext* context) | |||
| 309 | 305 | ||
| 310 | compileInfo->isAscend310P = ascendcPlatform.GetCurNpuArch() == NpuArch::DAV_2002; | 306 | compileInfo->isAscend310P = ascendcPlatform.GetCurNpuArch() == NpuArch::DAV_2002; |
| 311 | compileInfo->isRegbase = IsRegbaseSocVersion(context); | 307 | compileInfo->isRegbase = IsRegbaseSocVersion(context); |
| 312 | - OP_LOGD(context, "TilingPrepare4GeGluV2 exit. coreNum: %d ubSize: %lu", compileInfo->totalCoreNum, | ||
| 313 | - compileInfo->ubSizePlatForm); | ||
| 314 | return ge::GRAPH_SUCCESS; | 308 | return ge::GRAPH_SUCCESS; |
| 315 | } | 309 | } |
| 316 | 310 | ||
| @@ -432,7 +426,6 @@ static void GetTillingData(ge::DataType dtype, TilingParam& tilingParam, GeGluV2 | |||
| 432 | 426 | ||
| 433 | static ge::graphStatus Tiling4GeGluV2(gert::TilingContext* context) | 427 | static ge::graphStatus Tiling4GeGluV2(gert::TilingContext* context) |
| 434 | { | 428 | { |
| 435 | - OP_LOGD(context, "Tiling4GeGluV2 enter."); | ||
| 436 | context->SetScheduleMode(BATCH_MODE); | 429 | context->SetScheduleMode(BATCH_MODE); |
| 437 | OP_CHECK_IF(CheckInputParams(context) != ge::GRAPH_SUCCESS, OP_LOGE(context, "InputParams not valid."), | 430 | OP_CHECK_IF(CheckInputParams(context) != ge::GRAPH_SUCCESS, OP_LOGE(context, "InputParams not valid."), |
| 438 | return ge::GRAPH_FAILED); | 431 | return ge::GRAPH_FAILED); |
| @@ -468,7 +461,6 @@ static ge::graphStatus Tiling4GeGluV2(gert::TilingContext* context) | |||
| 468 | tilingData.get_blockSize(), tilingData.get_activateLeft(), tilingData.get_ny(), | 461 | tilingData.get_blockSize(), tilingData.get_activateLeft(), tilingData.get_ny(), |
| 469 | tilingData.get_approximate()); | 462 | tilingData.get_approximate()); |
| 470 | 463 | ||
| 471 | - OP_LOGD(context, "Tiling4GeGluV2 exit."); | ||
| 472 | return ge::GRAPH_SUCCESS; | 464 | return ge::GRAPH_SUCCESS; |
| 473 | } | 465 | } |
| 474 | 466 | ||