diff options
author | kevmay01 <kevin.may@arm.com> | 2018-11-29 08:40:19 +0000 |
---|---|---|
committer | kevmay01 <kevin.may@arm.com> | 2018-11-29 08:40:19 +0000 |
commit | 90539697433b507e20cf0d56f6c7f18614e03973 (patch) | |
tree | 604fb0d27451fbc8a212a78a5a83b54a474db8ad | |
parent | d57415d9a2117da9cc5c58f8b5e39ba7455417d1 (diff) | |
download | armnn-90539697433b507e20cf0d56f6c7f18614e03973.tar.gz |
IVGCVSW-2245 Add Minimum Layer and no-op Factory implementation
Change-Id: I03fa374fd9692d98257de709f8c3ad0a49c88b95
25 files changed, 171 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 9e05607b96..ad27aebd0c 100644 --- a/Android.mk +++ b/Android.mk @@ -97,6 +97,7 @@ LOCAL_SRC_FILES := \ src/armnn/layers/MeanLayer.cpp \ src/armnn/layers/MemCopyLayer.cpp \ src/armnn/layers/MergerLayer.cpp \ + src/armnn/layers/MinimumLayer.cpp \ src/armnn/layers/MultiplicationLayer.cpp \ src/armnn/layers/NormalizationLayer.cpp \ src/armnn/layers/OutputLayer.cpp \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 611e7399f2..64116d4d57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,6 +209,8 @@ list(APPEND armnn_sources src/armnn/layers/MemCopyLayer.cpp src/armnn/layers/MergerLayer.hpp src/armnn/layers/MergerLayer.cpp + src/armnn/layers/MinimumLayer.cpp + src/armnn/layers/MinimumLayer.hpp src/armnn/layers/MultiplicationLayer.hpp src/armnn/layers/MultiplicationLayer.cpp src/armnn/layers/NormalizationLayer.hpp diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp index b7a7b934ef..eecaa43271 100644 --- a/include/armnn/ILayerSupport.hpp +++ b/include/armnn/ILayerSupport.hpp @@ -141,6 +141,11 @@ public: const OriginsDescriptor& descriptor, Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const; + virtual bool IsMinimumSupported(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& ouput, + Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const; + virtual bool IsMultiplicationSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index 86b106f1ee..31f1dc2b91 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -323,6 +323,11 @@ public: virtual IConnectableLayer* AddStridedSliceLayer(const StridedSliceDescriptor& stridedSliceDescriptor, const char* name = nullptr) = 0; + /// Add a Minimum layer to the network. + /// @param name - Optional name for the layer. + /// @ return - Interface for configuring the layer. + virtual IConnectableLayer* AddMinimumLayer(const char* name = nullptr) = 0; + protected: ~INetwork() {} }; diff --git a/include/armnn/LayerSupport.hpp b/include/armnn/LayerSupport.hpp index 9d450fcc71..979579820a 100644 --- a/include/armnn/LayerSupport.hpp +++ b/include/armnn/LayerSupport.hpp @@ -271,4 +271,12 @@ bool IsStridedSliceSupported(const BackendId& backend, char* reasonIfUnsupported = nullptr, size_t reasonIfUnsupportedMaxLength = 1024); +/// Deprecated in favor of IBackend and ILayerSupport interfaces +bool IsMinimumSupported(const BackendId& backend, + const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + char* reasonIfUnsupported = nullptr, + size_t reasonIfUnsupportedMaxLength = 1024); + } 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<StridedSliceLayer>(stridedSliceDescriptor, name); } +IConnectableLayer* Network::AddMinimumLayer(const char* name) +{ + return m_Graph->AddLayer<MinimumLayer>(name); +} + OptimizedNetwork::OptimizedNetwork(std::unique_ptr<Graph> 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 <armnn/TypesUtils.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +namespace armnn +{ + +MinimumLayer::MinimumLayer(const char* name) + : ArithmeticBaseLayer(2, 1, LayerType::Minimum, name) +{ +} + +std::unique_ptr<IWorkload> 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<MinimumLayer>(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<IWorkload> 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<const TensorInfo*> input return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool ILayerSupport::IsMinimumSupported(const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + Optional<std::string&> 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 : QueueDescriptorWithParameters<StridedSliceD void Validate(const WorkloadInfo& workloadInfo) const; }; +struct MinimumQueueDescriptor : QueueDescriptor +{ + void Validate(const WorkloadInfo& workloadInfo) const; +}; + } //namespace armnn diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index 96b52ac972..835ca646f5 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -641,6 +641,17 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, reason); break; } + case LayerType::Minimum: + { + 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->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<IWorkload> CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& Info) const = 0; + + virtual std::unique_ptr<IWorkload> 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<IWorkload> ClWorkloadFactory::CreateStridedSlice(const StridedSl return MakeWorkload<NullWorkload, NullWorkload>(descriptor, info); } +std::unique_ptr<IWorkload> ClWorkloadFactory::CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload<NullWorkload, NullWorkload>(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<IWorkload> CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr<IWorkload> CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + private: template<typename FloatWorkload, typename Uint8Workload, typename QueueDescriptorType, typename... Args> static std::unique_ptr<IWorkload> 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<IWorkload> NeonWorkloadFactory::CreateStridedSlice(const Strided return MakeWorkloadHelper<NullWorkload, NullWorkload>(descriptor, info); } +std::unique_ptr<IWorkload> NeonWorkloadFactory::CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkloadHelper<NullWorkload, NullWorkload>(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<IWorkload> CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + virtual std::unique_ptr<IWorkload> CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + private: mutable std::shared_ptr<NeonMemoryManager> 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<IWorkload> RefWorkloadFactory::CreateStridedSlice(const StridedS return MakeWorkload<RefStridedSliceFloat32Workload, RefStridedSliceUint8Workload>(descriptor, info); } +std::unique_ptr<IWorkload> RefWorkloadFactory::CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return MakeWorkload<NullWorkload, NullWorkload>(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<IWorkload> CreateStridedSlice(const StridedSliceQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + + virtual std::unique_ptr<IWorkload> CreateMinimum(const MinimumQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; private: template <typename F32Workload, typename U8Workload, typename QueueDescriptorType> |