mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!20689 [MS][RDR] Release resources reference in RDR after pipeline running finished 

Merge pull request !20689 from louie5/clearRes
This commit is contained in:
i-robot 2021-07-23 01:40:00 +00:00 committed by Gitee
parent e7b8cf2961 b1fe84faec
commit 0dd1087418
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/debug/rdr/base_recorder.h
View File

@ -52,7 +52,7 @@ class BaseRecorder {
} }
} }
} }
~BaseRecorder() {} virtual ~BaseRecorder() {}
std::string GetModule() const { return module_; } std::string GetModule() const { return module_; }
std::string GetName() const { return name_; } std::string GetName() const { return name_; }

4
mindspore/ccsrc/debug/rdr/recorder_manager.cc
View File

@ -105,7 +105,7 @@ void RecorderManager::TriggerAll() {
if (!trigger) { if (!trigger) {
MS_LOG(WARNING) << "There is no recorder to export."; MS_LOG(WARNING) << "There is no recorder to export.";
} else { } else {
MS_LOG(INFO) << "RDR export all recorders' info."; MS_LOG(INFO) << "RDR export all recorders.";
} }
} }
@ -116,6 +116,6 @@ void RecorderManager::ClearAll() {
std::lock_guard<std::mutex> lock(mtx_); std::lock_guard<std::mutex> lock(mtx_);
recorder_container_.clear(); recorder_container_.clear();
rdr_has_record_mem_ = false; rdr_has_record_mem_ = false;
MS_LOG(INFO) << "RDR clear all recorders' info."; MS_LOG(INFO) << "RDR clear all recorders.";
} }
} // namespace mindspore } // namespace mindspore

2
mindspore/ccsrc/debug/rdr/running_data_recorder.cc
View File

@ -118,7 +118,7 @@ bool UpdateGPUMemAddressInfo(const SubModuleId module, const std::string &name,
void TriggerAll() { mindspore::RecorderManager::Instance().TriggerAll(); } void TriggerAll() { mindspore::RecorderManager::Instance().TriggerAll(); }
void ClearAll() { mindspore::RecorderManager::Instance().ClearAll(); } void ResetRecorder() { mindspore::RecorderManager::Instance().ClearAll(); }
void ClearGPUMemAddressInfo() { void ClearGPUMemAddressInfo() {
if (!mindspore::RecorderManager::Instance().RdrEnable()) { if (!mindspore::RecorderManager::Instance().RdrEnable()) {

2
mindspore/ccsrc/debug/rdr/running_data_recorder.h
View File

@ -60,7 +60,7 @@ bool RecordTaskDebugInfo(SubModuleId module, const std::string &name,
const std::vector<TaskDebugInfoPtr> &task_debug_info_list); const std::vector<TaskDebugInfoPtr> &task_debug_info_list);
#endif // ENABLE_D #endif // ENABLE_D
void TriggerAll(); void TriggerAll();
void ClearAll(); void ResetRecorder();
void ClearGPUMemAddressInfo(); void ClearGPUMemAddressInfo();
} // namespace RDR } // namespace RDR
} // namespace mindspore } // namespace mindspore

9
mindspore/ccsrc/pipeline/jit/pipeline.cc
View File

@ -445,9 +445,6 @@ void ExecutorPy::DelNetRes(const std::string &id) {
#endif #endif
} }
nested_called = false; nested_called = false;
#ifdef ENABLE_DUMP_IR
mindspore::RDR::ClearAll();
#endif
} }
void ExecutorPy::ClearRes() { void ExecutorPy::ClearRes() {
@ -1132,6 +1129,9 @@ bool InitExecDatasetVm(const std::string &queue_name, int64_t size, int64_t batc
app_init->set_abstract(abstract_none); app_init->set_abstract(abstract_none);
// Before the graph compiling, need reset the iter num. // Before the graph compiling, need reset the iter num.
ConfigManager::GetInstance().ResetIterNum(); ConfigManager::GetInstance().ResetIterNum();
#ifdef ENABLE_DUMP_IR
mindspore::RDR::ResetRecorder();
#endif
compile::SetMindRTEnable(); compile::SetMindRTEnable();
auto backend = compile::CreateBackend(); auto backend = compile::CreateBackend();
@ -1298,6 +1298,9 @@ void ClearResAtexit() {
ps::Worker::GetInstance().Finalize(); ps::Worker::GetInstance().Finalize();
} }
} }
#endif
#ifdef ENABLE_DUMP_IR
mindspore::RDR::ResetRecorder();
#endif #endif
session::ExecutorManager::Instance().Clear(); session::ExecutorManager::Instance().Clear();
device::KernelRuntimeManager::Instance().ClearRuntimeResource(); device::KernelRuntimeManager::Instance().ClearRuntimeResource();