diff --git a/mindspore/ccsrc/backend/session/session_basic.h b/mindspore/ccsrc/backend/session/session_basic.h index 37c6d34ae9..eb4fd4921a 100644 --- a/mindspore/ccsrc/backend/session/session_basic.h +++ b/mindspore/ccsrc/backend/session/session_basic.h @@ -132,7 +132,9 @@ class SessionBasic : public std::enable_shared_from_this { // set debugger void SetDebugger() { debugger_ = Debugger::GetInstance(); - debugger_->Init(device_id_); + auto ms_context = MsContext::GetInstance(); + MS_EXCEPTION_IF_NULL(ms_context); + debugger_->Init(device_id_, ms_context->get_param(MS_CTX_DEVICE_TARGET)); } #endif diff --git a/mindspore/ccsrc/debug/debugger/debugger.cc b/mindspore/ccsrc/debug/debugger/debugger.cc index c08e4a9f3e..8bc8f26895 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.cc +++ b/mindspore/ccsrc/debug/debugger/debugger.cc @@ -75,10 +75,9 @@ Debugger::Debugger() CheckDebuggerEnabledParam(); auto ms_context = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(ms_context); - device_target_ = ms_context->get_param(MS_CTX_DEVICE_TARGET); - MS_LOG(INFO) << "Debugger got device_target: " << device_target_; - CheckDebuggerEnabledParam(); - if (device_target_ == kCPUDevice) { + std::string device_target = ms_context->get_param(MS_CTX_DEVICE_TARGET); + MS_LOG(INFO) << "Debugger got device_target: " << device_target; + if (device_target == kCPUDevice) { MS_LOG(WARNING) << "Not enabling debugger. Debugger does not support CPU."; } else if (CheckDebuggerEnabled()) { // configure partial memory reuse @@ -101,12 +100,14 @@ Debugger::Debugger() } } -void Debugger::Init(const uint32_t device_id) { +void Debugger::Init(const uint32_t device_id, const std::string device_target) { // access lock for public method std::lock_guard 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"; } diff --git a/mindspore/ccsrc/debug/debugger/debugger.h b/mindspore/ccsrc/debug/debugger/debugger.h index 9a73d8d86d..3676ff4d78 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 { // init // only save device_id - void Init(const uint32_t device_id); + void Init(const uint32_t device_id, const std::string device_target); // reset debugger void Reset();