diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2022-02-09 14:36:04 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2022-02-09 16:11:31 +0000 |
| commit | b28e525233d43b2aaea4da56acdbe9914cb41b5b (patch) | |
| tree | 9efa418aadf5f075f03e619ffd1817d26b100738 /src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp | |
| parent | d0b4aa97d5389adc6a4c87f5704503b8bb22441e (diff) | |
| download | armnn-b28e525233d43b2aaea4da56acdbe9914cb41b5b.tar.gz | |
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
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp')
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/Pooling2dTestImpl.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
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; |