From 59a950cefe927d002aa00d7c3af54f4389e00162 Mon Sep 17 00:00:00 2001 From: Matteo Martincigh Date: Thu, 13 Dec 2018 12:48:25 +0000 Subject: IVGCVSW-2377 Add no-op factory implementations for all backends for the Greater operation * Added QueueDescriptor in WorkloadData.hpp * Added CreateGreater function in WorkloadFactory.hpp * Added stub implementation of the CreateGreater function in RefWorkloadFactory, NeonWorkloadFactory and ClWorkloadFactory * Added GreaterLayer stub implementation * Renamed ArithmeticBaseLayer to ElementwiseBaseLayer Change-Id: I7e38c2936de905da921a92ba3f918478169ec7f5 --- src/backends/backendsCommon/ILayerSupport.cpp | 8 ++++++++ src/backends/backendsCommon/WorkloadData.hpp | 5 +++++ src/backends/backendsCommon/WorkloadFactory.cpp | 11 +++++++++++ src/backends/backendsCommon/WorkloadFactory.hpp | 3 +++ .../backendsCommon/test/IsLayerSupportedTestImpl.hpp | 16 +++++++++------- src/backends/cl/ClWorkloadFactory.cpp | 6 ++++++ src/backends/cl/ClWorkloadFactory.hpp | 3 +++ src/backends/neon/NeonWorkloadFactory.cpp | 6 ++++++ src/backends/neon/NeonWorkloadFactory.hpp | 3 +++ src/backends/reference/RefWorkloadFactory.cpp | 6 ++++++ src/backends/reference/RefWorkloadFactory.hpp | 3 +++ 11 files changed, 63 insertions(+), 7 deletions(-) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/ILayerSupport.cpp b/src/backends/backendsCommon/ILayerSupport.cpp index 3f2636c61a..3718df1347 100644 --- a/src/backends/backendsCommon/ILayerSupport.cpp +++ b/src/backends/backendsCommon/ILayerSupport.cpp @@ -320,4 +320,12 @@ bool ILayerSupport::IsSubtractionSupported(const TensorInfo& input0, return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool ILayerSupport::IsGreaterSupported(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + Optional reasonIfUnsupported) const +{ + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); +} + } // namespace armnn diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index b4bcfb0104..88b0d5e5c5 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -357,6 +357,11 @@ struct MinimumQueueDescriptor : QueueDescriptor void Validate(const WorkloadInfo& workloadInfo) const; }; +struct GreaterQueueDescriptor : QueueDescriptor +{ + void Validate(const WorkloadInfo& workloadInfo) const; +}; + struct DebugQueueDescriptor : QueueDescriptorWithParameters { void Validate(const WorkloadInfo& workloadInfo) const; diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index 915d667fed..d7704ffad4 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -666,6 +666,17 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, reason); break; } + case LayerType::Greater: + { + const TensorInfo& input0 = layer.GetInputSlot(0).GetConnection()->GetTensorInfo(); + const TensorInfo& input1 = layer.GetInputSlot(1).GetConnection()->GetTensorInfo(); + const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo(); + result = layerSupportObject->IsGreaterSupported(OverrideDataType(input0, dataType), + OverrideDataType(input1, dataType), + OverrideDataType(output, dataType), + reason); + break; + } default: { BOOST_ASSERT_MSG(false, "WorkloadFactory did not recognise type of layer."); diff --git a/src/backends/backendsCommon/WorkloadFactory.hpp b/src/backends/backendsCommon/WorkloadFactory.hpp index eb24b64dd7..57f61968c1 100644 --- a/src/backends/backendsCommon/WorkloadFactory.hpp +++ b/src/backends/backendsCommon/WorkloadFactory.hpp @@ -148,6 +148,9 @@ public: virtual std::unique_ptr CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; + virtual std::unique_ptr CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const = 0; + virtual std::unique_ptr CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const = 0; }; diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index e267988786..dc4f05eec4 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -342,6 +342,8 @@ DECLARE_LAYER_POLICY_1_PARAM(Floor) DECLARE_LAYER_POLICY_2_PARAM(FullyConnected) +DECLARE_LAYER_POLICY_1_PARAM(Greater) + DECLARE_LAYER_POLICY_CUSTOM_PARAM(Input, armnn::LayerBindingId) DECLARE_LAYER_POLICY_2_PARAM(L2Normalization) @@ -516,7 +518,7 @@ template bool IsLayerSupportedTestsImpl(FactoryType *factory, Tag) { return IsLayerSupportedTest(factory, Tag()); -}; +} // Recursive function to test and enter in the LayerType enum and then iterate on the next entry. template @@ -527,14 +529,14 @@ bool IsLayerSupportedTestsImpl(FactoryType *factory, Tag) return v && IsLayerSupportedTestsImpl (factory, Tag()); -}; +} // Helper function to pass through to the test framework. template bool IsLayerSupportedTests(FactoryType *factory) { return IsLayerSupportedTestsImpl(factory, Tag()); -}; +} template bool TestLayerTypeMatches() @@ -549,20 +551,20 @@ bool TestLayerTypeMatches() bool v = Type == layer.m_Layer->GetType(); BOOST_CHECK_MESSAGE(v, ss.str()); return v; -}; +} template bool LayerTypeMatchesTestImpl(Tag) { return TestLayerTypeMatches(); -}; +} template bool LayerTypeMatchesTestImpl(Tag) { return TestLayerTypeMatches() && LayerTypeMatchesTestImpl(Tag()); -}; +} template bool IsConvertLayerSupportedTests(std::string& reasonIfUnsupported) @@ -584,6 +586,6 @@ bool IsConvertLayerSupportedTests(std::string& reasonIfUnsupported) bool result = FactoryType::IsLayerSupported(*layer, InputDataType, reasonIfUnsupported); return result; -}; +} } //namespace diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index dfe627209c..ebd957b903 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -332,6 +332,12 @@ std::unique_ptr ClWorkloadFactory::CreateMinimum(const MinimumQueueDe return MakeWorkload(descriptor, info); } +std::unique_ptr ClWorkloadFactory::CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + std::unique_ptr ClWorkloadFactory::CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index e2c80de7af..70052c41e0 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -138,6 +138,9 @@ public: virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index aed2d56646..d7de17a83d 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -300,6 +300,12 @@ std::unique_ptr NeonWorkloadFactory::CreateMinimum(const MinimumQueue return MakeWorkloadHelper(descriptor, info); } +std::unique_ptr NeonWorkloadFactory::CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkloadHelper(descriptor, info); +} + std::unique_ptr NeonWorkloadFactory::CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/neon/NeonWorkloadFactory.hpp b/src/backends/neon/NeonWorkloadFactory.hpp index e95389433b..115dfb0458 100644 --- a/src/backends/neon/NeonWorkloadFactory.hpp +++ b/src/backends/neon/NeonWorkloadFactory.hpp @@ -139,6 +139,9 @@ public: virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index ac837d3acc..b34de8649b 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -294,6 +294,12 @@ std::unique_ptr RefWorkloadFactory::CreateStridedSlice(const StridedS return MakeWorkload(descriptor, info); } +std::unique_ptr RefWorkloadFactory::CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + std::unique_ptr RefWorkloadFactory::CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/reference/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index 9ee1fe5aa3..03b349db97 100644 --- a/src/backends/reference/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -156,6 +156,9 @@ public: virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateGreater(const GreaterQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateDebug(const DebugQueueDescriptor& descriptor, const WorkloadInfo& info) const override; private: -- cgit v1.2.1