p12346870
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!17915 [MS][LITE] return nullptr when inner context init failed 

Merge pull request !17915 from cjh9368/inner_context_check
This commit is contained in:
i-robot 2021-06-08 19:36:51 +08:00 committed by Gitee
parent 48d5d1b5a6 45e796ac87
commit d08907ad1c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mindspore/lite/java/native/runtime/ms_config.cpp
View File

@ -23,7 +23,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_lite_config_MSConfig_creat
auto *context = new (std::nothrow) mindspore::lite::Context();
if (context == nullptr) {
MS_LOGE("new Context fail!");
return (jlong)context;
return (jlong) nullptr;
}
auto &cpu_device_ctx = context->device_list_[0];
@ -40,11 +40,12 @@ extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_lite_config_MSConfig_creat
}
case 2: // DT_NPU
MS_LOGE("We only support CPU and GPU now.");
return (jlong)context;
break;
delete context;
return (jlong) nullptr;
default:
MS_LOGE("Invalid device_type : %d", device_type);
return (jlong)context;
delete context;
return (jlong) nullptr;
}
switch (cpu_bind_mode) {
@ -59,7 +60,8 @@ extern "C" JNIEXPORT jlong JNICALL Java_com_mindspore_lite_config_MSConfig_creat
break;
default:
MS_LOGE("Invalid cpu_bind_mode : %d", cpu_bind_mode);
return (jlong)context;
delete context;
return (jlong) nullptr;
}
cpu_device_ctx.device_info_.cpu_device_info_.enable_float16_ = enable_float16;