| Patch the code in the tools directory so that it loads the NNAPI delegate |
| correctly without needing to define __ANDROID__ |
| |
| diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD |
| index 8d16389b..30d18fb1 100644 |
| --- a/tensorflow/lite/BUILD |
| +++ b/tensorflow/lite/BUILD |
| @@ -268,6 +268,8 @@ cc_library( |
| ":string", |
| ":type_to_tflitetype", |
| ":util", |
| + "//tensorflow/lite/delegates/nnapi:nnapi_delegate", |
| + "//tensorflow/lite/nnapi:nnapi_implementation", |
| "//tensorflow/lite/c:common", |
| "//tensorflow/lite/core/api", |
| "//tensorflow/lite/core/api:verifier", |
| |
| diff --git a/tensorflow/lite/tools/evaluation/utils.cc b/tensorflow/lite/tools/evaluation/utils.cc |
| index 730a7d5f..e073a402 100644 |
| --- a/tensorflow/lite/tools/evaluation/utils.cc |
| +++ b/tensorflow/lite/tools/evaluation/utils.cc |
| @@ -95,25 +95,17 @@ TfLiteStatus GetSortedFileNames( |
| |
| // TODO(b/138448769): Migrate delegate helper APIs to lite/testing. |
| TfLiteDelegatePtr CreateNNAPIDelegate() { |
| -#if defined(__ANDROID__) |
| return TfLiteDelegatePtr( |
| NnApiDelegate(), |
| // NnApiDelegate() returns a singleton, so provide a no-op deleter. |
| [](TfLiteDelegate*) {}); |
| -#else |
| - return CreateNullDelegate(); |
| -#endif // defined(__ANDROID__) |
| } |
| |
| TfLiteDelegatePtr CreateNNAPIDelegate(StatefulNnApiDelegate::Options options) { |
| -#if defined(__ANDROID__) |
| return TfLiteDelegatePtr( |
| new StatefulNnApiDelegate(options), [](TfLiteDelegate* delegate) { |
| delete reinterpret_cast<StatefulNnApiDelegate*>(delegate); |
| }); |
| -#else |
| - return CreateNullDelegate(); |
| -#endif // defined(__ANDROID__) |
| } |
| |
| #if TFLITE_SUPPORTS_GPU_DELEGATE |
