commit 00a963bb81bd18e7245dc324b44b7c57baa07c05
author josh minor <josh.minor@arm.com> Wed Jan 08 11:55:35 2020 -0600
committer josh minor <josh.minor@arm.com> Mon Jan 13 18:40:36 2020 -0600
tree 15954f0699be76dace93afbac20718778de8e00d
parent 1a38cdaefc5e53ba6bbaba54651dda459b81eafe

IVGCVSW-3813 Add Unary Elementwise Operation support to the android-nn-driver

* Account for deprecated Abs and Rsqrt layers in ArmNN
* Update HAL 1.2
* Neg HAL operation support added

!armnn:2542

Signed-off-by: josh minor <josh.minor@arm.com>
Change-Id: I043bf64ac7ed3aea65560d72acf664e079917baf
Signed-off-by: josh minor <josh.minor@arm.com>

1.2/HalPolicy.hpp

diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index 1f0b54d..e0a5c2f 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -31,8 +31,6 @@
     static bool ConvertOperation(const Operation& operation, const Model& model, ConversionData& data);
 
 private:
-    static bool ConvertAbs(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertAdd(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertArgMinMax(const Operation& operation,
@@ -63,6 +61,11 @@
 
     static bool ConvertExpandDims(const Operation& operation, const Model& model, ConversionData& data);
 
+    static bool ConvertElementwiseUnary(const Operation& operation,
+                                        const Model& model,
+                                        ConversionData& data,
+                                        armnn::UnaryOperation unaryOperation);
+
     static bool ConvertFloor(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertFullyConnected(const Operation& operation, const Model& model, ConversionData& data);
@@ -118,8 +121,6 @@
                               ConversionData& data,
                               armnn::ResizeMethod resizeMethod);
 
-    static bool ConvertRsqrt(const Operation& operation, const Model& model, ConversionData& data);
-
     static bool ConvertSoftmax(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data);