diff options
Diffstat (limited to 'src/backends/backendsCommon')
-rw-r--r-- | src/backends/backendsCommon/StringMapping.hpp | 2 | ||||
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.hpp | 1 | ||||
-rw-r--r-- | src/backends/backendsCommon/WorkloadFactory.hpp | 6 | ||||
-rwxr-xr-x | src/backends/backendsCommon/test/LayerTests.cpp | 83 | ||||
-rw-r--r-- | src/backends/backendsCommon/test/LayerTests.hpp | 12 |
5 files changed, 100 insertions, 4 deletions
diff --git a/src/backends/backendsCommon/StringMapping.hpp b/src/backends/backendsCommon/StringMapping.hpp index 8fca3d3f40..aa7fb6df61 100644 --- a/src/backends/backendsCommon/StringMapping.hpp +++ b/src/backends/backendsCommon/StringMapping.hpp @@ -22,6 +22,7 @@ public: RefMaximumWorkload_Execute, RefMultiplicationWorkload_Execute, RefDivisionWorkload_Execute, + RefMinimumWorkload_Execute, MAX_STRING_ID }; @@ -40,6 +41,7 @@ private: m_Strings[RefMaximumWorkload_Execute] = "RefMaximumWorkload_Execute"; m_Strings[RefMultiplicationWorkload_Execute] = "RefMultiplicationWorkload_Execute"; m_Strings[RefDivisionWorkload_Execute] = "RefDivisionWorkload_Execute"; + m_Strings[RefMinimumWorkload_Execute] = "RefMinimumWorkload_Execute"; } StringMapping(const StringMapping &) = delete; diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index ee1a054c41..b0c1e6a857 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -351,6 +351,7 @@ struct StridedSliceQueueDescriptor : QueueDescriptorWithParameters<StridedSliceD void Validate(const WorkloadInfo& workloadInfo) const; }; +// Minimum layer workload data. struct MinimumQueueDescriptor : QueueDescriptor { void Validate(const WorkloadInfo& workloadInfo) const; diff --git a/src/backends/backendsCommon/WorkloadFactory.hpp b/src/backends/backendsCommon/WorkloadFactory.hpp index 2c3c8aa091..eb24b64dd7 100644 --- a/src/backends/backendsCommon/WorkloadFactory.hpp +++ b/src/backends/backendsCommon/WorkloadFactory.hpp @@ -139,15 +139,15 @@ public: virtual std::unique_ptr<IWorkload> CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; + virtual std::unique_ptr<IWorkload> CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const = 0; + virtual std::unique_ptr<IWorkload> CreatePad(const PadQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; virtual std::unique_ptr<IWorkload> CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; - virtual std::unique_ptr<IWorkload> CreateMinimum(const MinimumQueueDescriptor& descriptor, - const WorkloadInfo& info) const = 0; - virtual std::unique_ptr<IWorkload> CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const = 0; }; diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index c3822bd7a6..131b84c859 100755 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -1655,6 +1655,15 @@ std::unique_ptr<armnn::IWorkload> CreateWorkload<armnn::MaximumQueueDescriptor>( return workloadFactory.CreateMaximum(descriptor, info); } +template<> +std::unique_ptr<armnn::IWorkload> CreateWorkload<armnn::MinimumQueueDescriptor>( + const armnn::IWorkloadFactory& workloadFactory, + const armnn::WorkloadInfo& info, + const armnn::MinimumQueueDescriptor& descriptor) +{ + return workloadFactory.CreateMinimum(descriptor, info); +} + namespace { template <typename Descriptor, typename dataType> LayerTestResult<dataType, 4> ElementwiseTestHelper @@ -1866,7 +1875,7 @@ LayerTestResult<uint8_t, 4> MaximumBroadcast1DVectorUint8Test( std::vector<uint8_t> output({ 1, 10, 3, 4, 10, 6, 7, 10, 9, 10, 11, 12 }); - return ElementwiseTestHelper<armnn::MaximumQueueDescriptor, uint8_t > + return ElementwiseTestHelper<armnn::MaximumQueueDescriptor, uint8_t> (workloadFactory, memoryManager, shape0, @@ -1879,6 +1888,78 @@ LayerTestResult<uint8_t, 4> MaximumBroadcast1DVectorUint8Test( 0); } +LayerTestResult<float, 4> MinimumBroadcast1ElementTest1( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + unsigned int shape0[] = { 1, 2, 2, 2 }; + std::vector<float> input0({ 1, 2, 3, 4, 5, 6, 7, 8}); + + unsigned int shape1[] = { 1, 1, 1, 1 }; + std::vector<float> input1({ 2 }); + + std::vector<float> output({ 1, 2, 2, 2, 2, 2, 2, 2}); + + return ElementwiseTestHelper<armnn::MinimumQueueDescriptor, float>(workloadFactory, + memoryManager, + shape0, + input0, + shape1, + input1, + shape0, + output); +} + + +LayerTestResult<float, 4> MinimumBroadcast1ElementTest2( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + unsigned int shape0[] = { 1, 2, 2, 2 }; + std::vector<float> input0({ 1, 6, 3, 2, 8, 9, 1, 10}); + + unsigned int shape1[] = { 1, 1, 1, 1 }; + std::vector<float> input1({ 5 }); + + std::vector<float> output({ 1, 5, 3, 2, 5, 5, 1, 5}); + + return ElementwiseTestHelper<armnn::MinimumQueueDescriptor, float>(workloadFactory, + memoryManager, + shape0, + input0, + shape1, + input1, + shape0, + output); +} + +LayerTestResult<uint8_t, 4> MinimumBroadcast1DVectorUint8Test( + armnn::IWorkloadFactory & workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr & memoryManager) +{ + const unsigned int shape0[] = { 1, 2, 2, 3 }; + const unsigned int shape1[] = { 1, 1, 1, 3 }; + + std::vector<uint8_t> input0({ 1, 2, 3, 3, 2, 1, + 7, 1, 2, 3, 4, 5 }); + + std::vector<uint8_t> input1({ 1, 2, 3}); + + std::vector<uint8_t> output({ 1, 2, 3, 1, 2, 1, + 1, 1, 2, 1, 2, 3 }); + + return ElementwiseTestHelper<armnn::MinimumQueueDescriptor, uint8_t>(workloadFactory, + memoryManager, + shape0, + input0, + shape1, + input1, + shape0, + output, + 1.0f, + 0); +} + namespace { LayerTestResult<float,4> MultiplicationTestHelper( armnn::IWorkloadFactory& workloadFactory, diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index fa1c864ba5..1797f9fa5e 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -1008,6 +1008,18 @@ LayerTestResult<float, 3> MeanVtsFloat3Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); +LayerTestResult<float, 4> MinimumBroadcast1ElementTest1( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 4> MinimumBroadcast1ElementTest2( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<uint8_t, 4> MinimumBroadcast1DVectorUint8Test( + armnn::IWorkloadFactory & workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr & memoryManager); + LayerTestResult<float, 4> AdditionAfterMaxPoolTest( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); |