From 623069d554d9eaeaf26a80d800818b027b294211 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Fri, 14 Aug 2020 17:24:39 +0100 Subject: IVGCVSW-5218 Remove CreateTensorHandle from DetectionPostProcess and Prelu * Remove default arguments in Neon and CL causing ambiguity Signed-off-by: Francis Murtagh Change-Id: I314885719a16311b68c7bda37cd54b2ca0d14480 --- .../test/layerTests/DetectionPostProcessTestImpl.hpp | 15 ++++++++------- .../backendsCommon/test/layerTests/PreluTestImpl.hpp | 10 ++++++---- src/backends/cl/ClTensorHandleFactory.hpp | 4 ++-- src/backends/cl/test/ClLayerTests.cpp | 4 ++-- src/backends/neon/NeonTensorHandleFactory.hpp | 2 +- src/backends/neon/test/NeonLayerTests.cpp | 4 ++-- src/backends/reference/test/RefLayerTests.cpp | 8 ++++---- 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::GetMemoryManager(); FactoryType workloadFactory = WorkloadFactoryHelper::GetFactory(memoryManager); + auto tensorHandleFactory = WorkloadFactoryHelper::GetTensorHandleFactory(memoryManager); auto boxEncodings = MakeTensor(boxEncodingsInfo, boxEncodingsData); auto scores = MakeTensor(scoresInfo, scoresData); @@ -172,13 +173,13 @@ void DetectionPostProcessImpl(const armnn::TensorInfo& boxEncodingsInfo, LayerTestResult numDetectionsResult(numDetectionInfo); numDetectionsResult.outputExpected = MakeTensor(numDetectionInfo, expectedNumDetections); - std::unique_ptr boxedHandle = workloadFactory.CreateTensorHandle(boxEncodingsInfo); - std::unique_ptr scoreshandle = workloadFactory.CreateTensorHandle(scoresInfo); - std::unique_ptr anchorsHandle = workloadFactory.CreateTensorHandle(anchorsInfo); - std::unique_ptr outputBoxesHandle = workloadFactory.CreateTensorHandle(detectionBoxesInfo); - std::unique_ptr classesHandle = workloadFactory.CreateTensorHandle(detectionClassesInfo); - std::unique_ptr outputScoresHandle = workloadFactory.CreateTensorHandle(detectionScoresInfo); - std::unique_ptr 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 #include +#include #include #include -template> +template> LayerTestResult PreluTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) @@ -76,9 +77,10 @@ LayerTestResult PreluTest( outputTensorInfo.GetQuantizationScale(), outputTensorInfo.GetQuantizationOffset())); - std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); - std::unique_ptr alphaHandle = workloadFactory.CreateTensorHandle(alphaTensorInfo); - std::unique_ptr outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo); + auto tensorHandleFactory = WorkloadFactoryHelper::GetTensorHandleFactory(memoryManager); + std::unique_ptr inputHandle = tensorHandleFactory.CreateTensorHandle(inputTensorInfo); + std::unique_ptr alphaHandle = tensorHandleFactory.CreateTensorHandle(alphaTensorInfo); + std::unique_ptr 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 CreateTensorHandle(const TensorInfo& tensorInfo, - const bool IsMemoryManaged = true) const override; + const bool IsMemoryManaged) const override; std::unique_ptr 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, 2.0f, 0) ARMNN_AUTO_TEST_CASE(Pad4dQSymm16, Pad4dTestCommon, 2.0f, 0) // PReLU -ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest) -ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest) // Permute ARMNN_AUTO_TEST_CASE(SimplePermuteFloat32, SimplePermuteTest) 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 CreateTensorHandle(const TensorInfo& tensorInfo, - const bool IsMemoryManaged = true) const override; + const bool IsMemoryManaged) const override; std::unique_ptr 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) -ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest) // 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) -ARMNN_AUTO_TEST_CASE(PreluFloat16, PreluTest) -ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest) -ARMNN_AUTO_TEST_CASE(PreluInt16, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluFloat32, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluFloat16, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluUint8, PreluTest) +ARMNN_AUTO_TEST_CASE(PreluInt16, PreluTest) // Slice ARMNN_AUTO_TEST_CASE(Slice4dFloat32, Slice4dFloat32Test) -- cgit v1.2.1