diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2020-08-14 17:24:39 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-08-15 11:57:05 +0000 |
commit | 623069d554d9eaeaf26a80d800818b027b294211 (patch) | |
tree | 29b38ed61f19c41f265ba99482cbd73ca702a76b /src/backends | |
parent | 438de1be6189a6ea2ffe2d5f8c2b5e18549876de (diff) | |
download | armnn-623069d554d9eaeaf26a80d800818b027b294211.tar.gz |
IVGCVSW-5218 Remove CreateTensorHandle from DetectionPostProcess and Prelu
* Remove default arguments in Neon and CL causing ambiguity
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I314885719a16311b68c7bda37cd54b2ca0d14480
Diffstat (limited to 'src/backends')
7 files changed, 25 insertions, 22 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; diff --git a/src/backends/cl/ClTensorHandleFactory.hpp b/src/backends/cl/ClTensorHandleFactory.hpp index aab3faad0a..13c97c0b3c 100644 --- a/src/backends/cl/ClTensorHandleFactory.hpp +++ b/src/backends/cl/ClTensorHandleFactory.hpp @@ -34,11 +34,11 @@ public: DataLayout dataLayout) const override; std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo, - const bool IsMemoryManaged = true) const override; + const bool IsMemoryManaged) const override; std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo, DataLayout dataLayout, - const bool IsMemoryManaged = true) const override; + const bool IsMemoryManaged) const override; static const FactoryId& GetIdStatic(); diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index cdd3942d65..f191b20bef 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -499,8 +499,8 @@ ARMNN_AUTO_TEST_CASE(Pad3dQSymm16, Pad3dTestCommon<DataType::QSymmS16>, 2.0f, 0) ARMNN_AUTO_TEST_CASE(Pad4dQSymm16, Pad4dTestCommon<DataType::QSymmS16>, 2.0f, 0) // PReLU -ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest<DataType::Float32>) -ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest<DataType::QAsymmU8>) +ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest<ClWorkloadFactory, DataType::Float32>) +ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest<ClWorkloadFactory, DataType::QAsymmU8>) // Permute ARMNN_AUTO_TEST_CASE(SimplePermuteFloat32, SimplePermuteTest<DataType::Float32>) diff --git a/src/backends/neon/NeonTensorHandleFactory.hpp b/src/backends/neon/NeonTensorHandleFactory.hpp index 0930d4e8d7..ae45aadb7c 100644 --- a/src/backends/neon/NeonTensorHandleFactory.hpp +++ b/src/backends/neon/NeonTensorHandleFactory.hpp @@ -54,7 +54,7 @@ public: DataLayout dataLayout) const override; std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo, - const bool IsMemoryManaged = true) const override; + const bool IsMemoryManaged) const override; std::unique_ptr<ITensorHandle> CreateTensorHandle(const TensorInfo& tensorInfo, DataLayout dataLayout, diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 09832dc391..58029214a8 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -1094,8 +1094,8 @@ ARMNN_AUTO_TEST_CASE(QuantizeSimpleUint8, QuantizeSimpleUint8Test) ARMNN_AUTO_TEST_CASE(QuantizeClampUint8, QuantizeClampUint8Test) // PReLU -ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest<DataType::Float32>) -ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest<DataType::QAsymmU8>) +ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest<NeonWorkloadFactory, DataType::Float32>) +ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest<NeonWorkloadFactory, DataType::QAsymmU8>) // Stack ARMNN_AUTO_TEST_CASE(Stack0Axis, StackAxis0Float32Test) diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index f79e7e588f..45666de6f3 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -1881,10 +1881,10 @@ ARMNN_AUTO_TEST_CASE(QuantizeClampInt8, QuantizeClampInt8Test) ARMNN_AUTO_TEST_CASE(QuantizeClampInt16, QuantizeClampInt16Test) // PReLU -ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest<DataType::Float32>) -ARMNN_AUTO_TEST_CASE(PreluFloat16, PreluTest<DataType::Float16>) -ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest<DataType::QAsymmU8>) -ARMNN_AUTO_TEST_CASE(PreluInt16, PreluTest<DataType::QSymmS16>) +ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest<RefWorkloadFactory, DataType::Float32>) +ARMNN_AUTO_TEST_CASE(PreluFloat16, PreluTest<RefWorkloadFactory, DataType::Float16>) +ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest<RefWorkloadFactory, DataType::QAsymmU8>) +ARMNN_AUTO_TEST_CASE(PreluInt16, PreluTest<RefWorkloadFactory, DataType::QSymmS16>) // Slice ARMNN_AUTO_TEST_CASE(Slice4dFloat32, Slice4dFloat32Test) |