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

Add CPU_ONLY runtime option to NNAPI EP (#9066)

Browse source 
* Add NNAPI cpu only option

* update java

* Update comments
This commit is contained in:
Guoyu Wang 2021-09-15 15:50:18 -07:00 committed by GitHub
parent e758870b18
commit bee5c26580
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/onnxruntime/core/providers/nnapi/nnapi_provider_factory.h
View file

@ -33,11 +33,21 @@ enum NNAPIFlags {
//
// For NNAPI device assignments, see https://developer.android.com/ndk/guides/neuralnetworks#device-assignment
// For NNAPI CPU fallback, see https://developer.android.com/ndk/guides/neuralnetworks#cpu-fallback
//
// Please note, the NNAPI EP will return error status if both NNAPI_FLAG_CPU_DISABLED
// and NNAPI_FLAG_CPU_ONLY flags are set
NNAPI_FLAG_CPU_DISABLED = 0x004,
// Keep NNAPI_FLAG_MAX at the end of the enum definition
// Using CPU only in NNAPI EP, this may decrease the perf but will provide
// reference output value without precision loss, which is useful for validation
//
// Please note, the NNAPI EP will return error status if both NNAPI_FLAG_CPU_DISABLED
// and NNAPI_FLAG_CPU_ONLY flags are set
NNAPI_FLAG_CPU_ONLY = 0x008,
// Keep NNAPI_FLAG_LAST at the end of the enum definition
// And assign the last NNAPIFlag to it
NNAPI_FLAG_LAST = NNAPI_FLAG_CPU_DISABLED,
NNAPI_FLAG_LAST = NNAPI_FLAG_CPU_ONLY,
};
#ifdef __cplusplus

3
java/src/main/java/ai/onnxruntime/providers/NNAPIFlags.java
View file

@ -8,7 +8,8 @@ package ai.onnxruntime.providers;
public enum NNAPIFlags implements OrtFlags {
USE_FP16(1), // NNAPI_FLAG_USE_FP16(0x001)
USE_NCHW(2), // NNAPI_FLAG_USE_NCHW(0x002)
CPU_DISABLED(4); // NNAPI_FLAG_CPU_DISABLED(0x004)
CPU_DISABLED(4), // NNAPI_FLAG_CPU_DISABLED(0x004)
CPU_ONLY(8); // NNAPI_FLAG_CPU_ONLY(0x008)
public final int value;

9
onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc
View file

@ -235,8 +235,15 @@ common::Status NnapiExecutionProvider::Compile(const std::vector<FusedNodeAndGra
nnapi::ModelBuilder builder(graph_viewer);
builder.SetUseNCHW(nnapi_flags_ & NNAPI_FLAG_USE_NCHW);
builder.SetUseFp16(nnapi_flags_ & NNAPI_FLAG_USE_FP16);
if (nnapi_flags_ & NNAPI_FLAG_CPU_DISABLED) {
bool cpu_disabled = nnapi_flags_ & NNAPI_FLAG_CPU_DISABLED;
bool cpu_only = nnapi_flags_ & NNAPI_FLAG_CPU_ONLY;
if (cpu_disabled && cpu_only) {
return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "Both NNAPI_FLAG_CPU_DISABLED and NNAPI_FLAG_CPU_ONLY are set");
} else if (cpu_disabled) {
builder.SetTargetDeviceOption(nnapi::ModelBuilder::TargetDeviceOption::CPU_DISABLED);
} else if (cpu_only) {
builder.SetTargetDeviceOption(nnapi::ModelBuilder::TargetDeviceOption::CPU_ONLY);
}
std::unique_ptr<nnapi::Model> nnapi_model;

1
tools/ci_build/github/azure-pipelines/templates/android-java-api-aar.yml
View file

@ -25,6 +25,7 @@ parameters:
default: ''
- name: publish_executables
# The executables will only be published if the publish_executables is set to "1"
displayName: Publish executables such as onnxruntime_perf_test, ...
type: string
default: '0'