From 0a05e6a051e6d9028131de10f00b80bbedf44097 Mon Sep 17 00:00:00 2001 From: thecha01 Date: Fri, 28 Aug 2020 18:40:38 +0100 Subject: Add DepthToSpace layer node to Graph API Change-Id: I5db780fb9c94160130e9986bbfc739124bfa8041 Signed-off-by: thecha01 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3914 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- arm_compute/graph/GraphBuilder.h | 10 ++++ arm_compute/graph/TypePrinter.h | 3 ++ arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 39 +++++++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 21 ++++++++ arm_compute/graph/frontend/Layers.h | 25 ++++++++++ arm_compute/graph/nodes/DepthToSpaceLayerNode.h | 66 +++++++++++++++++++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + 9 files changed, 167 insertions(+) create mode 100644 arm_compute/graph/nodes/DepthToSpaceLayerNode.h (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index bce1ce4c40..4948f5845e 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -173,6 +173,16 @@ public: * @return Node ID of the created node, EmptyNodeID in case of error */ static NodeID add_concatenate_node(Graph &g, NodeParams params, const std::vector &inputs, const descriptors::ConcatLayerDescriptor &concat_descriptor); + /** Adds an depth to space 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 depth to space layer node as a NodeID-Index pair + * @param[in] block_shape Block shape to reshape tensor with + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_depth_to_space_node(Graph &g, NodeParams params, NodeIdxPair input, int32_t block_shape); /** Adds a depth-wise convolution 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 5d6c9f308d..281de36bb2 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -83,6 +83,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::DeconvolutionLayer: os << "DeconvolutionLayer"; break; + case NodeType::DepthToSpaceLayer: + os << "DepthToSpaceLayer"; + break; case NodeType::DequantizationLayer: os << "DequantizationLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index 65d737c7b2..82015114ba 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -147,6 +147,7 @@ enum class NodeType ConcatenateLayer, ConvolutionLayer, DeconvolutionLayer, + DepthToSpaceLayer, DepthwiseConvolutionLayer, DequantizationLayer, DetectionOutputLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 60a03e67b0..570e981e98 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -614,6 +614,45 @@ std::unique_ptr create_depthwise_convolution_layer(DepthwiseConvoluti return RETURN_UNIQUE_PTR(func); } +/** Create a backend depth to space layer function + * + * @tparam DepthToSpaceLayerNode Function Backend depth to space function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * + * @return Backend depth to space layer function + */ +template +std::unique_ptr create_depth_to_space_layer(DepthToSpaceLayerNode &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)); + + 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, node.block_shape()); + + // 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() + << " Block Size: " << node.block_shape() + << " Output shape: " << output->info()->tensor_shape() + << std::endl); + + return RETURN_UNIQUE_PTR(func); +} + /** Create a backend dequantize layer function * * @tparam DequantizationLayer Function Backend dequantize function diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 70eae6c3ad..0259bfb930 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -199,6 +199,27 @@ Status validate_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) return status; } +/** Validates a depth to space layer node + * + * @tparam DequantizationLayer Dequantize layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_depth_to_space_layer(DepthToSpaceLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating DetectionOutputLayer 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)); + + return DepthToSpaceLayer::validate(input, output, node.block_shape()); +} /** Validates a dequantize layer node * * @tparam DequantizationLayer Dequantize layer type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index 6aeebb45ec..65100a3bd5 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -489,6 +489,31 @@ private: const QuantizationInfo _weights_quant_info; const QuantizationInfo _out_quant_info; }; + +/** DepthToSpace Layer */ +class DepthToSpaceLayer final : public ILayer +{ +public: + /** Construct an DepthToSpace layer. + * + * @param[in] block_shape Block size to rearranged + */ + DepthToSpaceLayer(int32_t block_shape) + : _block_shape(block_shape) + { + } + + NodeID create_layer(IStream &s) override + { + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair input = { s.tail_node(), 0 }; + return GraphBuilder::add_depth_to_space_node(s.graph(), common_params, input, _block_shape); + } + +private: + int32_t _block_shape; +}; + /** Dequantization Layer */ class DequantizationLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/DepthToSpaceLayerNode.h b/arm_compute/graph/nodes/DepthToSpaceLayerNode.h new file mode 100644 index 0000000000..25e30e2c67 --- /dev/null +++ b/arm_compute/graph/nodes/DepthToSpaceLayerNode.h @@ -0,0 +1,66 @@ +/* + * 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_DEPTH_TO_SPACE_LAYER_NODE_H +#define ARM_COMPUTE_GRAPH_DEPTH_TO_SPACE_LAYER_NODE_H + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** DepthToSpace Layer node */ +class DepthToSpaceLayerNode final : public INode +{ +public: + /** Default Constructor */ + DepthToSpaceLayerNode(int block_shape); + /** Block shape policy accessor + * + * @return Block shape + */ + int block_shape() const; + /** Computes depth to space output descriptor + * + * @warning block_shape must be greater than or equal to 2 + * + * @param[in] input_descriptor Input descriptor + * @param[in] block_shape Number of output neurons + * + * @return Output descriptor + */ + static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, int block_shape); + + // 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 _block_shape; +}; +} // namespace graph +} // namespace arm_compute +#endif /* ARM_COMPUTE_GRAPH_DEPTH_TO_SPACE_LAYER_NODE_H */ diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index bf4ab87cda..6df7ffab69 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -32,6 +32,7 @@ #include "arm_compute/graph/nodes/ConstNode.h" #include "arm_compute/graph/nodes/ConvolutionLayerNode.h" #include "arm_compute/graph/nodes/DeconvolutionLayerNode.h" +#include "arm_compute/graph/nodes/DepthToSpaceLayerNode.h" #include "arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h" #include "arm_compute/graph/nodes/DequantizationLayerNode.h" #include "arm_compute/graph/nodes/DetectionOutputLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 9541f4babe..63632848af 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -38,6 +38,7 @@ class ConcatenateLayerNode; class ConstNode; class ConvolutionLayerNode; class DeconvolutionLayerNode; +class DepthToSpaceLayerNode; class DepthwiseConvolutionLayerNode; class DequantizationLayerNode; class DetectionOutputLayerNode; -- cgit v1.2.1