commit 28c3d0f6459f2aafaa82cb2b21640d2323903ebe
author Kevin May <kevin.may@arm.com> Tue Jul 04 09:07:30 2023 +0100
committer TeresaARM <teresa.charlinreyes@arm.com> Wed Jul 12 14:38:01 2023 +0000
tree 0becc4463597d84383ce345688b871ba4c070156
parent 9f62d33156376c040dac9a4063dc733b95c5ad27

IVGCVSW-7846 Refactor ElementBinaryOps to use ElementBinaryLayer

* Refactor all functions to convert Add, Div, Maximum, Minimum, Mul
   and Sub to use ElementwiseBinary layers instead
* Add POW Operation support
* Add REDUCE_PROD Operation support

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I8c91980e585f7ff2561610084e7c6b48fb278171

shim/sl/canonical/Converter.hpp

diff --git a/shim/sl/canonical/Converter.hpp b/shim/sl/canonical/Converter.hpp
index 7e4a89e..bf660b9 100644
--- a/shim/sl/canonical/Converter.hpp
+++ b/shim/sl/canonical/Converter.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022-2023 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -31,8 +31,6 @@
     static bool ConvertOperation(const Operation& operation, const Model& model, ConversionData& data);
 
 private:
-    static bool ConvertAdd(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertArgMinMax(const Operation& operation,
                                  const Model& model,
                                  ConversionData& data,
@@ -61,13 +59,16 @@
 
     static bool ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data);
 
-    static bool ConvertDiv(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertElementwiseUnary(const Operation& operation,
                                         const Model& model,
                                         ConversionData& data,
                                         armnn::UnaryOperation unaryOperation);
 
+    static bool ConvertElementwiseBinary(const Operation& operation,
+                                         const Model& model,
+                                         ConversionData& data,
+                                         armnn::BinaryOperation binaryOperation);
+
     static bool ConvertElu(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertExpandDims(const Operation& operation, const Model& model, ConversionData& data);
@@ -107,14 +108,8 @@
 
     static bool ConvertMaxPool2d(const Operation& operation, const Model& model, ConversionData& data);
 
-    static bool ConvertMaximum(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertMean(const Operation& operation, const Model& model, ConversionData& data);
 
-    static bool ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data);
-
-    static bool ConvertMul(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertPad(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertPadV2(const Operation& operation, const Model& model, ConversionData& data);
@@ -154,8 +149,6 @@
 
     static bool ConvertStridedSlice(const Operation& operation, const Model& model, ConversionData& data);
 
-    static bool ConvertSub(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertTanH(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertTranspose(const Operation& operation, const Model& model, ConversionData& data);