From d83e7c41c8089358846e107a6c8878230ad7724d Mon Sep 17 00:00:00 2001
From: Amir Lashkari <amir.lashkari1@huawei.com>
Date: Tue, 9 Mar 2021 14:00:19 -0500
Subject: [PATCH] Fixed log issue

Fixed cpplint
---
 .../ccsrc/backend/session/session_basic.h     |  4 +---
 mindspore/ccsrc/debug/debugger/debugger.cc    | 19 ++++++++++---------
 mindspore/ccsrc/debug/debugger/debugger.h     |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mindspore/ccsrc/backend/session/session_basic.h b/mindspore/ccsrc/backend/session/session_basic.h
index f446b67bf3..084eb72f2f 100644
--- a/mindspore/ccsrc/backend/session/session_basic.h
+++ b/mindspore/ccsrc/backend/session/session_basic.h
@@ -132,9 +132,7 @@ class SessionBasic : public std::enable_shared_from_this<SessionBasic> {
   // set debugger
   void SetDebugger() {
     debugger_ = Debugger::GetInstance();
-    auto ms_context = MsContext::GetInstance();
-    MS_EXCEPTION_IF_NULL(ms_context);
-    debugger_->Init(device_id_, ms_context->get_param<std::string>(MS_CTX_DEVICE_TARGET));
+    debugger_->Init(device_id_);
   }
 #endif
 
diff --git a/mindspore/ccsrc/debug/debugger/debugger.cc b/mindspore/ccsrc/debug/debugger/debugger.cc
index 1499b628de..c08e4a9f3e 100644
--- a/mindspore/ccsrc/debug/debugger/debugger.cc
+++ b/mindspore/ccsrc/debug/debugger/debugger.cc
@@ -73,7 +73,14 @@ Debugger::Debugger()
       not_dataset_graph_sum_(0),
       version_("") {
   CheckDebuggerEnabledParam();
-  if (CheckDebuggerEnabled()) {
+  auto ms_context = MsContext::GetInstance();
+  MS_EXCEPTION_IF_NULL(ms_context);
+  device_target_ = ms_context->get_param<std::string>(MS_CTX_DEVICE_TARGET);
+  MS_LOG(INFO) << "Debugger got device_target: " << device_target_;
+  CheckDebuggerEnabledParam();
+  if (device_target_ == kCPUDevice) {
+    MS_LOG(WARNING) << "Not enabling debugger. Debugger does not support CPU.";
+  } else if (CheckDebuggerEnabled()) {
     // configure partial memory reuse
     partial_memory_ = CheckDebuggerPartialMemoryEnabled();
 
@@ -94,14 +101,12 @@ Debugger::Debugger()
   }
 }
 
-void Debugger::Init(const uint32_t device_id, const std::string device_target) {
+void Debugger::Init(const uint32_t device_id) {
   // access lock for public method
   std::lock_guard<std::mutex> a_lock(access_lock_);
   // save device_id
   MS_LOG(INFO) << "Debugger got device_id: " << device_id;
   device_id_ = device_id;
-  MS_LOG(INFO) << "Debugger got device_target: " << device_target;
-  device_target_ = device_target;
   version_ = "1.2.0";
 }
 
@@ -122,11 +127,7 @@ void Debugger::EnableDebugger() {
   MS_LOG(INFO) << "debugger_enabled_ = " << debugger_enabled_;
 
   if (!debugger_enabled_ && !dump_enabled) {
-    if (device_target_ == kCPUDevice) {
-      MS_LOG(INFO) << "Not enabling debugger. Debugger does not support CPU.";
-    } else {
-      MS_LOG(INFO) << "Not enabling debugger. Set environment variable ENABLE_MS_DEBUGGER=1 to enable debugger.";
-    }
+    MS_LOG(INFO) << "Not enabling debugger. Set environment variable ENABLE_MS_DEBUGGER=1 to enable debugger.";
     return;
   }
 
diff --git a/mindspore/ccsrc/debug/debugger/debugger.h b/mindspore/ccsrc/debug/debugger/debugger.h
index 3676ff4d78..9a73d8d86d 100644
--- a/mindspore/ccsrc/debug/debugger/debugger.h
+++ b/mindspore/ccsrc/debug/debugger/debugger.h
@@ -67,7 +67,7 @@ class Debugger : public std::enable_shared_from_this<Debugger> {
 
   // init
   // only save device_id
-  void Init(const uint32_t device_id, const std::string device_target);
+  void Init(const uint32_t device_id);
 
   // reset debugger
   void Reset();