From cd1cd6538ca604b860030a4af17908961661978c Mon Sep 17 00:00:00 2001 From: l00444296 Date: Mon, 23 Nov 2020 15:09:36 +0800 Subject: [PATCH] Feature: handle ret value transition --- ge/graph/load/new_model_manager/davinci_model.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ge/graph/load/new_model_manager/davinci_model.cc b/ge/graph/load/new_model_manager/davinci_model.cc index 02b16158..740bcec3 100755 --- a/ge/graph/load/new_model_manager/davinci_model.cc +++ b/ge/graph/load/new_model_manager/davinci_model.cc @@ -95,6 +95,8 @@ const char *const kGetDynamicDimsName = "ascend_mbatch_get_dynamic_dims_node"; const int32_t kInvalidStream = -1; const uint32_t kEndOfSequence = 0x0704000a; const uint32_t kEndOfSequenceNew = 507005; +const int32_t kModelAbortNormal = 0x0704000e; +const int32_t kModelAbortNormalNew = 507024; inline bool IsDataOp(const std::string &node_type) { return node_type == DATA_TYPE || node_type == AIPP_DATA_TYPE || node_type == ANN_DATA_TYPE; @@ -2804,7 +2806,7 @@ void *DavinciModel::Run(DavinciModel *model) { GELOGI("rtStreamSynchronize start."); rt_ret = rtStreamSynchronize(model->rt_model_stream_); - if (rt_ret == RT_ERROR_MODEL_ABORT_NORMAL) { + if (rt_ret == kModelAbortNormal || rt_ret == kModelAbortNormalNew) { GELOGI("The model with multiple datasets aborts normally."); } else { GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, rslt_flg = false; @@ -2832,7 +2834,7 @@ void *DavinciModel::Run(DavinciModel *model) { if (rt_ret == kEndOfSequence || rt_ret == kEndOfSequenceNew) { seq_end_flag = true; } - if (rt_ret == RT_ERROR_MODEL_ABORT_NORMAL) { + if (rt_ret == kModelAbortNormal || rt_ret == kModelAbortNormalNew) { GELOGI("The model with multiple datasets aborts normally."); } else { GE_IF_BOOL_EXEC(