diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2020-08-27 09:06:40 +0100 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2020-08-27 09:06:40 +0100 |
commit | 43528ac476836b225b076fbced7a73a8c87e277c (patch) | |
tree | 962f432255a49ea91c956383c39938f102b66eac /src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp | |
parent | 8702007eb96dd857776763f045052cc8815d9350 (diff) | |
download | armnn-43528ac476836b225b076fbced7a73a8c87e277c.tar.gz |
IVGCVSW-5251 'Remove CreateTensorHandle for ArgMinMaxTestImpl'
* Refactored ArgMinMax tests to use TensorHandleFactory instead of WorkloadFactory
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Ibff0f9370972f9a0a977c05275cb6168f8f88ae5
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp | 142 |
1 files changed, 90 insertions, 52 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp index c2aad3d4fb..153d7269f7 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -18,7 +18,8 @@ namespace template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<int32_t, 3> ArgMinMaxTestCommon( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::IBackendInternal::IMemoryManagerSharedPtr&, + armnn::ITensorHandleFactory* tensorHandleFactory, armnn::ArgMinMaxFunction argMinMaxFunction, const armnn::TensorInfo inputTensorInfo, const armnn::TensorInfo outputTensorInfo, @@ -26,16 +27,13 @@ LayerTestResult<int32_t, 3> ArgMinMaxTestCommon( const std::vector<int32_t>& outputData, int axis = 3) { - IgnoreUnused(memoryManager); auto inputTensor = MakeTensor<T, 4>(inputTensorInfo, ConvertToDataType<ArmnnType>(inputData, inputTensorInfo)); LayerTestResult<int32_t, 3> result(outputTensorInfo); result.outputExpected = MakeTensor<int32_t, 3>(outputTensorInfo, outputData); - ARMNN_NO_DEPRECATE_WARN_BEGIN - std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); - std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); - ARMNN_NO_DEPRECATE_WARN_END + std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory->CreateTensorHandle(inputTensorInfo); + std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory->CreateTensorHandle(outputTensorInfo); armnn::ArgMinMaxQueueDescriptor descriptor; descriptor.m_Parameters.m_Function = argMinMaxFunction; @@ -65,7 +63,8 @@ LayerTestResult<int32_t, 3> ArgMinMaxTestCommon( template<armnn::DataType ArmnnType, typename T> LayerTestResult<int32_t, 3> ArgMaxSimpleTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory) { const armnn::TensorShape inputShape{ 1, 1, 1, 5 }; const armnn::TensorShape outputShape{ 1, 1, 1 }; @@ -83,7 +82,7 @@ LayerTestResult<int32_t, 3> ArgMaxSimpleTest( std::vector<float> inputValues({ 5.0f, 2.0f, 8.0f, 10.0f, 9.0f }); std::vector<int32_t> outputValues({ 3 }); - return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, + return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, tensorHandleFactory, armnn::ArgMinMaxFunction::Max, inputTensorInfo, outputTensorInfo, inputValues, outputValues, -1); // axis -1 === 3 @@ -92,7 +91,8 @@ LayerTestResult<int32_t, 3> ArgMaxSimpleTest( template<armnn::DataType ArmnnType, typename T> LayerTestResult<int32_t, 3> ArgMinSimpleTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory) { const armnn::TensorShape inputShape{ 1, 1, 1, 5 }; const armnn::TensorShape outputShape{ 1, 1, 1 }; @@ -110,7 +110,7 @@ LayerTestResult<int32_t, 3> ArgMinSimpleTest( std::vector<float> inputValues({ 5.0f, 2.0f, 8.0f, 10.0f, 9.0f }); std::vector<int32_t> outputValues({ 1 }); - return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, + return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, tensorHandleFactory, armnn::ArgMinMaxFunction::Min, inputTensorInfo, outputTensorInfo, inputValues, outputValues, 3); @@ -119,7 +119,8 @@ LayerTestResult<int32_t, 3> ArgMinSimpleTest( template<armnn::DataType ArmnnType, typename T> LayerTestResult<int32_t, 3> ArgMinChannelTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory) { const armnn::TensorShape inputShape{ 1, 3, 2, 4}; const armnn::TensorShape outputShape{ 1, 2, 4 }; @@ -145,7 +146,7 @@ LayerTestResult<int32_t, 3> ArgMinChannelTest( std::vector<int32_t> outputValues({ 0, 0, 0, 0, 0, 0, 0, 0 }); - return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, + return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, tensorHandleFactory, armnn::ArgMinMaxFunction::Min, inputTensorInfo, outputTensorInfo, inputValues, outputValues, 1); @@ -154,7 +155,8 @@ LayerTestResult<int32_t, 3> ArgMinChannelTest( template<armnn::DataType ArmnnType, typename T> LayerTestResult<int32_t, 3> ArgMaxChannelTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory) { const armnn::TensorShape inputShape{ 1, 3, 2, 4}; const armnn::TensorShape outputShape{ 1, 2, 4 }; @@ -180,7 +182,7 @@ LayerTestResult<int32_t, 3> ArgMaxChannelTest( std::vector<int32_t> outputValues({ 2, 2, 2, 2, 2, 2, 2, 2 }); - return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, + return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, tensorHandleFactory, armnn::ArgMinMaxFunction::Max, inputTensorInfo, outputTensorInfo, inputValues, outputValues, 1); @@ -189,7 +191,8 @@ LayerTestResult<int32_t, 3> ArgMaxChannelTest( template<armnn::DataType ArmnnType, typename T> LayerTestResult<int32_t, 3> ArgMaxHeightTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory) { const armnn::TensorShape inputShape{ 1, 3, 2, 4}; const armnn::TensorShape outputShape{ 1, 3, 4 }; @@ -215,7 +218,7 @@ LayerTestResult<int32_t, 3> ArgMaxHeightTest( 1, 1, 1, 1, 1, 1, 1, 1 }); - return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, + return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, tensorHandleFactory, armnn::ArgMinMaxFunction::Max, inputTensorInfo, outputTensorInfo, inputValues, outputValues, 2); @@ -224,7 +227,8 @@ LayerTestResult<int32_t, 3> ArgMaxHeightTest( template<armnn::DataType ArmnnType, typename T> LayerTestResult<int32_t, 3> ArgMinWidthTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory) { const armnn::TensorShape inputShape{ 1, 3, 2, 4}; const armnn::TensorShape outputShape{ 1, 3, 2 }; @@ -250,7 +254,7 @@ LayerTestResult<int32_t, 3> ArgMinWidthTest( 0, 0, 0, 0 }); - return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, + return ArgMinMaxTestCommon<ArmnnType>(workloadFactory, memoryManager, tensorHandleFactory, armnn::ArgMinMaxFunction::Min, inputTensorInfo, outputTensorInfo, inputValues, outputValues, 3); @@ -262,169 +266,203 @@ LayerTestResult<int32_t, 3> ArgMinWidthTest( template LayerTestResult<int32_t, 3> ArgMaxSimpleTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxSimpleTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxSimpleTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxSimpleTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxSimpleTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxSimpleTest<armnn::DataType::Signed32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinSimpleTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinSimpleTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinSimpleTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinSimpleTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinSimpleTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinSimpleTest<armnn::DataType::Signed32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinChannelTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinChannelTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinChannelTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinChannelTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinChannelTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinChannelTest<armnn::DataType::Signed32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxChannelTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxChannelTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxChannelTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxChannelTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxChannelTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxChannelTest<armnn::DataType::Signed32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxHeightTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxHeightTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxHeightTest<armnn::DataType::Signed32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxHeightTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMaxHeightTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinWidthTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinWidthTest<armnn::DataType::Float16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinWidthTest<armnn::DataType::Signed32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinWidthTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); template LayerTestResult<int32_t, 3> ArgMinWidthTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + armnn::ITensorHandleFactory* tensorHandleFactory); |