diff options
Diffstat (limited to 'src/armnn')
22 files changed, 122 insertions, 28 deletions
diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp index cbf6f8a257..845ba9ec0c 100644 --- a/src/armnn/InternalTypes.cpp +++ b/src/armnn/InternalTypes.cpp @@ -28,6 +28,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::FakeQuantization: return "FakeQuantization"; case LayerType::Floor: return "Floor"; case LayerType::FullyConnected: return "FullyConnected"; + case LayerType::Greater: return "Greater"; case LayerType::Input: return "Input"; case LayerType::L2Normalization: return "L2Normalization"; case LayerType::Lstm: return "Lstm"; @@ -39,6 +40,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::Multiplication: return "Multiplication"; case LayerType::Normalization: return "Normalization"; case LayerType::Output: return "Output"; + case LayerType::Pad: return "Pad"; case LayerType::Permute: return "Permute"; case LayerType::Pooling2d: return "Pooling2d"; case LayerType::Reshape: return "Reshape"; @@ -48,7 +50,6 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::Splitter: return "Splitter"; case LayerType::StridedSlice: return "StridedSlice"; case LayerType::Subtraction: return "Subtraction"; - case LayerType::Pad: return "Pad"; default: BOOST_ASSERT_MSG(false, "Unknown layer type"); return "Unknown"; diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index 3d4f043051..27a1359f68 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -28,6 +28,7 @@ enum class LayerType FakeQuantization, Floor, FullyConnected, + Greater, Input, L2Normalization, Lstm, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 298b25c284..d1161b63b1 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -445,4 +445,14 @@ bool IsMinimumSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsMinimumSupported, input0, input1, output); } +bool IsGreaterSupported(const BackendId& backend, + const TensorInfo& input0, + const TensorInfo& input1, + const TensorInfo& output, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + FORWARD_LAYER_SUPPORT_FUNC(backend, IsGreaterSupported, input0, input1, output); +} + } diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index ebfa5db6b1..39b0b20b21 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -20,6 +20,7 @@ #include "layers/FakeQuantizationLayer.hpp" #include "layers/FloorLayer.hpp" #include "layers/FullyConnectedLayer.hpp" +#include "layers/GreaterLayer.hpp" #include "layers/InputLayer.hpp" #include "layers/L2NormalizationLayer.hpp" #include "layers/LstmLayer.hpp" @@ -83,6 +84,7 @@ DECLARE_LAYER(Division) DECLARE_LAYER(FakeQuantization) DECLARE_LAYER(Floor) DECLARE_LAYER(FullyConnected) +DECLARE_LAYER(Greater) DECLARE_LAYER(Input) DECLARE_LAYER(L2Normalization) DECLARE_LAYER(Lstm) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index ecab5041db..7a7e1800f2 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -717,6 +717,11 @@ IConnectableLayer* Network::AddStridedSliceLayer(const StridedSliceDescriptor& s return m_Graph->AddLayer<StridedSliceLayer>(stridedSliceDescriptor, name); } +IConnectableLayer* Network::AddGreaterLayer(const char* name) +{ + return m_Graph->AddLayer<GreaterLayer>(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 e65b1d5f77..31e86ac0b9 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -135,6 +135,8 @@ public: IConnectableLayer* AddMinimumLayer(const char* name = nullptr) override; + IConnectableLayer* AddGreaterLayer(const char* name = nullptr) override; + private: IConnectableLayer* AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, diff --git a/src/armnn/layers/AdditionLayer.cpp b/src/armnn/layers/AdditionLayer.cpp index 0ccf398d37..27622664d5 100644 --- a/src/armnn/layers/AdditionLayer.cpp +++ b/src/armnn/layers/AdditionLayer.cpp @@ -2,6 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "AdditionLayer.hpp" #include "LayerCloneBase.hpp" @@ -14,7 +15,7 @@ namespace armnn { AdditionLayer::AdditionLayer(const char* name) - : ArithmeticBaseLayer(2, 1, LayerType::Addition, name) + : ElementwiseBaseLayer(2, 1, LayerType::Addition, name) { } diff --git a/src/armnn/layers/AdditionLayer.hpp b/src/armnn/layers/AdditionLayer.hpp index 211a2ef65f..9cdf09fb4e 100644 --- a/src/armnn/layers/AdditionLayer.hpp +++ b/src/armnn/layers/AdditionLayer.hpp @@ -2,14 +2,15 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once -#include "ArithmeticBaseLayer.hpp" +#include "ElementwiseBaseLayer.hpp" namespace armnn { -class AdditionLayer : public ArithmeticBaseLayer +class AdditionLayer : public ElementwiseBaseLayer { public: virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, diff --git a/src/armnn/layers/DivisionLayer.cpp b/src/armnn/layers/DivisionLayer.cpp index f667dc9545..03164993bc 100644 --- a/src/armnn/layers/DivisionLayer.cpp +++ b/src/armnn/layers/DivisionLayer.cpp @@ -2,6 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "DivisionLayer.hpp" #include "LayerCloneBase.hpp" @@ -14,7 +15,7 @@ namespace armnn { DivisionLayer::DivisionLayer(const char* name) - : ArithmeticBaseLayer(2, 1, LayerType::Division, name) + : ElementwiseBaseLayer(2, 1, LayerType::Division, name) { } diff --git a/src/armnn/layers/DivisionLayer.hpp b/src/armnn/layers/DivisionLayer.hpp index eaede4563b..158f8e8b5d 100644 --- a/src/armnn/layers/DivisionLayer.hpp +++ b/src/armnn/layers/DivisionLayer.hpp @@ -2,14 +2,15 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once -#include "ArithmeticBaseLayer.hpp" +#include "ElementwiseBaseLayer.hpp" namespace armnn { -class DivisionLayer : public ArithmeticBaseLayer +class DivisionLayer : public ElementwiseBaseLayer { public: virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, diff --git a/src/armnn/layers/ArithmeticBaseLayer.cpp b/src/armnn/layers/ElementwiseBaseLayer.cpp index 3b89c229c3..761814176d 100644 --- a/src/armnn/layers/ArithmeticBaseLayer.cpp +++ b/src/armnn/layers/ElementwiseBaseLayer.cpp @@ -2,7 +2,8 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "ArithmeticBaseLayer.hpp" + +#include "ElementwiseBaseLayer.hpp" #include "InternalTypes.hpp" #include "armnn/Exceptions.hpp" @@ -13,13 +14,13 @@ namespace armnn { -ArithmeticBaseLayer::ArithmeticBaseLayer(unsigned int numInputSlots, unsigned int numOutputSlots, - LayerType type, const char* name) +ElementwiseBaseLayer::ElementwiseBaseLayer(unsigned int numInputSlots, unsigned int numOutputSlots, + LayerType type, const char* name) : Layer(numInputSlots, numOutputSlots, type, name) { } -std::vector<TensorShape> ArithmeticBaseLayer::InferOutputShapes(const std::vector<TensorShape>& inputShapes) const +std::vector<TensorShape> ElementwiseBaseLayer::InferOutputShapes(const std::vector<TensorShape>& inputShapes) const { BOOST_ASSERT(inputShapes.size() == 2); auto& input0 = inputShapes[0]; @@ -47,7 +48,7 @@ std::vector<TensorShape> ArithmeticBaseLayer::InferOutputShapes(const std::vecto return std::vector<TensorShape>({ TensorShape(numDims, dims.data()) }); } -void ArithmeticBaseLayer::ValidateTensorShapesFromInputs() +void ElementwiseBaseLayer::ValidateTensorShapesFromInputs() { VerifyLayerConnections(2, CHECK_LOCATION()); diff --git a/src/armnn/layers/ArithmeticBaseLayer.hpp b/src/armnn/layers/ElementwiseBaseLayer.hpp index a8605a9b76..f0821ecfe9 100644 --- a/src/armnn/layers/ArithmeticBaseLayer.hpp +++ b/src/armnn/layers/ElementwiseBaseLayer.hpp @@ -2,6 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once #include <Layer.hpp> @@ -12,15 +13,15 @@ namespace armnn /// NOTE: this is an abstract class, it does not implement: /// std::unique_ptr<IWorkload> Layer::CreateWorkload(const Graph& graph, const IWorkloadFactory& factory) const = 0; /// Layer* Clone(Graph& graph) const = 0; -class ArithmeticBaseLayer : public Layer +class ElementwiseBaseLayer : public Layer { public: void ValidateTensorShapesFromInputs() override; std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; protected: - ArithmeticBaseLayer(unsigned int numInputSlots, unsigned int numOutputSlots, LayerType type, const char* name); - ~ArithmeticBaseLayer() = default; + ElementwiseBaseLayer(unsigned int numInputSlots, unsigned int numOutputSlots, LayerType type, const char* name); + ~ElementwiseBaseLayer() = default; }; } // namespace diff --git a/src/armnn/layers/GreaterLayer.cpp b/src/armnn/layers/GreaterLayer.cpp new file mode 100644 index 0000000000..d40c17c71b --- /dev/null +++ b/src/armnn/layers/GreaterLayer.cpp @@ -0,0 +1,34 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "GreaterLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include <armnn/TypesUtils.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +namespace armnn +{ + +GreaterLayer::GreaterLayer(const char* name) + : ElementwiseBaseLayer(2, 1, LayerType::Greater, name) +{ +} + +std::unique_ptr<IWorkload> GreaterLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + GreaterQueueDescriptor descriptor; + return factory.CreateGreater(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +GreaterLayer* GreaterLayer::Clone(Graph& graph) const +{ + return CloneBase<GreaterLayer>(graph, GetName()); +} + +} // namespace armnn diff --git a/src/armnn/layers/GreaterLayer.hpp b/src/armnn/layers/GreaterLayer.hpp new file mode 100644 index 0000000000..9297a82da4 --- /dev/null +++ b/src/armnn/layers/GreaterLayer.hpp @@ -0,0 +1,26 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "ElementwiseBaseLayer.hpp" + +namespace armnn +{ + +class GreaterLayer : public ElementwiseBaseLayer +{ +public: + virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const override; + + GreaterLayer* Clone(Graph& graph) const override; + +protected: + GreaterLayer(const char* name); + ~GreaterLayer() = default; +}; + +} //namespace armnn diff --git a/src/armnn/layers/MaximumLayer.cpp b/src/armnn/layers/MaximumLayer.cpp index 67a234216c..c0da8d6ef8 100644 --- a/src/armnn/layers/MaximumLayer.cpp +++ b/src/armnn/layers/MaximumLayer.cpp @@ -14,8 +14,9 @@ namespace armnn { MaximumLayer::MaximumLayer(const char* name) -: ArithmeticBaseLayer(2, 1, LayerType::Maximum, name) -{} + : ElementwiseBaseLayer(2, 1, LayerType::Maximum, name) +{ +} std::unique_ptr<IWorkload> MaximumLayer::CreateWorkload(const Graph& graph, const IWorkloadFactory& factory) const diff --git a/src/armnn/layers/MaximumLayer.hpp b/src/armnn/layers/MaximumLayer.hpp index da4c3ed18c..18a4ed31e2 100644 --- a/src/armnn/layers/MaximumLayer.hpp +++ b/src/armnn/layers/MaximumLayer.hpp @@ -2,14 +2,15 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once -#include "ArithmeticBaseLayer.hpp" +#include "ElementwiseBaseLayer.hpp" namespace armnn { -class MaximumLayer : public ArithmeticBaseLayer +class MaximumLayer : public ElementwiseBaseLayer { public: virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, diff --git a/src/armnn/layers/MinimumLayer.cpp b/src/armnn/layers/MinimumLayer.cpp index 11f60ebcb1..8e76041813 100644 --- a/src/armnn/layers/MinimumLayer.cpp +++ b/src/armnn/layers/MinimumLayer.cpp @@ -2,6 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "MinimumLayer.hpp" #include "LayerCloneBase.hpp" @@ -14,7 +15,7 @@ namespace armnn { MinimumLayer::MinimumLayer(const char* name) - : ArithmeticBaseLayer(2, 1, LayerType::Minimum, name) + : ElementwiseBaseLayer(2, 1, LayerType::Minimum, name) { } diff --git a/src/armnn/layers/MinimumLayer.hpp b/src/armnn/layers/MinimumLayer.hpp index cd8a1688cf..43382374eb 100644 --- a/src/armnn/layers/MinimumLayer.hpp +++ b/src/armnn/layers/MinimumLayer.hpp @@ -5,12 +5,12 @@ #pragma once -#include "ArithmeticBaseLayer.hpp" +#include "ElementwiseBaseLayer.hpp" namespace armnn { -class MinimumLayer : public ArithmeticBaseLayer +class MinimumLayer : public ElementwiseBaseLayer { public: virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, diff --git a/src/armnn/layers/MultiplicationLayer.cpp b/src/armnn/layers/MultiplicationLayer.cpp index 2abcf8609d..9448935660 100644 --- a/src/armnn/layers/MultiplicationLayer.cpp +++ b/src/armnn/layers/MultiplicationLayer.cpp @@ -2,6 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "MultiplicationLayer.hpp" #include "LayerCloneBase.hpp" @@ -14,7 +15,7 @@ namespace armnn { MultiplicationLayer::MultiplicationLayer(const char* name) - : ArithmeticBaseLayer(2, 1, LayerType::Multiplication, name) + : ElementwiseBaseLayer(2, 1, LayerType::Multiplication, name) { } diff --git a/src/armnn/layers/MultiplicationLayer.hpp b/src/armnn/layers/MultiplicationLayer.hpp index 21b68e3e70..8a7bfdea39 100644 --- a/src/armnn/layers/MultiplicationLayer.hpp +++ b/src/armnn/layers/MultiplicationLayer.hpp @@ -2,14 +2,15 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once -#include "ArithmeticBaseLayer.hpp" +#include "ElementwiseBaseLayer.hpp" namespace armnn { -class MultiplicationLayer : public ArithmeticBaseLayer +class MultiplicationLayer : public ElementwiseBaseLayer { public: virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, diff --git a/src/armnn/layers/SubtractionLayer.cpp b/src/armnn/layers/SubtractionLayer.cpp index 2b158acadd..18d8661dd6 100644 --- a/src/armnn/layers/SubtractionLayer.cpp +++ b/src/armnn/layers/SubtractionLayer.cpp @@ -2,6 +2,7 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #include "SubtractionLayer.hpp" #include "LayerCloneBase.hpp" @@ -14,7 +15,7 @@ namespace armnn { SubtractionLayer::SubtractionLayer(const char* name) - : ArithmeticBaseLayer(2, 1, LayerType::Subtraction, name) + : ElementwiseBaseLayer(2, 1, LayerType::Subtraction, name) { } diff --git a/src/armnn/layers/SubtractionLayer.hpp b/src/armnn/layers/SubtractionLayer.hpp index ac02580200..d1bccfe81e 100644 --- a/src/armnn/layers/SubtractionLayer.hpp +++ b/src/armnn/layers/SubtractionLayer.hpp @@ -2,14 +2,15 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // + #pragma once -#include "ArithmeticBaseLayer.hpp" +#include "ElementwiseBaseLayer.hpp" namespace armnn { -class SubtractionLayer : public ArithmeticBaseLayer +class SubtractionLayer : public ElementwiseBaseLayer { public: virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph, |