From 626a2cb2b73984e712739b2b318530aa60e898af Mon Sep 17 00:00:00 2001
From: unknown <zhaozhixuan2@hisilicon.com>
Date: Fri, 26 Feb 2021 09:57:12 +0800
Subject: [PATCH] Add single_op model_id.

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

diff --git a/ge/executor/ge_executor.cc b/ge/executor/ge_executor.cc
index 6dc60f05..0a597515 100755
--- a/ge/executor/ge_executor.cc
+++ b/ge/executor/ge_executor.cc
@@ -928,11 +928,21 @@ Status GeExecutor::GetMemAndWeightSize(const void *model_data, size_t model_size
   return ge::ModelManager::GetModelMemAndWeightSize(model, mem_size, weight_size);
 }
 
+Status GeExecutor::LoadSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
+                                SingleOp **single_op) {
+  return SingleOpManager::GetInstance().GetOpFromModel(model_name, modelData, stream, single_op, 0);
+}
+
 Status GeExecutor::LoadSingleOp(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 SingleOpManager::GetInstance().GetDynamicOpFromModel(model_name, modelData, stream, single_op, 0);
+}
+
 Status GeExecutor::LoadDynamicSingleOp(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 a7cb02b9..ac08e473 100644
--- a/inc/framework/executor/ge_executor.h
+++ b/inc/framework/executor/ge_executor.h
@@ -258,13 +258,19 @@ class GE_FUNC_VISIBILITY GeExecutor {
   ge::Status GetMemAndWeightSize(const void *model_data, size_t model_size, size_t &mem_size, size_t &weight_size);
 
   static ge::Status LoadSingleOp(const std::string &modelName, const ge::ModelData &modelData, void *stream,
-                                 SingleOp **single_op, const uint64_t model_id = 0);
+                                 SingleOp **single_op);
+
+  static ge::Status LoadSingleOp(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,
                                  std::vector<DataBuffer> &outputs);
 
   static ge::Status LoadDynamicSingleOp(const std::string &model_name, const ge::ModelData &modelData, void *stream,
-                                        DynamicSingleOp **single_op, const uint64_t model_id = 0);
+                                        DynamicSingleOp **single_op);
+
+  static ge::Status LoadDynamicSingleOp(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,
                                  const std::vector<DataBuffer> &inputs, std::vector<GeTensorDesc> &output_desc,