From a11e58133b280ad9cd325d141b64b611e9d4ded0 Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Mon, 29 Mar 2021 11:44:49 +0800 Subject: [PATCH] fix conflict --- ge/graph/load/model_manager/davinci_model.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ge/graph/load/model_manager/davinci_model.cc b/ge/graph/load/model_manager/davinci_model.cc index ed6e738d..b852e4ea 100755 --- a/ge/graph/load/model_manager/davinci_model.cc +++ b/ge/graph/load/model_manager/davinci_model.cc @@ -4261,13 +4261,9 @@ Status DavinciModel::GetAllAippInputOutputDims(uint32_t index, vector &output_dims) const { const auto it = aipp_dims_info_.find(index); if (it == aipp_dims_info_.end()) { -<<<<<<< Updated upstream - GELOGE(ACL_ERROR_GE_AIPP_NOT_EXIST, "There is not AIPP related with index %u.", index); -======= REPORT_INNER_ERROR("E19999", "Get index:%u from aipp_dims_info_ fail, model_id:%u, when DavinciModel %s", index, model_id_, __FUNCTION__); - GELOGE(ACL_ERROR_GE_AIPP_NOT_EXIST, "there is not AIPP related with index %u.", index); ->>>>>>> Stashed changes + GELOGE(ACL_ERROR_GE_AIPP_NOT_EXIST, "There is not AIPP related with index %u.", index); return ACL_ERROR_GE_AIPP_NOT_EXIST; }