diff options
Diffstat (limited to 'src/backends/backendsCommon/test')
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp | 15 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp | 10 |
2 files changed, 14 insertions, 11 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp index b8a241dfe6..34ff31effc 100644 --- a/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/DetectionPostProcessTestImpl.hpp @@ -153,6 +153,7 @@ void DetectionPostProcessImpl(const armnn::TensorInfo& boxEncodingsInfo, auto memoryManager = WorkloadFactoryHelper<FactoryType>::GetMemoryManager(); FactoryType workloadFactory = WorkloadFactoryHelper<FactoryType>::GetFactory(memoryManager); + auto tensorHandleFactory = WorkloadFactoryHelper<FactoryType>::GetTensorHandleFactory(memoryManager); auto boxEncodings = MakeTensor<T, 3>(boxEncodingsInfo, boxEncodingsData); auto scores = MakeTensor<T, 3>(scoresInfo, scoresData); @@ -172,13 +173,13 @@ void DetectionPostProcessImpl(const armnn::TensorInfo& boxEncodingsInfo, LayerTestResult<float, 1> numDetectionsResult(numDetectionInfo); numDetectionsResult.outputExpected = MakeTensor<float, 1>(numDetectionInfo, expectedNumDetections); - std::unique_ptr<armnn::ITensorHandle> boxedHandle = workloadFactory.CreateTensorHandle(boxEncodingsInfo); - std::unique_ptr<armnn::ITensorHandle> scoreshandle = workloadFactory.CreateTensorHandle(scoresInfo); - std::unique_ptr<armnn::ITensorHandle> anchorsHandle = workloadFactory.CreateTensorHandle(anchorsInfo); - std::unique_ptr<armnn::ITensorHandle> outputBoxesHandle = workloadFactory.CreateTensorHandle(detectionBoxesInfo); - std::unique_ptr<armnn::ITensorHandle> classesHandle = workloadFactory.CreateTensorHandle(detectionClassesInfo); - std::unique_ptr<armnn::ITensorHandle> outputScoresHandle = workloadFactory.CreateTensorHandle(detectionScoresInfo); - std::unique_ptr<armnn::ITensorHandle> numDetectionHandle = workloadFactory.CreateTensorHandle(numDetectionInfo); + auto boxedHandle = tensorHandleFactory.CreateTensorHandle(boxEncodingsInfo); + auto scoreshandle = tensorHandleFactory.CreateTensorHandle(scoresInfo); + auto anchorsHandle = tensorHandleFactory.CreateTensorHandle(anchorsInfo); + auto outputBoxesHandle = tensorHandleFactory.CreateTensorHandle(detectionBoxesInfo); + auto classesHandle = tensorHandleFactory.CreateTensorHandle(detectionClassesInfo); + auto outputScoresHandle = tensorHandleFactory.CreateTensorHandle(detectionScoresInfo); + auto numDetectionHandle = tensorHandleFactory.CreateTensorHandle(numDetectionInfo); armnn::ScopedCpuTensorHandle anchorsTensor(anchorsInfo); AllocateAndCopyDataToITensorHandle(&anchorsTensor, &anchors[0][0]); diff --git a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp index 3b6c2d8412..de0b27b6c1 100644 --- a/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp +++ b/src/backends/backendsCommon/test/layerTests/PreluTestImpl.hpp @@ -15,11 +15,12 @@ #include <backendsCommon/WorkloadFactory.hpp> #include <backendsCommon/test/TensorCopyUtils.hpp> +#include <backendsCommon/test/WorkloadFactoryHelper.hpp> #include <backendsCommon/test/WorkloadTestUtils.hpp> #include <test/TensorHelpers.hpp> -template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> +template<typename FactoryType, armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> LayerTestResult<T, 4> PreluTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) @@ -76,9 +77,10 @@ LayerTestResult<T, 4> PreluTest( outputTensorInfo.GetQuantizationScale(), outputTensorInfo.GetQuantizationOffset())); - std::unique_ptr <armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); - std::unique_ptr <armnn::ITensorHandle> alphaHandle = workloadFactory.CreateTensorHandle(alphaTensorInfo); - std::unique_ptr <armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + auto tensorHandleFactory = WorkloadFactoryHelper<FactoryType>::GetTensorHandleFactory(memoryManager); + std::unique_ptr <armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputTensorInfo); + std::unique_ptr <armnn::ITensorHandle> alphaHandle = tensorHandleFactory.CreateTensorHandle(alphaTensorInfo); + std::unique_ptr <armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputTensorInfo); armnn::PreluQueueDescriptor descriptor; armnn::WorkloadInfo info; |