From 00a963bb81bd18e7245dc324b44b7c57baa07c05 Mon Sep 17 00:00:00 2001 From: josh minor Date: Wed, 8 Jan 2020 11:55:35 -0600 Subject: 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 Change-Id: I043bf64ac7ed3aea65560d72acf664e079917baf Signed-off-by: josh minor --- 1.2/HalPolicy.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to '1.2/HalPolicy.hpp') diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp index 1f0b54d7..e0a5c2fc 100644 --- a/1.2/HalPolicy.hpp +++ b/1.2/HalPolicy.hpp @@ -31,8 +31,6 @@ public: 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 @@ private: 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 @@ private: 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); -- cgit v1.2.1