From 3603aff36444e01083b93e603e8b9b0a254d4911 Mon Sep 17 00:00:00 2001 From: thecha01 Date: Tue, 1 Sep 2020 14:52:38 +0100 Subject: Add L2Normalize layer node to Graph API Signed-off-by: thecha01 Change-Id: I5cd26a8829060563d63d8c53e5148631ee053eca Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3912 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- arm_compute/graph/GraphBuilder.h | 11 +++ arm_compute/graph/TypePrinter.h | 2 + arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 44 ++++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 25 +++++++ arm_compute/graph/frontend/Layers.h | 26 +++++++ arm_compute/graph/nodes/L2NormalizeLayerNode.h | 79 +++++++++++++++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + src/graph/GraphBuilder.cpp | 5 ++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 2 + src/graph/backends/NEON/NEFunctionFactory.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/L2NormalizeLayerNode.cpp | 95 ++++++++++++++++++++++++++ 15 files changed, 298 insertions(+) create mode 100644 arm_compute/graph/nodes/L2NormalizeLayerNode.h create mode 100644 src/graph/nodes/L2NormalizeLayerNode.cpp diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 2632bf1484..c78c060d75 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -336,6 +336,17 @@ public: */ static NodeID add_generate_proposals_node(Graph &g, NodeParams params, NodeIdxPair scores, NodeIdxPair deltas, NodeIdxPair anchors, GenerateProposalsInfo info); + /** Adds a L2 Normalize layer node to the graph + * + * @param[in] g Graph to add the node to + * @param[in] params Common node parameters + * @param[in] input Input to the normalization layer node as a NodeID-Index pair + * @param[in] axis Axis to perform normalization on + * @param[in] epsilon Lower bound value for the normalization + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_l2_normalize_node(Graph &g, NodeParams params, NodeIdxPair input, int axis, float epsilon); /** Adds a normalization layer node to the graph * * @param[in] g Graph to add the node to diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h index 30433bf3e0..738bffaf15 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -122,6 +122,8 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::GenerateProposalsLayer: os << "GenerateProposalsLayer"; break; + case NodeType::L2NormalizeLayer: + os << "L2NormalizeLayer"; case NodeType::NormalizationLayer: os << "NormalizationLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index 2b9a4f3ca4..b9705d8606 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -159,6 +159,7 @@ enum class NodeType FusedConvolutionBatchNormalizationLayer, FusedDepthwiseConvolutionBatchNormalizationLayer, GenerateProposalsLayer, + L2NormalizeLayer, NormalizationLayer, NormalizePlanarYUVLayer, PadLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 05695fb797..d8873c0363 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -1089,6 +1089,50 @@ std::unique_ptr create_generate_proposals_layer(GenerateProposalsLaye return RETURN_UNIQUE_PTR(func); } +/** Create a backend l2 normalization layer function + * + * @tparam NormalizationLayerFunction Backend normalization function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * @param[in] ctx Graph context + * + * @return Backend normalization layer function + */ +template +std::unique_ptr create_l2_normalize_layer(L2NormalizeLayerNode &node, GraphContext &ctx) +{ + validate_node(node, 1 /* expected inputs */, 1 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *input = get_backing_tensor(node.input(0)); + typename TargetInfo::TensorType *output = get_backing_tensor(node.output(0)); + int axis = node.axis(); + float epsilon = node.epsilon(); + + ARM_COMPUTE_ERROR_ON(input == nullptr); + ARM_COMPUTE_ERROR_ON(output == nullptr); + + // Create and configure function + auto mm = get_memory_manager(ctx, TargetInfo::TargetType); + auto func = support::cpp14::make_unique(mm); + func->configure(input, output, axis, epsilon); + + // Log info + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " + << node.name() + << " Type: " << node.type() + << " Target: " << TargetInfo::TargetType + << " Data Type: " << input->info()->data_type() + << " Input shape: " << input->info()->tensor_shape() + << " Output shape: " << output->info()->tensor_shape() + << " Axis: " << axis + << " Epsilon: " << epsilon + << std::endl); + + return RETURN_UNIQUE_PTR(func); +} + /** Create a backend normalization layer function * * @tparam NormalizationLayerFunction Backend normalization function diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 23f6cc5627..1d5fd92838 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -343,6 +343,31 @@ Status validate_generate_proposals_layer(GenerateProposalsLayerNode &node) return GenerateProposalsLayer::validate(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info); } +/** Validates a L2Normalization layer node + * + * @tparam L2Normalization layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_l2_normalize_layer(L2NormalizeLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating L2NormalizeLayerNode node with ID : " << node.id() << " and Name: " << node.name() << std::endl); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 1); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 1); + + // Extract IO and info + arm_compute::ITensorInfo *input = detail::get_backing_tensor_info(node.input(0)); + arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0)); + int axis = node.axis(); + float epsilon = node.epsilon(); + + // Validate function + return L2NormalizeLayer::validate(input, output, axis, epsilon); +} + /** Validates a NormalizePlanarYUV layer node * * @tparam NormalizePlanarYUVLayer layer type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index da664e0448..ba303a3ef6 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -838,6 +838,32 @@ private: GenerateProposalsInfo _info; }; +/** L2 Normalize Layer */ +class L2NormalizeLayer final : public ILayer +{ +public: + /** Construct a L2 Normalize layer. + * + * @param[in] axis Axis to perform normalization on + * @param[in] epsilon Lower bound value for the normalization + */ + L2NormalizeLayer(int axis, float epsilon) + : _axis(axis), _epsilon(epsilon) + { + } + + NodeID create_layer(IStream &s) override + { + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair input = { s.tail_node(), 0 }; + return GraphBuilder::add_l2_normalize_node(s.graph(), common_params, input, _axis, _epsilon); + } + +private: + int _axis; + float _epsilon; +}; + /** Normalization Layer */ class NormalizationLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/L2NormalizeLayerNode.h b/arm_compute/graph/nodes/L2NormalizeLayerNode.h new file mode 100644 index 0000000000..8edc5b0bf3 --- /dev/null +++ b/arm_compute/graph/nodes/L2NormalizeLayerNode.h @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2020 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_GRAPH_L2_NORMALIZE_LAYER_NODE_H +#define ARM_COMPUTE_GRAPH_L2_NORMALIZE_LAYER_NODE_H + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** L2Normalize Layer node */ +class L2NormalizeLayerNode final : public INode +{ +public: + /** Constructor + * + */ + L2NormalizeLayerNode(); + + /** Constructor + * + * @param[in] axis Axis to perform normalization on + */ + L2NormalizeLayerNode(int axis); + + /** Constructor + * + * @param[in] axis Axis to perform normalization on + * @param[in] epsilon Lower bound value for the normalization + */ + L2NormalizeLayerNode(int axis, float epsilon); + + /** axis accessors + * + * @return Axis to perform normalization on + */ + int axis() const; + + /** epsilon accessors + * + * @return Lower bound value for the normalization + */ + float epsilon() const; + + // Inherited overridden methods: + NodeType type() const override; + bool forward_descriptors() override; + TensorDescriptor configure_output(size_t idx) const override; + void accept(INodeVisitor &v) override; + +private: + int _axis; + float _epsilon; +}; +} // namespace graph +} // namespace arm_compute +#endif /* ARM_COMPUTE_GRAPH_L2_NORMALIZE_LAYER_NODE_H */ diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 2b400a9140..967b65ff9c 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -46,6 +46,7 @@ #include "arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h" #include "arm_compute/graph/nodes/GenerateProposalsLayerNode.h" #include "arm_compute/graph/nodes/InputNode.h" +#include "arm_compute/graph/nodes/L2NormalizeLayerNode.h" #include "arm_compute/graph/nodes/NormalizationLayerNode.h" #include "arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h" #include "arm_compute/graph/nodes/OutputNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 8692476a09..9326d4ff79 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -52,6 +52,7 @@ class FusedConvolutionBatchNormalizationNode; class FusedDepthwiseConvolutionBatchNormalizationNode; class GenerateProposalsLayerNode; class InputNode; +class L2NormalizeLayerNode; class NormalizationLayerNode; class NormalizePlanarYUVLayerNode; class OutputNode; diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index ff85000e0c..33b7c178e5 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -552,6 +552,11 @@ NodeID GraphBuilder::add_generate_proposals_node(Graph &g, NodeParams params, No return nid; } +NodeID GraphBuilder::add_l2_normalize_node(Graph &g, NodeParams params, NodeIdxPair input, int axis, float epsilon) +{ + return create_simple_single_input_output_node(g, params, input, axis, epsilon); +} + NodeID GraphBuilder::add_normalization_node(Graph &g, NodeParams params, NodeIdxPair input, NormalizationLayerInfo norm_info) { return create_simple_single_input_output_node(g, params, input, norm_info); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 5d40744757..3948400ebf 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -276,6 +276,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_fused_depthwise_convolution_batch_normalization_layer(*polymorphic_downcast(node), ctx); case NodeType::GenerateProposalsLayer: return detail::create_generate_proposals_layer(*polymorphic_downcast(node), ctx); + case NodeType::L2NormalizeLayer: + return detail::create_l2_normalize_layer(*polymorphic_downcast(node), ctx); case NodeType::NormalizationLayer: return detail::create_normalization_layer(*polymorphic_downcast(node), ctx); case NodeType::NormalizePlanarYUVLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 83e6dd29fa..c3b4e4646f 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -86,6 +86,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_detection_post_process_layer(*polymorphic_downcast(node)); case NodeType::GenerateProposalsLayer: return detail::validate_generate_proposals_layer(*polymorphic_downcast(node)); + case NodeType::L2NormalizeLayer: + return detail::validate_l2_normalize_layer(*polymorphic_downcast(node)); case NodeType::NormalizePlanarYUVLayer: return detail::validate_normalize_planar_yuv_layer(*polymorphic_downcast(node)); case NodeType::PadLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 953697fee3..686468e0a4 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -165,6 +165,8 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & return detail::create_fused_convolution_batch_normalization_layer(*polymorphic_downcast(node), ctx); case NodeType::FusedDepthwiseConvolutionBatchNormalizationLayer: return detail::create_fused_depthwise_convolution_batch_normalization_layer(*polymorphic_downcast(node), ctx); + case NodeType::L2NormalizeLayer: + return detail::create_l2_normalize_layer(*polymorphic_downcast(node), ctx); case NodeType::NormalizationLayer: return detail::create_normalization_layer(*polymorphic_downcast(node), ctx); case NodeType::PadLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 5cc14c2188..0d6305b29e 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -86,6 +86,8 @@ Status NENodeValidator::validate(INode *node) return detail::validate_detection_post_process_layer(*polymorphic_downcast(node)); case NodeType::GenerateProposalsLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : GenerateProposalsLayer"); + case NodeType::L2NormalizeLayer: + return detail::validate_l2_normalize_layer(*polymorphic_downcast(node)); case NodeType::NormalizePlanarYUVLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : NormalizePlanarYUVLayer"); case NodeType::PadLayer: diff --git a/src/graph/nodes/L2NormalizeLayerNode.cpp b/src/graph/nodes/L2NormalizeLayerNode.cpp new file mode 100644 index 0000000000..0c35a335fa --- /dev/null +++ b/src/graph/nodes/L2NormalizeLayerNode.cpp @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2020 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/graph/nodes/L2NormalizeLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +namespace arm_compute +{ +namespace graph +{ +L2NormalizeLayerNode::L2NormalizeLayerNode() + : L2NormalizeLayerNode(0, 1e-12f) +{ +} + +L2NormalizeLayerNode::L2NormalizeLayerNode(int axis) + : L2NormalizeLayerNode(axis, 1e-12f) +{ +} + +L2NormalizeLayerNode::L2NormalizeLayerNode(int axis, float epsilon) + : _axis(axis), _epsilon(epsilon) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +bool L2NormalizeLayerNode::forward_descriptors() +{ + if((input_id(0) != NullTensorID) && (output_id(0) != NullTensorID)) + { + Tensor *dst = output(0); + ARM_COMPUTE_ERROR_ON(dst == nullptr); + dst->desc() = configure_output(0); + return true; + } + return false; +} + +TensorDescriptor L2NormalizeLayerNode::configure_output(size_t idx) const +{ + ARM_COMPUTE_UNUSED(idx); + ARM_COMPUTE_ERROR_ON(idx >= _outputs.size()); + + const Tensor *src = input(0); + ARM_COMPUTE_ERROR_ON(src == nullptr); + + TensorDescriptor output_desc = src->desc(); + + return output_desc; +} + +int L2NormalizeLayerNode::axis() const +{ + return _axis; +} + +float L2NormalizeLayerNode::epsilon() const +{ + return _epsilon; +} + +NodeType L2NormalizeLayerNode::type() const +{ + return NodeType::L2NormalizeLayer; +} + +void L2NormalizeLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute \ No newline at end of file -- cgit v1.2.1