From 2bfadd92d638fd4e7b8b3398ce95f15930749189 Mon Sep 17 00:00:00 2001 From: thecha01 Date: Wed, 12 Aug 2020 17:25:51 +0100 Subject: Add StridedSliceLayerNode to graph API Signed-off-by: thecha01 Change-Id: I6d6fb2b053c74e35a86841621486bc0cd34b12b3 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3911 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- arm_compute/graph/GraphBuilder.h | 13 ++++ arm_compute/graph/TypePrinter.h | 3 + arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 43 +++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 26 +++++++ arm_compute/graph/frontend/Layers.h | 30 ++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + arm_compute/graph/nodes/StridedSliceLayerNode.h | 97 +++++++++++++++++++++++++ 9 files changed, 215 insertions(+) create mode 100644 arm_compute/graph/nodes/StridedSliceLayerNode.h (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 4948f5845e..ff40497667 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -520,6 +520,19 @@ public: * @return Node ID of the created node, EmptyNodeID in case of error */ static NodeID add_stack_node(Graph &g, NodeParams params, const std::vector &inputs, int axis); + /** Adds a strided slice 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 strided slice layer node as a NodeID-Index pair + * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] strides The strides of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] info Contains masks for the starts, ends and strides + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_strided_slice_node(Graph &g, NodeParams params, NodeIdxPair input, Coordinates &starts, Coordinates &ends, BiStrides &strides, StridedSliceLayerInfo info); /** Adds an upsample layer 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 281de36bb2..c24f6e159c 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -170,6 +170,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::StackLayer: os << "StackLayer"; break; + case NodeType::StridedSliceLayer: + os << "StridedSliceLayer"; + break; case NodeType::UpsampleLayer: os << "UpsampleLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index 82015114ba..bb54b60ec0 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -175,6 +175,7 @@ enum class NodeType SliceLayer, SplitLayer, StackLayer, + StridedSliceLayer, UpsampleLayer, UnaryEltwiseLayer, YOLOLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 570e981e98..5b0e7d174c 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -1673,6 +1673,49 @@ std::unique_ptr create_stack_layer(StackLayerNode &node) return RETURN_UNIQUE_PTR(func); } + +/** Create a backend slice layer function + * + * @tparam StridedSliceLayerFunction Backend strided slice function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * + * @return Backend strided slice layer function + */ +template +std::unique_ptr create_strided_slice_layer(StridedSliceLayerNode &node) +{ + 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)); + Coordinates starts = node.starts(); + Coordinates ends = node.ends(); + BiStrides strides = node.strides(); + StridedSliceLayerInfo info = node.strided_slice_info(); + + ARM_COMPUTE_ERROR_ON(input == nullptr); + ARM_COMPUTE_ERROR_ON(output == nullptr); + + // Create and configure function + auto func = support::cpp14::make_unique(); + func->configure(input, output, starts, ends, strides, info.begin_mask(), info.end_mask(), info.shrink_axis_mask()); + + // 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() + << std::endl); + + return RETURN_UNIQUE_PTR(func); +} + /** Create a backend Upsample layer function * * @tparam UpsampleLayerFunction Backend Upsample function diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 0259bfb930..fcebc5c418 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -556,6 +556,32 @@ Status validate_slice_layer(SliceLayerNode &node) return SliceLayer::validate(input, output, starts, ends); } +/** Validates a Strided Slice layer node + * + * @tparam StridedSliceLayer Strided Slice layer function type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_strided_slice_layer(StridedSliceLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating StridedSlice 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 = get_backing_tensor_info(node.input(0)); + arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0)); + const Coordinates starts = node.starts(); + const Coordinates ends = node.ends(); + const BiStrides strides = node.strides(); + const StridedSliceLayerInfo info = node.strided_slice_info(); + + return StridedSliceLayer::validate(input, output, starts, ends, strides, info.begin_mask(), info.end_mask(), info.shrink_axis_mask()); +} + /** Validates a Upsample layer node * * @tparam UpsampleLayer Upsample layer type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index 65100a3bd5..2dd8b31ccf 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -1333,6 +1333,36 @@ private: int _axis; }; +/** StridedSlice Layer */ +class StridedSliceLayer final : public ILayer +{ +public: + /** Construct a strided slice layer. + * + * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] strides The strides of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] strided_slice_info Contains masks for the starts, ends and strides + */ + StridedSliceLayer(Coordinates &starts, Coordinates &ends, BiStrides &strides, StridedSliceLayerInfo strided_slice_info) + : _starts(starts), _ends(ends), _strides(strides), _info(strided_slice_info) + { + } + + NodeID create_layer(IStream &s) override + { + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair input = { s.tail_node(), 0 }; + return GraphBuilder::add_strided_slice_node(s.graph(), common_params, input, _starts, _ends, _strides, _info); + } + +private: + Coordinates _starts; + Coordinates _ends; + BiStrides _strides; + StridedSliceLayerInfo _info; +}; + /** Upsample Layer */ class UpsampleLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 6df7ffab69..0e4ccd067d 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -63,6 +63,7 @@ #include "arm_compute/graph/nodes/SoftmaxLayerNode.h" #include "arm_compute/graph/nodes/SplitLayerNode.h" #include "arm_compute/graph/nodes/StackLayerNode.h" +#include "arm_compute/graph/nodes/StridedSliceLayerNode.h" #include "arm_compute/graph/nodes/UpsampleLayerNode.h" #include "arm_compute/graph/nodes/YOLOLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 63632848af..f829955fb1 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -69,6 +69,7 @@ class SoftmaxLayerNode; class SliceLayerNode; class SplitLayerNode; class StackLayerNode; +class StridedSliceLayerNode; class UpsampleLayerNode; class YOLOLayerNode; } // namespace graph diff --git a/arm_compute/graph/nodes/StridedSliceLayerNode.h b/arm_compute/graph/nodes/StridedSliceLayerNode.h new file mode 100644 index 0000000000..6039f312b3 --- /dev/null +++ b/arm_compute/graph/nodes/StridedSliceLayerNode.h @@ -0,0 +1,97 @@ +/* + * 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_STRIDED_SLICE_LAYER_NODE_H +#define ARM_COMPUTE_GRAPH_STRIDED_SLICE_LAYER_NODE_H + +#include "arm_compute/graph/INode.h" + +#include + +namespace arm_compute +{ +namespace graph +{ +/** Slice Layer node */ +class StridedSliceLayerNode final : public INode +{ +public: + /** Default Constructor + * + * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] strides The strides of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] strided_slice_info Contains masks for the starts, ends and strides + */ + StridedSliceLayerNode(const Coordinates &starts, + const Coordinates &ends, + const BiStrides &strides, + StridedSliceLayerInfo strided_slice_info); + /** Computes slice layer output descriptor + * + * @param[in] input_descriptor Descriptor of the input tensor + * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] strides The strides of the dimensions of the input tensor to be sliced. The length must be of rank(input). + * @param[in] info Contains masks for the starts, ends and strides + * + * @return Output descriptor + */ + static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, + const Coordinates &starts, + const Coordinates &ends, + const BiStrides &strides, + StridedSliceLayerInfo info); + /** Start coordinates accessor + * + * @return Start coordinates of the dimensions + */ + Coordinates starts() const; + /** End coordinates accessor + * + * @return End coordinates of the dimensions + */ + Coordinates ends() const; + /** Strides vector accessor + * + * @return End coordinates of the dimensions + */ + BiStrides strides() const; + + StridedSliceLayerInfo strided_slice_info() 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: + Coordinates _starts; + Coordinates _ends; + BiStrides _strides; + StridedSliceLayerInfo _info; +}; +} // namespace graph +} // namespace arm_compute +#endif /* ARM_COMPUTE_GRAPH_STRIDED_SLICE_LAYER_NODE_H */ -- cgit v1.2.1