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

!45885 fix double free at exit 

Merge pull request !45885 from zhoufeng/xiu-ba-ge-4
This commit is contained in:
i-robot 2022-11-23 09:09:00 +00:00 committed by Gitee
parent 21263a0c6f 6f7f2c543a
commit 6881b8d34f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mindspore/core/utils/ms_context.cc
View File

@ -40,6 +40,8 @@ std::map<std::string, MsBackendPolicy> kPolicyMap = {{"ge", kMsBackendGePrior},
std::atomic<bool> thread_1_must_end(false);
MsContext::DeviceSeter MsContext::seter_ = nullptr;
MsContext::LoadPluginError MsContext::load_plugin_error_ = nullptr;
std::shared_ptr<MsContext> MsContext::inst_context_ = nullptr;
MsContext::MsContext(const std::string &policy, const std::string &target) {
#ifndef ENABLE_SECURITY
@ -124,6 +126,7 @@ MsContext::MsContext(const std::string &policy, const std::string &target) {
}
std::shared_ptr<MsContext> MsContext::GetInstance() {
static std::once_flag inst_context_init_flag_ = {};
std::call_once(inst_context_init_flag_, [&]() {
if (inst_context_ == nullptr) {
MS_LOG(DEBUG) << "Create new mindspore context";

5
mindspore/core/utils/ms_context.h
View File

@ -201,9 +201,8 @@ class MS_CORE_API MsContext {
private:
static DeviceSeter seter_;
inline static std::once_flag inst_context_init_flag_ = {};
inline static std::shared_ptr<MsContext> inst_context_ = nullptr;
inline static LoadPluginError load_plugin_error_ = nullptr;
static std::shared_ptr<MsContext> inst_context_;
static LoadPluginError load_plugin_error_;
bool bool_params_[MsCtxParam::NUM_BOOL_PARAMS];
int int_params_[MsCtxParam::NUM_INT_PARAMS];