From 5a4304a09fcbfd5fab4c73e5fd0d4cc9f3170395 Mon Sep 17 00:00:00 2001 From: Nattapat Chaimanowong Date: Wed, 28 Nov 2018 10:44:37 +0000 Subject: IVGCVSW-2253 Add maximum layer and corresponding no-op factory implementation Change-Id: I8964f5e8978c2d2a07734a381e3f7c656c22456a --- src/backends/backendsCommon/ILayerSupport.cpp | 8 ++++++++ src/backends/backendsCommon/WorkloadData.cpp | 13 +++++++++++++ src/backends/backendsCommon/WorkloadData.hpp | 6 ++++++ src/backends/backendsCommon/WorkloadFactory.cpp | 12 ++++++++++++ src/backends/backendsCommon/WorkloadFactory.hpp | 3 +++ .../backendsCommon/test/IsLayerSupportedTestImpl.hpp | 2 ++ 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 +++ 12 files changed, 71 insertions(+) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/ILayerSupport.cpp b/src/backends/backendsCommon/ILayerSupport.cpp index 55dd447369..28fd0a3748 100644 --- a/src/backends/backendsCommon/ILayerSupport.cpp +++ b/src/backends/backendsCommon/ILayerSupport.cpp @@ -183,6 +183,14 @@ bool ILayerSupport::IsLstmSupported(const TensorInfo& input, return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool ILayerSupport::IsMaximumSupported(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + Optional reasonIfUnsupported) const +{ + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); +} + bool ILayerSupport::IsMeanSupported(const TensorInfo& input, const TensorInfo& output, const MeanDescriptor& descriptor, diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index af57fee935..9c513177a3 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -887,6 +887,19 @@ void SubtractionQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) cons "second input"); } +void MaximumQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const +{ + ValidateTwoInputs(workloadInfo, "MaximumQueueDescriptor"); + ValidateSingleOutput(workloadInfo, "MaximumQueueDescriptor"); + + ValidateBroadcastTensorShapesMatch(workloadInfo.m_InputTensorInfos[0], + workloadInfo.m_InputTensorInfos[1], + workloadInfo.m_OutputTensorInfos[0], + "MaximumQueueDescriptor", + "first input", + "second input"); +} + void MeanQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const { ValidateSingleInput(workloadInfo, "MeanQueueDescriptor"); diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index 8cc60d0a96..58b141353b 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -199,6 +199,12 @@ struct SubtractionQueueDescriptor : QueueDescriptor void Validate(const WorkloadInfo& workloadInfo) const; }; +// Maximum layer workload data. +struct MaximumQueueDescriptor : QueueDescriptor +{ + void Validate(const WorkloadInfo& workloadInfo) const; +}; + // Mean layer workload data. struct MeanQueueDescriptor : QueueDescriptorWithParameters { diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index 2e2824e521..96b52ac972 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -450,6 +450,18 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, reason); break; } + case LayerType::Maximum: + { + 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->IsMaximumSupported(OverrideDataType(input0, dataType), + OverrideDataType(input1, dataType), + OverrideDataType(output, dataType), + reason); + break; + } case LayerType::Merger: { auto cLayer = boost::polymorphic_downcast(&layer); diff --git a/src/backends/backendsCommon/WorkloadFactory.hpp b/src/backends/backendsCommon/WorkloadFactory.hpp index a1d0400f11..390f70c893 100644 --- a/src/backends/backendsCommon/WorkloadFactory.hpp +++ b/src/backends/backendsCommon/WorkloadFactory.hpp @@ -133,6 +133,9 @@ public: virtual std::unique_ptr CreateSubtraction(const SubtractionQueueDescriptor& descriptor, const WorkloadInfo& info) const = 0; + virtual std::unique_ptr CreateMaximum(const MaximumQueueDescriptor& descriptor, + const WorkloadInfo& info) const = 0; + virtual std::unique_ptr CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 7817e42321..6941fc056d 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -346,6 +346,8 @@ DECLARE_LAYER_POLICY_2_PARAM(L2Normalization) DECLARE_LAYER_POLICY_2_PARAM(Lstm) +DECLARE_LAYER_POLICY_1_PARAM(Maximum) + DECLARE_LAYER_POLICY_2_PARAM(Mean) DECLARE_LAYER_POLICY_2_PARAM(Merger) diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 3c2e2875b4..42fb833807 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -296,6 +296,12 @@ std::unique_ptr ClWorkloadFactory::CreateConvertFp32ToFp16( return MakeWorkload(descriptor, info); } +std::unique_ptr ClWorkloadFactory::CreateMaximum(const MaximumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + std::unique_ptr ClWorkloadFactory::CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index a5560fd01e..89bded6183 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -120,6 +120,9 @@ public: virtual std::unique_ptr CreateSubtraction(const SubtractionQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMaximum(const MaximumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& Info) const override; diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index d79373df4e..0a141f152e 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -264,6 +264,12 @@ std::unique_ptr NeonWorkloadFactory::CreateConvertFp32ToFp16( return std::make_unique(descriptor, info); } +std::unique_ptr NeonWorkloadFactory::CreateMaximum(const MaximumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkloadHelper(descriptor, info); +} + std::unique_ptr NeonWorkloadFactory::CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/neon/NeonWorkloadFactory.hpp b/src/backends/neon/NeonWorkloadFactory.hpp index 8d7b830260..f6a1b553f2 100644 --- a/src/backends/neon/NeonWorkloadFactory.hpp +++ b/src/backends/neon/NeonWorkloadFactory.hpp @@ -121,6 +121,9 @@ public: virtual std::unique_ptr CreateSubtraction(const SubtractionQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMaximum(const MaximumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& Info) const override; diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index da8669ce6b..55c9fb22b6 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -258,6 +258,12 @@ std::unique_ptr RefWorkloadFactory::CreateSubtraction( return MakeWorkload(descriptor, info); } +std::unique_ptr RefWorkloadFactory::CreateMaximum( + const MaximumQueueDescriptor& descriptor, const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + std::unique_ptr RefWorkloadFactory::CreateMean( const MeanQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/reference/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index af4d98d226..eb7e5ccecc 100644 --- a/src/backends/reference/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -138,6 +138,9 @@ public: virtual std::unique_ptr CreateSubtraction(const SubtractionQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMaximum(const MaximumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMean(const MeanQueueDescriptor& descriptor, const WorkloadInfo& Info) const override; -- cgit v1.2.1