From ad7ce7881d78f9b71fa181a91d4ac3352d8eaf28 Mon Sep 17 00:00:00 2001 From: lixian Date: Sat, 20 Mar 2021 20:47:05 +0800 Subject: [PATCH] fix context error for unfied API --- mindspore/lite/src/cxx_api/context.cc | 4 ++-- mindspore/lite/src/cxx_api/model/model_impl.cc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mindspore/lite/src/cxx_api/context.cc b/mindspore/lite/src/cxx_api/context.cc index 37b48c3b5c..13e771898f 100644 --- a/mindspore/lite/src/cxx_api/context.cc +++ b/mindspore/lite/src/cxx_api/context.cc @@ -121,9 +121,9 @@ void CPUDeviceInfo::SetThreadAffinity(int affinity) { int CPUDeviceInfo::GetThreadAffinity() const { if (data_ == nullptr) { MS_LOG(ERROR) << "Invalid context."; - return false; + return 0; } - return GetValue(data_, kModelOptionCpuThreadAffinity); + return GetValue(data_, kModelOptionCpuThreadAffinity); } void MaliGPUDeviceInfo::SetEnableFP16(bool is_fp16) { diff --git a/mindspore/lite/src/cxx_api/model/model_impl.cc b/mindspore/lite/src/cxx_api/model/model_impl.cc index 09cf15b0d7..85a32b1d72 100644 --- a/mindspore/lite/src/cxx_api/model/model_impl.cc +++ b/mindspore/lite/src/cxx_api/model/model_impl.cc @@ -95,12 +95,12 @@ Status ModelImpl::Build() { lite::DeviceInfo cpu_info = {.cpu_device_info_ = {cpu_context->GetEnableFP16(), mode}}; model_context.device_list_.push_back({lite::DT_CPU, cpu_info}); if (device_list.size() == 2) { - if (device_list[0]->GetDeviceType() == kMaliGPU) { - auto gpu_context = device_list[0]->Cast(); + if (device_list[1]->GetDeviceType() == kMaliGPU) { + auto gpu_context = device_list[1]->Cast(); lite::DeviceInfo gpu_info = {.gpu_device_info_ = {gpu_context->GetEnableFP16()}}; model_context.device_list_.push_back({lite::DT_GPU, gpu_info}); - } else if (device_list[0]->GetDeviceType() == kKirinNPU) { - auto npu_context = device_list[0]->Cast(); + } else if (device_list[1]->GetDeviceType() == kKirinNPU) { + auto npu_context = device_list[1]->Cast(); lite::DeviceInfo npu_info = {.npu_device_info_ = {npu_context->GetFrequency()}}; model_context.device_list_.push_back({lite::DT_NPU, npu_info}); } else {