From 90539697433b507e20cf0d56f6c7f18614e03973 Mon Sep 17 00:00:00 2001 From: kevmay01 Date: Thu, 29 Nov 2018 08:40:19 +0000 Subject: IVGCVSW-2245 Add Minimum Layer and no-op Factory implementation Change-Id: I03fa374fd9692d98257de709f8c3ad0a49c88b95 --- src/armnn/InternalTypes.cpp | 1 + src/armnn/InternalTypes.hpp | 1 + src/armnn/LayerSupport.cpp | 10 +++++++ src/armnn/LayersFwd.hpp | 2 ++ src/armnn/Network.cpp | 5 ++++ src/armnn/Network.hpp | 2 ++ src/armnn/layers/MinimumLayer.cpp | 33 ++++++++++++++++++++++ src/armnn/layers/MinimumLayer.hpp | 27 ++++++++++++++++++ src/backends/backendsCommon/ILayerSupport.cpp | 8 ++++++ src/backends/backendsCommon/WorkloadData.cpp | 13 +++++++++ src/backends/backendsCommon/WorkloadData.hpp | 5 ++++ src/backends/backendsCommon/WorkloadFactory.cpp | 11 ++++++++ src/backends/backendsCommon/WorkloadFactory.hpp | 3 ++ .../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 ++ 20 files changed, 150 insertions(+) create mode 100644 src/armnn/layers/MinimumLayer.cpp create mode 100644 src/armnn/layers/MinimumLayer.hpp (limited to 'src') diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp index 37c63fd92a..0b6c777546 100644 --- a/src/armnn/InternalTypes.cpp +++ b/src/armnn/InternalTypes.cpp @@ -34,6 +34,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::Mean: return "Mean"; case LayerType::MemCopy: return "MemCopy"; case LayerType::Merger: return "Merger"; + case LayerType::Minimum: return "Minimum"; case LayerType::Multiplication: return "Multiplication"; case LayerType::Normalization: return "Normalization"; case LayerType::Output: return "Output"; diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index 989718b0f7..df8bb737e7 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -34,6 +34,7 @@ enum class LayerType Mean, MemCopy, Merger, + Minimum, Multiplication, Normalization, Output, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 5834b81ccc..bbc9e3bd80 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -425,4 +425,14 @@ bool IsStridedSliceSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsStridedSliceSupported, input, output, descriptor); } +bool IsMinimumSupported(const BackendId& backend, + const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + FORWARD_LAYER_SUPPORT_FUNC(backend, IsMinimumSupported, input0, input1, output); +} + } diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index bab40da372..88a636a0b8 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -26,6 +26,7 @@ #include "layers/MeanLayer.hpp" #include "layers/MemCopyLayer.hpp" #include "layers/MergerLayer.hpp" +#include "layers/MinimumLayer.hpp" #include "layers/MultiplicationLayer.hpp" #include "layers/NormalizationLayer.hpp" #include "layers/OutputLayer.hpp" @@ -87,6 +88,7 @@ DECLARE_LAYER(Maximum) DECLARE_LAYER(Mean) DECLARE_LAYER(MemCopy) DECLARE_LAYER(Merger) +DECLARE_LAYER(Minimum) DECLARE_LAYER(Multiplication) DECLARE_LAYER(Normalization) DECLARE_LAYER(Output) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 57949fb430..bed6400cf7 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -705,6 +705,11 @@ IConnectableLayer* Network::AddStridedSliceLayer(const StridedSliceDescriptor& s return m_Graph->AddLayer(stridedSliceDescriptor, name); } +IConnectableLayer* Network::AddMinimumLayer(const char* name) +{ + return m_Graph->AddLayer(name); +} + OptimizedNetwork::OptimizedNetwork(std::unique_ptr graph) : m_Graph(std::move(graph)) { diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 84d1f58ab9..e65b1d5f77 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -133,6 +133,8 @@ public: IConnectableLayer* AddStridedSliceLayer(const StridedSliceDescriptor& stridedSliceDescriptor, const char* name = nullptr) override; + IConnectableLayer* AddMinimumLayer(const char* name = nullptr) override; + private: IConnectableLayer* AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, diff --git a/src/armnn/layers/MinimumLayer.cpp b/src/armnn/layers/MinimumLayer.cpp new file mode 100644 index 0000000000..11f60ebcb1 --- /dev/null +++ b/src/armnn/layers/MinimumLayer.cpp @@ -0,0 +1,33 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#include "MinimumLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include +#include +#include + +namespace armnn +{ + +MinimumLayer::MinimumLayer(const char* name) + : ArithmeticBaseLayer(2, 1, LayerType::Minimum, name) +{ +} + +std::unique_ptr MinimumLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + MinimumQueueDescriptor descriptor; + return factory.CreateMinimum(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +MinimumLayer* MinimumLayer::Clone(Graph& graph) const +{ + return CloneBase(graph, GetName()); +} + +} // namespace armnn diff --git a/src/armnn/layers/MinimumLayer.hpp b/src/armnn/layers/MinimumLayer.hpp new file mode 100644 index 0000000000..cd8a1688cf --- /dev/null +++ b/src/armnn/layers/MinimumLayer.hpp @@ -0,0 +1,27 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "ArithmeticBaseLayer.hpp" + +namespace armnn +{ + +class MinimumLayer : public ArithmeticBaseLayer +{ +public: + virtual std::unique_ptr CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const override; + + MinimumLayer* Clone(Graph& graph) const override; + +protected: + MinimumLayer(const char* name); + ~MinimumLayer() = default; + +}; + +} \ No newline at end of file diff --git a/src/backends/backendsCommon/ILayerSupport.cpp b/src/backends/backendsCommon/ILayerSupport.cpp index 28fd0a3748..7976fbd350 100644 --- a/src/backends/backendsCommon/ILayerSupport.cpp +++ b/src/backends/backendsCommon/ILayerSupport.cpp @@ -207,6 +207,14 @@ bool ILayerSupport::IsMergerSupported(const std::vector input return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool ILayerSupport::IsMinimumSupported(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + Optional reasonIfUnsupported) const +{ + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); +} + bool ILayerSupport::IsMultiplicationSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 9c513177a3..e6486106c1 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -994,4 +994,17 @@ void StridedSliceQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) con } } +void MinimumQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const +{ + ValidateTwoInputs(workloadInfo, "MinimumQueueDescriptor"); + ValidateSingleOutput(workloadInfo, "MinimumQueueDescriptor"); + + ValidateBroadcastTensorShapesMatch(workloadInfo.m_InputTensorInfos[0], + workloadInfo.m_InputTensorInfos[1], + workloadInfo.m_OutputTensorInfos[0], + "MinimumQueueDescriptor", + "first input", + "second input"); +} + } //namespace armnn diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index 58b141353b..7b96bbc606 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -351,4 +351,9 @@ struct StridedSliceQueueDescriptor : QueueDescriptorWithParametersGetTensorInfo(); + const TensorInfo& input1 = layer.GetInputSlot(1).GetConnection()->GetTensorInfo(); + const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo(); + result = layerSupportObject->IsMinimumSupported(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 390f70c893..186b6129cc 100644 --- a/src/backends/backendsCommon/WorkloadFactory.hpp +++ b/src/backends/backendsCommon/WorkloadFactory.hpp @@ -144,6 +144,9 @@ public: virtual std::unique_ptr CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; + + virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const = 0; }; } //namespace armnn diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 6941fc056d..e6b2c6df48 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -352,6 +352,8 @@ DECLARE_LAYER_POLICY_2_PARAM(Mean) DECLARE_LAYER_POLICY_2_PARAM(Merger) +DECLARE_LAYER_POLICY_1_PARAM(Minimum) + DECLARE_LAYER_POLICY_1_PARAM(Multiplication) DECLARE_LAYER_POLICY_2_PARAM(Normalization) diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 42fb833807..a710e66e37 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -326,4 +326,10 @@ std::unique_ptr ClWorkloadFactory::CreateStridedSlice(const StridedSl return MakeWorkload(descriptor, info); } +std::unique_ptr ClWorkloadFactory::CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + } // namespace armnn diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index 89bded6183..2e0e488f93 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -135,6 +135,9 @@ public: virtual std::unique_ptr CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + private: template static std::unique_ptr MakeWorkload(const QueueDescriptorType& descriptor, diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index 0a141f152e..70ee00d28f 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -294,4 +294,10 @@ std::unique_ptr NeonWorkloadFactory::CreateStridedSlice(const Strided return MakeWorkloadHelper(descriptor, info); } +std::unique_ptr NeonWorkloadFactory::CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkloadHelper(descriptor, info); +} + } // namespace armnn diff --git a/src/backends/neon/NeonWorkloadFactory.hpp b/src/backends/neon/NeonWorkloadFactory.hpp index f6a1b553f2..8d1cfce8f8 100644 --- a/src/backends/neon/NeonWorkloadFactory.hpp +++ b/src/backends/neon/NeonWorkloadFactory.hpp @@ -136,6 +136,9 @@ public: virtual std::unique_ptr CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + private: mutable std::shared_ptr m_MemoryManager; }; diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 55c9fb22b6..c93dc31ea9 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -288,4 +288,10 @@ std::unique_ptr RefWorkloadFactory::CreateStridedSlice(const StridedS return MakeWorkload(descriptor, info); } +std::unique_ptr RefWorkloadFactory::CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload(descriptor, info); +} + } // namespace armnn diff --git a/src/backends/reference/RefWorkloadFactory.hpp b/src/backends/reference/RefWorkloadFactory.hpp index eb7e5ccecc..035e084f91 100644 --- a/src/backends/reference/RefWorkloadFactory.hpp +++ b/src/backends/reference/RefWorkloadFactory.hpp @@ -152,6 +152,9 @@ public: virtual std::unique_ptr CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + + virtual std::unique_ptr CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; private: template -- cgit v1.2.1