From b28e525233d43b2aaea4da56acdbe9914cb41b5b Mon Sep 17 00:00:00 2001
From: Francis Murtagh <francis.murtagh@arm.com>
Date: Wed, 9 Feb 2022 14:36:04 +0000
Subject: IVGCVSW-6399 Remove deprecated code 22.02

 * Remove LayerSupport.hpp which was replaced with ILayerSupport interface
   and the BackendHelper.hpp GetILayerSupportByBackendId() function
 * Fix bug in backend helper where value of Optional was passed even if
   Optional had no value.

Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I03f1f693abe927a14c1942ef7e21edccc8357b35
---
 .../test/layerTests/NormalizationTestImpl.cpp      | 10 +++++-----
 .../test/layerTests/Pooling2dTestImpl.cpp          | 23 +++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/backends/backendsCommon/test')

diff --git a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp
index 9c21c7d01f..6ba3e6b94a 100644
--- a/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/NormalizationTestImpl.cpp
@@ -6,11 +6,12 @@
 #include "NormalizationTestImpl.hpp"
 
 #include <armnn/Exceptions.hpp>
-#include <armnn/LayerSupport.hpp>
 
 #include <armnn/utility/NumericCast.hpp>
 
 #include <armnn/backends/TensorHandle.hpp>
+#include <armnn/backends/ILayerSupport.hpp>
+#include <armnn/BackendHelper.hpp>
 
 #include <armnnTestUtils/TensorCopyUtils.hpp>
 #include <armnnTestUtils/WorkloadTestUtils.hpp>
@@ -350,10 +351,9 @@ LayerTestResult<float,4> CompareNormalizationTestImpl(
 
     // Don't execute if Normalization is not supported for the method and channel types, as an exception will be raised.
     armnn::BackendId backend = workloadFactory.GetBackendId();
-    const size_t reasonIfUnsupportedMaxLen = 255;
-    char reasonIfUnsupported[reasonIfUnsupportedMaxLen+1];
-    ret.m_Supported = armnn::IsNormalizationSupported(backend, inputTensorInfo, outputTensorInfo, data.m_Parameters,
-                                                      reasonIfUnsupported, reasonIfUnsupportedMaxLen);
+    auto handle = armnn::GetILayerSupportByBackendId(backend);
+    ret.m_Supported = handle.IsNormalizationSupported(inputTensorInfo, outputTensorInfo, data.m_Parameters);
+
     if (!ret.m_Supported)
     {
         return ret;
diff --git a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp
index 2d2a5922b5..11605f0b28 100644
--- a/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp
@@ -8,8 +8,6 @@
 #include <armnnUtils/QuantizeHelper.hpp>
 #include <ResolveType.hpp>
 
-#include <armnn/LayerSupport.hpp>
-
 #include <armnnUtils/TensorUtils.hpp>
 #include <armnnUtils/DataLayoutIndexed.hpp>
 #include <armnnUtils/Permute.hpp>
@@ -17,6 +15,7 @@
 #include <armnn/utility/IgnoreUnused.hpp>
 #include <armnn/utility/NumericCast.hpp>
 
+#include <armnn/BackendHelper.hpp>
 #include <backendsCommon/WorkloadInfo.hpp>
 
 #include <armnnTestUtils/TensorCopyUtils.hpp>
@@ -90,11 +89,11 @@ LayerTestResult<T, 4> SimplePooling2dTestImpl(
 
     // Don't execute if Pooling is not supported, as an exception will be raised.
     armnn::BackendId backend = workloadFactory.GetBackendId();
-    const size_t reasonIfUnsupportedMaxLen = 255;
-    char reasonIfUnsupported[reasonIfUnsupportedMaxLen+1];
-    result.m_Supported = armnn::IsPooling2dSupported(backend, inputTensorInfo, outputTensorInfo,
-                                                     queueDescriptor.m_Parameters,
-                                                     reasonIfUnsupported, reasonIfUnsupportedMaxLen);
+
+    auto handle = armnn::GetILayerSupportByBackendId(backend);
+    result.m_Supported = handle.IsPooling2dSupported(inputTensorInfo,
+                                                     outputTensorInfo,
+                                                     queueDescriptor.m_Parameters);
     if (!result.m_Supported)
     {
         return result;
@@ -817,11 +816,11 @@ LayerTestResult<T, 4> ComparePooling2dTestCommon(
 
     // Don't execute if Pooling is not supported, as an exception will be raised.
     armnn::BackendId backend = workloadFactory.GetBackendId();
-    const size_t reasonIfUnsupportedMaxLen = 255;
-    char reasonIfUnsupported[reasonIfUnsupportedMaxLen+1];
-    comparisonResult.m_Supported = armnn::IsPooling2dSupported(backend, inputTensorInfo, outputTensorInfo,
-                                                               data.m_Parameters,
-                                                               reasonIfUnsupported, reasonIfUnsupportedMaxLen);
+
+    auto handle = armnn::GetILayerSupportByBackendId(backend);
+    comparisonResult.m_Supported = handle.IsPooling2dSupported(inputTensorInfo,
+                                                              outputTensorInfo,
+                                                              data.m_Parameters);
     if (!comparisonResult.m_Supported)
     {
         return comparisonResult;
-- 
cgit v1.2.1