From 1c10a5ace33dc555aa6d15112042acb3db16a362 Mon Sep 17 00:00:00 2001
From: unknown <zhaozhixuan2@hisilicon.com>
Date: Sat, 27 Feb 2021 17:21:27 +0800
Subject: [PATCH] Add single_op model_id.

---
 ge/executor/ge_executor.cc           | 8 ++++----
 inc/framework/executor/ge_executor.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ge/executor/ge_executor.cc b/ge/executor/ge_executor.cc
index b3353af8..f33d7758 100755
--- a/ge/executor/ge_executor.cc
+++ b/ge/executor/ge_executor.cc
@@ -931,20 +931,20 @@ Status GeExecutor::GetMemAndWeightSize(const void *model_data, size_t model_size
 
 Status GeExecutor::LoadSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
                                 SingleOp **single_op) {
-  return LoadSingleOp(model_name, modelData, stream, single_op, 0);
+  return LoadSingleOpV2(model_name, modelData, stream, single_op, 0);
 }
 
-Status GeExecutor::LoadSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
+Status GeExecutor::LoadSingleOpV2(const std::string &model_name, const ge::ModelData &modelData, void *stream,
                                 SingleOp **single_op, const uint64_t model_id) {
   return SingleOpManager::GetInstance().GetOpFromModel(model_name, modelData, stream, single_op, model_id);
 }
 
 Status GeExecutor::LoadDynamicSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
                                        DynamicSingleOp **single_op) {
-  return LoadDynamicSingleOp(model_name, modelData, stream, single_op, 0);
+  return LoadDynamicSingleOpV2(model_name, modelData, stream, single_op, 0);
 }
 
-Status GeExecutor::LoadDynamicSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
+Status GeExecutor::LoadDynamicSingleOpV2(const std::string &model_name, const ge::ModelData &modelData, void *stream,
                                        DynamicSingleOp **single_op, const uint64_t model_id) {
   return SingleOpManager::GetInstance().GetDynamicOpFromModel(model_name, modelData, stream, single_op, model_id);
 }
diff --git a/inc/framework/executor/ge_executor.h b/inc/framework/executor/ge_executor.h
index ac08e473..732e47aa 100644
--- a/inc/framework/executor/ge_executor.h
+++ b/inc/framework/executor/ge_executor.h
@@ -260,7 +260,7 @@ class GE_FUNC_VISIBILITY GeExecutor {
   static ge::Status LoadSingleOp(const std::string &modelName, const ge::ModelData &modelData, void *stream,
                                  SingleOp **single_op);
 
-  static ge::Status LoadSingleOp(const std::string &modelName, const ge::ModelData &modelData, void *stream,
+  static ge::Status LoadSingleOpV2(const std::string &modelName, const ge::ModelData &modelData, void *stream,
                                  SingleOp **single_op, const uint64_t model_id);
 
   static ge::Status ExecuteAsync(SingleOp *executor, const std::vector<DataBuffer> &inputs,
@@ -269,7 +269,7 @@ class GE_FUNC_VISIBILITY GeExecutor {
   static ge::Status LoadDynamicSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
                                         DynamicSingleOp **single_op);
 
-  static ge::Status LoadDynamicSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
+  static ge::Status LoadDynamicSingleOpV2(const std::string &model_name, const ge::ModelData &modelData, void *stream,
                                         DynamicSingleOp **single_op, const uint64_t model_id);
 
   static ge::Status ExecuteAsync(DynamicSingleOp *executor, const std::vector<GeTensorDesc> &input_desc,