diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc index c2c993aa50..4f34d338e4 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc +++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc @@ -29,9 +29,7 @@ namespace nnapi { ModelBuilder::ModelBuilder(const GraphViewer& graph_viewer, const NnApi& nnapi_handle, gsl::span nnapi_target_devices) - : nnapi_(nnapi_handle), graph_viewer_(graph_viewer), nnapi_model_{std::make_unique(nnapi_handle)}, - shaper_{graph_viewer}, nnapi_target_devices_(nnapi_target_devices), - nnapi_effective_feature_level_(GetNNAPIEffectiveFeatureLevel(nnapi_handle, nnapi_target_devices_)) { + : nnapi_(nnapi_handle), graph_viewer_(graph_viewer), nnapi_model_{std::make_unique(nnapi_handle)}, shaper_{graph_viewer}, nnapi_target_devices_(nnapi_target_devices), nnapi_effective_feature_level_(GetNNAPIEffectiveFeatureLevel(nnapi_handle, nnapi_target_devices_)) { nnapi_model_->nnapi_effective_feature_level_ = nnapi_effective_feature_level_; } @@ -586,7 +584,8 @@ Status ModelBuilder::Compile(std::unique_ptr& model) { } } - LOGS_DEFAULT(VERBOSE) << total_ops << " Ops [" << fb_op_alloc_detail << "] out of " << num_nnapi_ops_ << " are falling-back to nnapi-reference, and [" + LOGS_DEFAULT(VERBOSE) << total_ops << " Ops [" << fb_op_alloc_detail << "] out of " << num_nnapi_ops_ + << " are falling-back to " << kNnapiCpuDeviceName << ", and [" << nm_op_alloc_detail << "] are running in accelerators."; } #endif diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_api_helper.h b/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_api_helper.h index 4501d56ad1..13847f4fc6 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_api_helper.h +++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_api_helper.h @@ -33,7 +33,7 @@ enum class TargetDeviceOption : int8_t { CPU_ONLY, // use CPU only }; -const char* const nnapi_cpu = ("nnapi-reference"); +const char* const kNnapiCpuDeviceName = ("nnapi-reference"); /** How feature level works for NNAPI. refer to https://developer.android.com/ndk/reference/group/neural-networks *