diff options
author | Finn Williams <Finn.Williams@arm.com> | 2020-08-28 13:17:05 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-08-31 16:31:07 +0000 |
commit | ec36d3ee6619f1e777aa82c694ee2ec0433fc770 (patch) | |
tree | a075a265c8ca600193a76f87af93b432fb9dc40f /src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp | |
parent | 33a626f14c8db13967ba2a933388223d5bf733c3 (diff) | |
download | armnn-ec36d3ee6619f1e777aa82c694ee2ec0433fc770.tar.gz |
IVGCVSW-5256 Use CreateTensorHandle() function from TensorHandleFactory in the tests for layers Q,R & T
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I6fc613d31785298a0b7ed18f1abdd59bafed1e8e
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp index 1e528a0fdc..d233e89be8 100644 --- a/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ReshapeTestImpl.cpp @@ -18,6 +18,7 @@ template<typename T, size_t NumDims> LayerTestResult<T, NumDims> SimpleReshapeTestImpl( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory, armnn::TensorInfo inputTensorInfo, armnn::TensorInfo outputTensorInfo, const std::vector<T>& inputData, @@ -29,10 +30,8 @@ LayerTestResult<T, NumDims> SimpleReshapeTestImpl( LayerTestResult<T, NumDims> ret(outputTensorInfo); ret.outputExpected = MakeTensor<T, NumDims>(outputTensorInfo, outputExpectedData); - 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::ReshapeQueueDescriptor data; armnn::WorkloadInfo info; @@ -58,7 +57,8 @@ LayerTestResult<T, NumDims> SimpleReshapeTestImpl( template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 4> SimpleReshapeTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { armnn::TensorInfo inputTensorInfo; armnn::TensorInfo outputTensorInfo; @@ -104,13 +104,14 @@ LayerTestResult<T, 4> SimpleReshapeTest( outputTensorInfo); return SimpleReshapeTestImpl<T, 4>( - workloadFactory, memoryManager, inputTensorInfo, outputTensorInfo, input, outputExpected); + workloadFactory, memoryManager, tensorHandleFactory, inputTensorInfo, outputTensorInfo, input, outputExpected); } template<armnn::DataType ArmnnType, typename T> LayerTestResult<T, 5> Reshape5dTest( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) { armnn::TensorInfo inputTensorInfo; armnn::TensorInfo outputTensorInfo; @@ -166,7 +167,7 @@ LayerTestResult<T, 5> Reshape5dTest( outputTensorInfo); return SimpleReshapeTestImpl<T, 5>( - workloadFactory, memoryManager, inputTensorInfo, outputTensorInfo, input, outputExpected); + workloadFactory, memoryManager, tensorHandleFactory, inputTensorInfo, outputTensorInfo, input, outputExpected); } // @@ -176,39 +177,47 @@ LayerTestResult<T, 5> Reshape5dTest( template LayerTestResult<armnn::ResolveType<armnn::DataType::Float32>, 4> SimpleReshapeTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 4> SimpleReshapeTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 4> SimpleReshapeTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 4> SimpleReshapeTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::Float32>, 5> Reshape5dTest<armnn::DataType::Float32>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmS8>, 5> Reshape5dTest<armnn::DataType::QAsymmS8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::QAsymmU8>, 5> Reshape5dTest<armnn::DataType::QAsymmU8>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); template LayerTestResult<armnn::ResolveType<armnn::DataType::QSymmS16>, 5> Reshape5dTest<armnn::DataType::QSymmS16>( armnn::IWorkloadFactory& workloadFactory, - const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); |