commit d21abaf5c9e899164484044e1e812739a779a6b8
author Ryan OShea <ryan.oshea3@arm.com> Fri Jun 10 14:49:11 2022 +0100
committer Keith Davis <keith.davis@arm.com> Wed Jun 15 12:13:06 2022 +0100
tree fde006cf3ead5014633b27f1743094d0625f51b4
parent 89ea0cfbc77086516d44af3bc69b1d8964576ac8

IVGCVSW-6946 Add Pool3D to tflite delegate

 * Add new test and test helper for Pool3d
 * Add new custom operator to switch in armnn_delegate.cpp
 * Add new pool3d function to pooling.hpp
 * Update doxygen

Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: I77a541bf423b337c749e70c564cdd727efe2fd05

delegate/src/armnn_delegate.cpp

diff --git a/delegate/src/armnn_delegate.cpp b/delegate/src/armnn_delegate.cpp
index 6e1a91f..bb2f3c3 100644
--- a/delegate/src/armnn_delegate.cpp
+++ b/delegate/src/armnn_delegate.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -495,6 +495,32 @@
 {
     switch (tfLiteRegistration->builtin_code)
     {
+        case kTfLiteBuiltinCustom:
+        {
+#if defined(ARMNN_POST_TFLITE_2_5)
+            // Custom operators are defined by the name rather than the builtin code.
+            // Parse the custom_name param in the registration to point to the correct visitor function.
+            std::string customOperatorName = tfLiteRegistration->custom_name;
+            if ( customOperatorName == "AveragePool3D" )
+            {
+                return VisitPooling3dOperator(delegateData,
+                                            tfLiteContext,
+                                            tfLiteNode,
+                                            nodeIndex,
+                                            customOperatorName);
+            }
+            else if (customOperatorName == "MaxPool3D")
+            {
+                return VisitPooling3dOperator(delegateData,
+                                            tfLiteContext,
+                                            tfLiteNode,
+                                            nodeIndex,
+                                            customOperatorName);
+            }
+#endif
+            // Invalid or unsupported custom operator
+            return kTfLiteError;
+        }
         case kTfLiteBuiltinAbs:
             return VisitElementwiseUnaryOperator(delegateData,
                                                  tfLiteContext,
@@ -520,7 +546,7 @@
                                           nodeIndex,
                                           kTfLiteBuiltinArgMin);
         case kTfLiteBuiltinAveragePool2d:
-            return VisitPoolingOperator(delegateData,
+            return VisitPooling2dOperator(delegateData,
                                         tfLiteContext,
                                         tfLiteNode,
                                         nodeIndex,
@@ -667,7 +693,7 @@
                                                 nodeIndex,
                                                 kTfLiteBuiltinL2Normalization);
         case kTfLiteBuiltinL2Pool2d:
-            return VisitPoolingOperator(delegateData,
+            return VisitPooling2dOperator(delegateData,
                                         tfLiteContext,
                                         tfLiteNode,
                                         nodeIndex,
@@ -729,7 +755,7 @@
                                      nodeIndex,
                                      kTfLiteBuiltinLstm);
         case kTfLiteBuiltinMaxPool2d:
-            return VisitPoolingOperator(delegateData,
+            return VisitPooling2dOperator(delegateData,
                                         tfLiteContext,
                                         tfLiteNode,
                                         nodeIndex,