From a642037f350ead33f546b0a73ed5d1d8a8195579 Mon Sep 17 00:00:00 2001
From: zhaozhixuan <zhaozhixuan2@hisilicon.com>
Date: Sat, 3 Jul 2021 09:58:16 +0800
Subject: [PATCH] Do not create context in hydrid executor init func.

---
 ge/hybrid/executor/hybrid_model_executor.cc          |  4 ----
 ge/hybrid/executor/hybrid_model_pipeline_executor.cc |  1 -
 ge/hybrid/executor/worker/task_compile_engine.cc     | 11 +++++++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ge/hybrid/executor/hybrid_model_executor.cc b/ge/hybrid/executor/hybrid_model_executor.cc
index 9bf70d26..6823b789 100755
--- a/ge/hybrid/executor/hybrid_model_executor.cc
+++ b/ge/hybrid/executor/hybrid_model_executor.cc
@@ -33,9 +33,6 @@ HybridModelExecutor::HybridModelExecutor(HybridModel *model, uint32_t device_id,
 }
 
 HybridModelExecutor::~HybridModelExecutor() {
-  if (context_.rt_gen_context != nullptr) {
-    (void) rtCtxDestroy(context_.rt_gen_context);
-  }
 }
 
 Status HybridModelExecutor::Init() {
@@ -139,7 +136,6 @@ Status HybridModelExecutor::Cleanup() {
 
 Status HybridModelExecutor::InitExecutionContext() {
   GE_CHK_RT_RET(rtCtxGetCurrent(&context_.rt_context));
-  GE_CHK_RT_RET(rtCtxCreate(&context_.rt_gen_context, RT_CTX_GEN_MODE, 0));
   GE_CHK_RT_RET(rtCtxSetCurrent(context_.rt_context));
 
   context_.global_step = model_->GetGlobalStep();
diff --git a/ge/hybrid/executor/hybrid_model_pipeline_executor.cc b/ge/hybrid/executor/hybrid_model_pipeline_executor.cc
index c0bd5c7d..d7245e5a 100644
--- a/ge/hybrid/executor/hybrid_model_pipeline_executor.cc
+++ b/ge/hybrid/executor/hybrid_model_pipeline_executor.cc
@@ -175,7 +175,6 @@ HybridModelPipelineExecutor::HybridModelPipelineExecutor(HybridModel *model, uin
 }
 
 Status StageExecutor::InitExecutionContext() {
-  GE_CHK_RT_RET(rtCtxCreate(&context_.rt_gen_context, RT_CTX_GEN_MODE, 0));
   GE_CHK_RT_RET(rtCtxSetCurrent(context_.rt_context));
 
   context_.model = model_;
diff --git a/ge/hybrid/executor/worker/task_compile_engine.cc b/ge/hybrid/executor/worker/task_compile_engine.cc
index f7da9acd..491e0997 100755
--- a/ge/hybrid/executor/worker/task_compile_engine.cc
+++ b/ge/hybrid/executor/worker/task_compile_engine.cc
@@ -21,10 +21,17 @@
 namespace ge {
 namespace hybrid {
 Status TaskCompileEngine::Compile(NodeState &node_state, GraphExecutionContext *context) {
-  const auto &node_item = *node_state.GetNodeItem();
   GE_CHECK_NOTNULL(context);
+  rtContext_t rt_gen_context = nullptr;
+  GE_CHK_RT_RET(rtCtxCreate(&rt_gen_context, RT_CTX_GEN_MODE, 0));
+  std::function<void()> callback = [&]() {
+    (void) rtCtxDestroy(rt_gen_context);
+    GE_CHK_RT(rtCtxSetCurrent(context->rt_context));
+  };
+  GE_MAKE_GUARD(rt_gen_context, callback);
+
+  const auto &node_item = *node_state.GetNodeItem();
   RECORD_COMPILE_EVENT(context, node_item.NodeName().c_str(), "[Compile] Start");
-  GE_CHK_RT_RET(rtCtxSetCurrent(context->rt_gen_context));
 
   if (context->ge_context != nullptr) {
     GetThreadLocalContext() = *context->ge_context;