From a153f6b35f34d608b495afb4f756f2c535192617 Mon Sep 17 00:00:00 2001
From: Parastoo Ashtari <parastoo.ashtari@huawei.com>
Date: Fri, 2 Jul 2021 14:30:00 -0400
Subject: [PATCH] Fix receive WaitCMD instead of terminate for multigraph GPU

---
 mindspore/ccsrc/debug/debugger/debugger.cc       | 3 +++
 mindspore/ccsrc/debug/debugger/debugger_utils.cc | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/mindspore/ccsrc/debug/debugger/debugger.cc b/mindspore/ccsrc/debug/debugger/debugger.cc
index c088378900a..a1922387dbd 100644
--- a/mindspore/ccsrc/debug/debugger/debugger.cc
+++ b/mindspore/ccsrc/debug/debugger/debugger.cc
@@ -351,6 +351,9 @@ void Debugger::PreExecute(const KernelGraphPtr &graph_ptr, uint32_t graph_sum) {
         } else if (graph_id == rungraph_id_list_.front() && device_target_ == kGPUDevice) {
           // stop only when receive the first sub run graph for each step
           // if we have stopped for the last kernel before, no need to stop again
+          if (pipeline::ExecutorPy::GetDebugTerminate()) {
+            return;
+          }
           if (!(run_level_ == "node" && suspended_at_last_kernel_)) {
             CommandLoop();
           }
diff --git a/mindspore/ccsrc/debug/debugger/debugger_utils.cc b/mindspore/ccsrc/debug/debugger/debugger_utils.cc
index 52f53e4370d..a096ad4101c 100644
--- a/mindspore/ccsrc/debug/debugger/debugger_utils.cc
+++ b/mindspore/ccsrc/debug/debugger/debugger_utils.cc
@@ -51,6 +51,7 @@ std::vector<int> CheckRealOutput(const std::string &node_name, const size_t &out
   }
   return real_outputs;
 }
+
 void LoadInputs(const CNodePtr &cnode, const KernelLaunchInfo *launch_info_, uint32_t exec_order_) {
   // get inputs
   auto kernel_inputs = launch_info_->inputs_;
@@ -77,6 +78,7 @@ void LoadInputs(const CNodePtr &cnode, const KernelLaunchInfo *launch_info_, uin
 #endif
   }
 }
+
 void LoadOutputs(const CNodePtr &cnode, const KernelLaunchInfo *launch_info_, uint32_t exec_order_) {
   // get outputs
   auto kernel_outputs = launch_info_->outputs_;