From e8f05da5fb919aa209e1bf0e5c70dd15fff84b7f Mon Sep 17 00:00:00 2001 From: thecha01 Date: Mon, 24 Aug 2020 17:21:41 +0100 Subject: Add ArgMinMax layer node to Graph API Change-Id: I2ccb2c65edd2932b76e905af3d747324b65c2f7f Signed-off-by: thecha01 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3910 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- src/graph/GraphBuilder.cpp | 6 ++ 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/ArgMinMaxLayerNode.cpp | 104 ++++++++++++++++++++++++++ 6 files changed, 118 insertions(+) create mode 100644 src/graph/nodes/ArgMinMaxLayerNode.cpp (limited to 'src') diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index a3953329d2..ff85000e0c 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -139,6 +139,12 @@ NodeID GraphBuilder::add_activation_node(Graph &g, NodeParams params, NodeIdxPai return create_simple_single_input_output_node(g, params, input, act_info, out_quant_info); } +NodeID GraphBuilder::add_arg_min_max_node(Graph &g, NodeParams params, NodeIdxPair input, ReductionOperation op, unsigned int axis, + DataType out_data_type, const QuantizationInfo &out_quant_info) +{ + return create_simple_single_input_output_node(g, params, input, op, axis, out_data_type, out_quant_info); +} + NodeID GraphBuilder::add_batch_normalization_node(Graph &g, NodeParams params, NodeIdxPair input, float epsilon, ITensorAccessorUPtr mean_accessor, ITensorAccessorUPtr var_accessor, ITensorAccessorUPtr beta_accessor, ITensorAccessorUPtr gamma_accessor) diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 594ad0a05a..5d40744757 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -238,6 +238,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & { case NodeType::ActivationLayer: return detail::create_activation_layer(*polymorphic_downcast(node)); + case NodeType::ArgMinMaxLayer: + return detail::create_arg_min_max_layer(*polymorphic_downcast(node)); case NodeType::BatchNormalizationLayer: return detail::create_batch_normalization_layer(*polymorphic_downcast(node)); case NodeType::BoundingBoxTransformLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 08d2f917ca..83e6dd29fa 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -63,6 +63,8 @@ Status CLNodeValidator::validate(INode *node) NodeType type = node->type(); switch(type) { + case NodeType::ArgMinMaxLayer: + return detail::validate_arg_min_max_layer(*polymorphic_downcast(node)); case NodeType::BoundingBoxTransformLayer: return detail::validate_bounding_box_transform_layer(*polymorphic_downcast(node)); case NodeType::ChannelShuffleLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 82f1abba9e..953697fee3 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -131,6 +131,8 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & { case NodeType::ActivationLayer: return detail::create_activation_layer(*polymorphic_downcast(node)); + case NodeType::ArgMinMaxLayer: + return detail::create_arg_min_max_layer(*polymorphic_downcast(node)); case NodeType::BatchNormalizationLayer: return detail::create_batch_normalization_layer(*polymorphic_downcast(node)); case NodeType::ChannelShuffleLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 46f0051468..5cc14c2188 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -63,6 +63,8 @@ Status NENodeValidator::validate(INode *node) NodeType type = node->type(); switch(type) { + case NodeType::ArgMinMaxLayer: + return detail::validate_arg_min_max_layer(*polymorphic_downcast(node)); case NodeType::BoundingBoxTransformLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : BoundingBoxTransformLayer"); case NodeType::ChannelShuffleLayer: diff --git a/src/graph/nodes/ArgMinMaxLayerNode.cpp b/src/graph/nodes/ArgMinMaxLayerNode.cpp new file mode 100644 index 0000000000..63163b9e2c --- /dev/null +++ b/src/graph/nodes/ArgMinMaxLayerNode.cpp @@ -0,0 +1,104 @@ +/* + * 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/ArgMinMaxLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +#include "arm_compute/core/utils/misc/ShapeCalculator.h" + +namespace arm_compute +{ +namespace graph +{ +ArgMinMaxLayerNode::ArgMinMaxLayerNode(ReductionOperation op, unsigned int axis, DataType out_data_type, QuantizationInfo out_quant_info) + : _op(op), _axis(axis), _out_data_type(out_data_type), _out_quant_info(std::move(out_quant_info)) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +ReductionOperation ArgMinMaxLayerNode::reduction_operation() const +{ + return _op; +} + +unsigned int ArgMinMaxLayerNode::axis() const +{ + return _axis; +} + +DataType ArgMinMaxLayerNode::out_data_type() const +{ + return _out_data_type; +} + +bool ArgMinMaxLayerNode::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 ArgMinMaxLayerNode::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_info = src->desc(); + if(!_out_quant_info.empty()) + { + output_info.quant_info = _out_quant_info; + } + + if(_out_data_type != DataType::UNKNOWN) + { + output_info.data_type = _out_data_type; + } + + TensorShape output_shape = arm_compute::misc::shape_calculator::compute_reduced_shape(output_info.shape, _axis, false); + output_info.set_shape(output_shape); + + return output_info; +} + +NodeType ArgMinMaxLayerNode::type() const +{ + return ArgMinMaxLayerNode::node_type; +} + +void ArgMinMaxLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1