From 00a963bb81bd18e7245dc324b44b7c57baa07c05 Mon Sep 17 00:00:00 2001
From: josh minor <josh.minor@arm.com>
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 <josh.minor@arm.com>
Change-Id: I043bf64ac7ed3aea65560d72acf664e079917baf
Signed-off-by: josh minor <josh.minor@arm.com>
---
 ConversionUtils.hpp | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)

(limited to 'ConversionUtils.hpp')

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index a0ab9e5a..f8622dd6 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -3591,50 +3591,4 @@ bool ConvertSpaceToBatchNd(const HalOperation& operation, const HalModel& model,
     return SetupAndTrackLayerOutputSlot<HalPolicy>(operation, 0, *layer, model, data);
 }
 
-template<typename HalPolicy,
-         typename HalOperation = typename HalPolicy::Operation,
-         typename HalModel     = typename HalPolicy::Model>
-bool ConvertAbs(const HalOperation& operation, const HalModel& model, ConversionData& data)
-{
-    LayerInputHandle input = ConvertToLayerInputHandle<HalPolicy>(operation, 0, model, data);
-
-    if (!input.IsValid())
-    {
-        return Fail("%s: Operation has invalid input", __func__);
-    }
-
-    using HalOperand = typename HalPolicy::Operand;
-    const HalOperand* output = GetOutputOperand<HalPolicy>(operation, 0, model);
-    if (!output)
-    {
-        return Fail("%s: Could not read output 0", __func__);
-    }
-
-    const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output);
-    if (IsDynamicTensor(outputInfo))
-    {
-        return Fail("%s: Dynamic output tensors are not supported", __func__);
-    }
-
-    bool isSupported = false;
-    FORWARD_LAYER_SUPPORT_FUNC(__func__,
-                               IsAbsSupported,
-                               data.m_Backends,
-                               isSupported,
-                               input.GetTensorInfo(),
-                               outputInfo);
-
-    if (!isSupported)
-    {
-        return false;
-    }
-
-    armnn::IConnectableLayer* const layer = data.m_Network->AddAbsLayer();
-    assert(layer != nullptr);
-    input.Connect(layer->GetInputSlot(0));
-
-    return SetupAndTrackLayerOutputSlot<HalPolicy>(operation, 0, *layer, model, data);
-}
-
-
 } // namespace armnn_driver
-- 
cgit v1.2.1