Browse Source

fix dataset_sink_mode=True issue with GPU

tags/v1.2.0-rc1
Islam Amin 5 years ago
parent
commit
0fa5a443be
3 changed files with 10 additions and 7 deletions
  1. +3
    -1
      mindspore/ccsrc/backend/session/session_basic.h
  2. +6
    -5
      mindspore/ccsrc/debug/debugger/debugger.cc
  3. +1
    -1
      mindspore/ccsrc/debug/debugger/debugger.h

+ 3
- 1
mindspore/ccsrc/backend/session/session_basic.h View File

@@ -132,7 +132,9 @@ class SessionBasic : public std::enable_shared_from_this<SessionBasic> {
// 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<std::string>(MS_CTX_DEVICE_TARGET));
}
#endif



+ 6
- 5
mindspore/ccsrc/debug/debugger/debugger.cc View File

@@ -75,10 +75,9 @@ Debugger::Debugger()
CheckDebuggerEnabledParam();
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) {
std::string device_target = ms_context->get_param<std::string>(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<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";
}



+ 1
- 1
mindspore/ccsrc/debug/debugger/debugger.h View File

@@ -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);
void Init(const uint32_t device_id, const std::string device_target);

// reset debugger
void Reset();


Loading…
Cancel
Save