TensorFlowMax nnapi_delegate (#1432)

Add nnapi call from nnapi_delegate.cpp for TensorFlowMax

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/libs/support/tflite/src/nnapi_delegate.cpp b/libs/support/tflite/src/nnapi_delegate.cpp
index 7e072e1..697c2be 100644 (file)
--- a/libs/support/tflite/src/nnapi_delegate.cpp
+++ b/libs/support/tflite/src/nnapi_delegate.cpp
@@ -356,6 +356,17 @@ void AddOpsAndParams(tflite::Interpreter *interpreter, ANeuralNetworksModel *nn_
         nn_op_type = -1; // set to invalid
         break;
       case tflite::BuiltinOperator_CUSTOM:
+        std::string custom_name(registration.custom_name);
+        if (custom_name.compare("TensorFlowMax") == 0)
+        {
+          CHECK_NN(ANeuralNetworksModel_addOperationEx(
+              nn_model, ANEURALNETWORKS_TENSORFLOW_MAX_EX,
+              static_cast<uint32_t>(augmented_inputs.size()), augmented_inputs.data(),
+              static_cast<uint32_t>(node.outputs->size),
+              reinterpret_cast<uint32_t *>(node.outputs->data)));
+          continue;
+        }
+
         FATAL("Custom operations are not supported when using NNAPI.");
         nn_op_type = -1; // set to invalid
         break;

diff --git a/tools/tflite_run/src/operators.cc b/tools/tflite_run/src/operators.cc
index 626d871..c1a2997 100644 (file)
--- a/tools/tflite_run/src/operators.cc
+++ b/tools/tflite_run/src/operators.cc
@@ -569,11 +569,12 @@ TfLiteStatus EvalSquaredDifference(TfLiteContext *context, TfLiteNode *node)
 }
 }
 
-#define REGISTER_FUNCTION(Name)                                                                \
-  TfLiteRegistration *Register_##Name(void)                                                    \
-  {                                                                                            \
-    static TfLiteRegistration r = {::Init##Name, ::Free##Name, ::Prepare##Name, ::Eval##Name}; \
-    return &r;                                                                                 \
+#define REGISTER_FUNCTION(Name)                                                                  \
+  TfLiteRegistration *Register_##Name(void)                                                      \
+  {                                                                                              \
+    static TfLiteRegistration r = {::Init##Name, ::Free##Name, ::Prepare##Name, ::Eval##Name, 0, \
+                                   #Name};                                                       \
+    return &r;                                                                                   \
   }
 REGISTER_FUNCTION(CAST)
 REGISTER_FUNCTION(Stack)