saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-26 22:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
wejoncy 2023-03-14 10:55:37 +08:00 committed by JiCheng
parent 8db28d9139
commit 762ea2402e
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
onnxruntime/core/providers/nnapi/nnapi_builtin/builders/impl/base_op_builder.cc
View file

@ -53,7 +53,9 @@ Status BaseOpBuilder::AddToModelBuilder(ModelBuilder& model_builder, const NodeU
};
ORT_RETURN_IF_NOT(IsOpSupported(model_builder.GetInitializerTensors(), node_unit, params),
"Unsupported operator ", node_unit.OpType());
#ifndef NDEBUG
model_builder.SetDebugTrackNode(node_unit.Index());
#endif
ORT_RETURN_IF_ERROR(AddToModelBuilderImpl(model_builder, node_unit));
LOGS_DEFAULT(VERBOSE) << "Operator name: [" << node_unit.Name()
<< "] type: [" << node_unit.OpType() << "] was added";

8
onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc
View file

@ -2,6 +2,7 @@
// Licensed under the MIT License.
#include "model_builder.h"
#include <unordered_map>
#include "core/common/common.h"
@ -552,9 +553,10 @@ Status ModelBuilder::Compile(std::unique_ptr<Model>& model) {
return ORT_MAKE_STATUS(ONNXRUNTIME, EP_FAIL,
"The model cannot run using current set of target devices, ",
GetDevicesDescription(nnapi_target_devices_));
// workaround for bugs in Android OS. sometimes ops are passed checking but failed at compilation.
}
// else // no else after return
// workaround for bugs in NNAPI drives on some phones.
// sometimes ops are passed checking but failed at compilation.
if (target_device_option_ != TargetDeviceOption::ALL_DEVICES) {
use_create_for_devices = true;
}
@ -576,7 +578,7 @@ Status ModelBuilder::Compile(std::unique_ptr<Model>& model) {
const auto* node(graph_viewer_.GetNode(onnx_node_idx));
auto stat_name = node->OpType() + ".nnapi_op_" + std::to_string(nnapi_idx);
if (!supported_ops[idx]) {
if (supported_ops[idx]) {
optype_support_status[stat_name].first++;
} else {
optype_support_status[stat_name].second++;

14
onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.h
View file

@ -105,16 +105,16 @@ class ModelBuilder {
int32_t GetEffectiveFeatureLevel() const { return nnapi_effective_feature_level_; }
// Just for Debugging
void SetDebugTrackNode(const size_t node_index) {
#ifndef NDEBUG
// Set the node index to be tracked for debugging
// For now, NNAPI is a black box, LOGs are limited and it's hard to debug.
// ONNX node and NNAPI node are not a 1:1 mapping, like batch-normalization.
// We use this to track a specific onnx node which we are processing and record the detail mapping relationship.
// So we can log out each NNAPI OP status during model-building and compiling.
void SetDebugTrackNode(const size_t node_index) {
track_node_index_ = node_index;
#else
// ORT_UNUSED_PARAMETER minimal build
(void)(node_index);
#endif
}
#endif
private:
const NnApi& nnapi_;
const GraphViewer& graph_viewer_;

4
onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_api_helper.cc
View file

@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#include "core/providers/nnapi/nnapi_builtin/nnapi_api_helper.h"
#include "core/common/inlined_containers_fwd.h"
#include "core/providers/nnapi/nnapi_builtin/builders/model_builder.h"
#include "core/providers/nnapi/nnapi_builtin/nnapi_lib/nnapi_implementation.h"
#include "core/providers/nnapi/nnapi_builtin/nnapi_api_helper.h"
#include "core/common/logging/logging.h"
#ifdef __ANDROID__
@ -104,6 +104,8 @@ Status GetTargetDevices(const NnApi& nnapi_handle, TargetDeviceOption target_dev
// and nnapi internally skip the last device if it has already found one.
// 2) we can easily exclude nnapi-reference when not strict excluding CPU.
// 3) we can easily log the detail of how op was assigned on NNAPI devices which is helpful for debugging.
// refer to https://source.android.com/docs/core/interaction/neural-networks#cpu-usage
// and https://android.googlesource.com/platform/frameworks/ml/+/master/nn/runtime/ExecutionPlan.cpp#2303
if (cpu_index != -1 && cpu_index != static_cast<int32_t>(devices.size()) - 1) {
std::swap(devices[devices.size() - 1], devices[cpu_index]);
}