diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-16 17:45:38 +0100 |
---|---|---|
committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-10-21 08:52:04 +0000 |
commit | 77bfb5e32faadb1383d48364a6f54adbff84ad80 (patch) | |
tree | 0bf5dfb48cb8d5c248baf716f02b9f481400316e /src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp | |
parent | 5884708e650a80e355398532bc320bbabdbb53f4 (diff) | |
download | armnn-77bfb5e32faadb1383d48364a6f54adbff84ad80.tar.gz |
IVGCVSW-3993 Add frontend and reference workload for ComparisonLayer
* Added frontend for ComparisonLayer
* Added RefComparisonWorkload
* Deprecated and removed Equal and Greater layers and workloads
* Updated tests to ensure backward compatibility
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Id50c880be1b567c531efff919c0c366d0a71cbe9
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp | 68 |
1 files changed, 21 insertions, 47 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp index 0148216285..271bc235a9 100644 --- a/src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/GreaterTestImpl.cpp @@ -4,18 +4,10 @@ // #include "GreaterTestImpl.hpp" -#include "ElementwiseTestImpl.hpp" -#include <Half.hpp> +#include "ComparisonTestImpl.hpp" -template<> -std::unique_ptr<armnn::IWorkload> CreateWorkload<armnn::GreaterQueueDescriptor>( - const armnn::IWorkloadFactory& workloadFactory, - const armnn::WorkloadInfo& info, - const armnn::GreaterQueueDescriptor& descriptor) -{ - return workloadFactory.CreateGreater(descriptor, info); -} +#include <Half.hpp> LayerTestResult<uint8_t, 4> GreaterSimpleTest(armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) @@ -45,12 +37,10 @@ LayerTestResult<uint8_t, 4> GreaterSimpleTest(armnn::IWorkloadFactory& workloadF 0, 0, 0, 0, 0, 0, 0, 0 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::Float32, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::Float32>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape, input0, shape, @@ -71,12 +61,10 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1ElementTest( std::vector<uint8_t> output = { 0, 1, 1, 1, 1, 1, 1, 1}; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::Float32, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::Float32>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape0, input0, shape1, @@ -106,12 +94,10 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1DVectorTest( 1, 1, 1, 1, 1, 1 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::Float32, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::Float32>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape0, input0, shape1, @@ -151,12 +137,10 @@ LayerTestResult<uint8_t, 4> GreaterFloat16Test( 0, 0, 0, 0, 0, 0, 0, 0 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::Float16, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4,armnn::DataType::Float16>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape, input0, shape, @@ -179,12 +163,10 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1ElementFloat16Test( std::vector<uint8_t> output = { 0, 1, 1, 1, 1, 1, 1, 1}; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::Float16, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::Float16>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape0, input0, shape1, @@ -198,7 +180,7 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1DVectorFloat16Test( const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { using namespace half_float::literal; - + const unsigned int shape0[] = { 1, 2, 2, 3 }; const unsigned int shape1[] = { 1, 1, 1, 3 }; @@ -216,12 +198,10 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1DVectorFloat16Test( 1, 1, 1, 1, 1, 1 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::Float16, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::Float16>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape0, input0, shape1, @@ -255,12 +235,10 @@ LayerTestResult<uint8_t, 4> GreaterUint8Test( 1, 1, 1, 1, 0, 0, 0, 0 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::QuantisedAsymm8, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::QuantisedAsymm8>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape, input0, shape, @@ -290,12 +268,10 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1ElementUint8Test( 1, 1, 1, 1, 1, 1 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::QuantisedAsymm8, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::QuantisedAsymm8>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape0, input0, shape1, @@ -325,12 +301,10 @@ LayerTestResult<uint8_t, 4> GreaterBroadcast1DVectorUint8Test( 1, 1, 1, 1, 1, 1 }; - return ElementwiseTestHelper<4, - armnn::GreaterQueueDescriptor, - armnn::DataType::QuantisedAsymm8, - armnn::DataType::Boolean>( + return ComparisonTestImpl<4, armnn::DataType::QuantisedAsymm8>( workloadFactory, memoryManager, + armnn::ComparisonDescriptor(armnn::ComparisonOperation::Greater), shape0, input0, shape1, |