diff options
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp')
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp index 283bfd9502..ba827b1860 100644 --- a/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/MeanTestImpl.hpp @@ -19,6 +19,7 @@ template<armnn::DataType ArmnnType, typename T, std::size_t InputDim, std::size_ LayerTestResult<T, OutputDim> MeanTestHelper( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory, const unsigned int* inputShape, const std::vector<float>& inputData, const std::vector<unsigned int>& axis, @@ -45,10 +46,8 @@ LayerTestResult<T, OutputDim> MeanTestHelper( result.outputExpected = MakeTensor<T, OutputDim>( outputTensorInfo, ConvertToDataType<ArmnnType>(outputData, outputTensorInfo)); - 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::MeanQueueDescriptor data; data.m_Parameters.m_Axis = axis; @@ -77,7 +76,8 @@ LayerTestResult<T, OutputDim> MeanTestHelper( template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 1> MeanSimpleTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 3, 2 }; const unsigned int outputShape[] = { 1 }; @@ -86,13 +86,14 @@ LayerTestResult<T, 1> MeanSimpleTest( std::vector<float> output({ 2.5f }); return MeanTestHelper<ArmnnType, T, 2, 1>( - workloadFactory, memoryManager, inputShape, input, {}, false, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, inputShape, input, {}, false, outputShape, output); } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 3> MeanSimpleAxisTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 2, 3, 1, 2 }; const unsigned int outputShape[] = { 3, 1, 2 }; @@ -101,13 +102,14 @@ LayerTestResult<T, 3> MeanSimpleAxisTest( std::vector<float> output({ 1.5f, 2.5f, 3.5f, 4.5f, 5.5f, 6.5f }); return MeanTestHelper<ArmnnType, T, 4, 3>( - workloadFactory, memoryManager, inputShape, input, { 0 }, false, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, inputShape, input, { 0 }, false, outputShape, output); } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 4> MeanKeepDimsTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 1, 1, 3, 2 }; const unsigned int outputShape[] = { 1, 1, 1, 2 }; @@ -116,13 +118,14 @@ LayerTestResult<T, 4> MeanKeepDimsTest( std::vector<float> output({ 2.5f, 2.5f }); return MeanTestHelper<ArmnnType, T, 4, 4>( - workloadFactory, memoryManager, inputShape, input, { 2 }, true, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, inputShape, input, { 2 }, true, outputShape, output); } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 4> MeanMultipleDimsTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 2, 3, 1, 2 }; const unsigned int outputShape[] = { 1, 3, 1, 1 }; @@ -131,13 +134,15 @@ LayerTestResult<T, 4> MeanMultipleDimsTest( std::vector<float> output({ 2.0f, 4.0f, 6.0f }); return MeanTestHelper<ArmnnType, T, 4, 4>( - workloadFactory, memoryManager, inputShape, input, { 0, 3 }, true, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, + inputShape, input, { 0, 3 }, true, outputShape, output); } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 1> MeanVts1Test( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 4, 3, 2 }; const unsigned int outputShape[] = { 2 }; @@ -147,13 +152,15 @@ LayerTestResult<T, 1> MeanVts1Test( std::vector<float> output({ 12.0f, 13.0f }); return MeanTestHelper<ArmnnType, T, 3, 1>( - workloadFactory, memoryManager, inputShape, input, { 0, 1 }, false, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, + inputShape, input, { 0, 1 }, false, outputShape, output); } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 3> MeanVts2Test( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 4, 3, 2 }; const unsigned int outputShape[] = { 1, 3, 1 }; @@ -163,13 +170,15 @@ LayerTestResult<T, 3> MeanVts2Test( std::vector<float> output({ 10.5f, 12.5f, 14.5f }); return MeanTestHelper<ArmnnType, T, 3, 3>( - workloadFactory, memoryManager, inputShape, input, { 0, 2 }, true, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, + inputShape, input, { 0, 2 }, true, outputShape, output); } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 3> MeanVts3Test( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { const unsigned int inputShape[] = { 1, 2, 2, 1 }; const unsigned int outputShape[] = { 1, 2, 1 }; @@ -178,5 +187,5 @@ LayerTestResult<T, 3> MeanVts3Test( std::vector<float> output({ 1.5f, 3.5f }); return MeanTestHelper<ArmnnType, T, 4, 3>( - workloadFactory, memoryManager, inputShape, input, { 2 }, false, outputShape, output); + workloadFactory, memoryManager, tensorHandleFactory, inputShape, input, { 2 }, false, outputShape, output); } |