From 555d1109dd566661bcf911c28030927cf4fde5b4 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Wed, 12 Sep 2018 13:51:59 +0100 Subject: COMPMID-1577: Add NormalizePlanarYUVLayer to graph API Change-Id: Iadcf8205ff842330f7242f870705e9ea677ec419 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148105 Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- arm_compute/graph/GraphBuilder.h | 12 ++++ arm_compute/graph/TypePrinter.h | 6 ++ arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 38 +++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 24 +++++++ arm_compute/graph/frontend/Layers.h | 31 +++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 2 + .../graph/nodes/NormalizePlanarYUVLayerNode.h | 48 ++++++++++++++ src/graph/GraphBuilder.cpp | 28 ++++++++- src/graph/backends/CL/CLFunctionsFactory.cpp | 4 +- src/graph/backends/CL/CLNodeValidator.cpp | 4 +- src/graph/backends/GLES/GCFunctionsFactory.cpp | 4 +- src/graph/backends/GLES/GCNodeValidator.cpp | 6 +- src/graph/nodes/NormalizePlanarYUVLayerNode.cpp | 73 ++++++++++++++++++++++ 15 files changed, 277 insertions(+), 5 deletions(-) create mode 100644 arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h create mode 100644 src/graph/nodes/NormalizePlanarYUVLayerNode.cpp diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index d7502600a4..21a96a36c0 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -239,6 +239,18 @@ public: * @return Node ID of the created node, EmptyNodeID in case of error */ static NodeID add_normalization_node(Graph &g, NodeParams params, NodeIdxPair input, NormalizationLayerInfo norm_info); + /** Adds a normalize planar YUV 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 normalize planar YUV layer node as a NodeID-Index pair + * @param[in] mean_accessor Const Node ID that contains the mean values + * @param[in] std_accessor Const Node ID that contains the variance values + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_normalize_planar_yuv_node(Graph &g, NodeParams params, NodeIdxPair input, + ITensorAccessorUPtr mean_accessor = nullptr, ITensorAccessorUPtr std_accessor = nullptr); /** Adds a permute 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 9117864130..4628d924dc 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -95,12 +95,18 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::NormalizationLayer: os << "NormalizationLayer"; break; + case NodeType::NormalizePlanarYUVLayer: + os << "NormalizePlanarYUVLayer"; + break; case NodeType::PermuteLayer: os << "PermuteLayer"; break; case NodeType::PoolingLayer: os << "PoolingLayer"; break; + case NodeType::ReorgLayer: + os << "ReorgLayer"; + break; case NodeType::ReshapeLayer: os << "ReshapeLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index 0b9a953531..190258bf6c 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -141,6 +141,7 @@ enum class NodeType FlattenLayer, FullyConnectedLayer, NormalizationLayer, + NormalizePlanarYUVLayer, PermuteLayer, PoolingLayer, ReorgLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index b1446ea493..88d6ce15b9 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -621,6 +621,44 @@ std::unique_ptr create_normalization_layer(NormalizationLayerNode &no return std::move(func); } +/** Create a backend normalize planar YUV layer function + * + * @tparam NormalizePlanarYUVLayerFunction Backend normalize planar YUV function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * + * @return Backend normalize plnar YUV layer function + */ +template +std::unique_ptr create_normalize_planar_yuv_layer(NormalizePlanarYUVLayerNode &node) +{ + validate_node(node, 3 /* expected inputs */, 1 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *input = get_backing_tensor(node.input(0)); + typename TargetInfo::TensorType *mean = get_backing_tensor(node.input(1)); + typename TargetInfo::TensorType *std = get_backing_tensor(node.input(2)); + typename TargetInfo::TensorType *output = get_backing_tensor(node.output(0)); + ARM_COMPUTE_ERROR_ON(input == nullptr); + ARM_COMPUTE_ERROR_ON(mean == nullptr); + ARM_COMPUTE_ERROR_ON(std == nullptr); + ARM_COMPUTE_ERROR_ON(output == nullptr); + + // Create and configure function + auto func = support::cpp14::make_unique(); + func->configure(input, output, mean, std); + + // Log info + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type() + << " Target " << TargetInfo::TargetType + << " Data Type: " << input->info()->data_type() + << " Shape: " << input->info()->tensor_shape() + << std::endl); + + return std::move(func); +} + /** Create a backend permute layer function * * @tparam PermuteLayerFunction Backend permute function diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index e8b8af154f..1de3aa9a31 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -179,6 +179,30 @@ Status validate_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) return status; } +/** Validates a NormalizePlanarYUV layer node + * + * @tparam NormalizePlanarYUVLayer layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_normalize_planar_yuv_layer(NormalizePlanarYUVLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating NormalizePlanarYUVLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 3); + 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 *mean = detail::get_backing_tensor_info(node.input(1)); + arm_compute::ITensorInfo *std = detail::get_backing_tensor_info(node.input(2)); + arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0)); + + // Validate function + return NormalizePlanarYUVLayer::validate(input, output, mean, std); +} /** Validates a permute layer node * * @tparam PermuteLayer Permute layer type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index 9a268d3d29..9afb1787f3 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -538,6 +538,37 @@ private: NormalizationLayerInfo _norm_info; }; +/** Normalize planar YUV Layer */ +class NormalizePlanarYUVLayer final : public ILayer +{ +public: + /** Construct a normalize planar YUV layer. + * + * @param[in] mean Accessor to get mean tensor data from. + * @param[in] std Accessor to get std tensor data from. + */ + NormalizePlanarYUVLayer(ITensorAccessorUPtr mean, + ITensorAccessorUPtr std) + : _mean(std::move(mean)), _std(std::move(std)) + { + } + + NodeID create_layer(IStream &s) override + { + ARM_COMPUTE_ERROR_ON(_mean == nullptr); + ARM_COMPUTE_ERROR_ON(_std == nullptr); + + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair input = { s.tail_node(), 0 }; + return GraphBuilder::add_normalize_planar_yuv_node(s.graph(), common_params, input, + std::move(_mean), std::move(_std)); + } + +private: + ITensorAccessorUPtr _mean; + ITensorAccessorUPtr _std; +}; + /** Permute Layer */ class PermuteLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 438054c4bf..59ac131b8c 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -38,6 +38,7 @@ #include "arm_compute/graph/nodes/FullyConnectedLayerNode.h" #include "arm_compute/graph/nodes/InputNode.h" #include "arm_compute/graph/nodes/NormalizationLayerNode.h" +#include "arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h" #include "arm_compute/graph/nodes/OutputNode.h" #include "arm_compute/graph/nodes/PermuteLayerNode.h" #include "arm_compute/graph/nodes/PoolingLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index a6393e7210..92dc1f0ebd 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -44,9 +44,11 @@ class FlattenLayerNode; class FullyConnectedLayerNode; class InputNode; class NormalizationLayerNode; +class NormalizePlanarYUVLayerNode; class OutputNode; class PermuteLayerNode; class PoolingLayerNode; +class ReorgLayerNode; class ReshapeLayerNode; class ResizeLayerNode; class SoftmaxLayerNode; diff --git a/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h b/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h new file mode 100644 index 0000000000..8704b9d2de --- /dev/null +++ b/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2018 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_NORMALIZE_PLANAR_YUV_LAYER_NODE_H__ +#define __ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H__ + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** Batch Normalization Layer node */ +class NormalizePlanarYUVLayerNode final : public INode +{ +public: + /** Constructor */ + NormalizePlanarYUVLayerNode(); + + // Inherited overridden methods: + NodeType type() const override; + bool forward_descriptors() override; + TensorDescriptor configure_output(size_t idx) const override; + void accept(INodeVisitor &v) override; +}; +} // namespace graph +} // namespace arm_compute +#endif /* __ARM_COMPUTE_GRAPH_NORMALIZE_PLANAR_YUV_LAYER_NODE_H__ */ diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 55fe5e3def..921b16b611 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -132,7 +132,7 @@ NodeID GraphBuilder::add_batch_normalization_node(Graph &g, NodeParams params, N TensorDescriptor common_desc = input_tensor_desc; common_desc.shape = TensorShape(get_dimension_size(input_tensor_desc, DataLayoutDimension::CHANNEL)); - // Create mean and nodes + // Create mean and var nodes auto mean_nid = add_const_node_with_name(g, params, "Mean", common_desc, std::move(mean_accessor)); auto var_nid = add_const_node_with_name(g, params, "Variance", common_desc, std::move(var_accessor)); @@ -423,6 +423,32 @@ NodeID GraphBuilder::add_normalization_node(Graph &g, NodeParams params, NodeIdx return create_simple_single_input_output_node(g, params, input, norm_info); } +NodeID GraphBuilder::add_normalize_planar_yuv_node(Graph &g, NodeParams params, NodeIdxPair input, + ITensorAccessorUPtr mean_accessor, ITensorAccessorUPtr std_accessor) +{ + CHECK_NODEIDX_PAIR(input, g); + + // Get input tensor descriptor + const TensorDescriptor input_tensor_desc = get_tensor_descriptor(g, g.node(input.node_id)->outputs()[0]); + + // Calculate Common Descriptor + TensorDescriptor common_desc = input_tensor_desc; + common_desc.shape = TensorShape(get_dimension_size(input_tensor_desc, DataLayoutDimension::CHANNEL)); + + // Create mean and std nodes + auto mean_nid = add_const_node_with_name(g, params, "Mean", common_desc, std::move(mean_accessor)); + auto std_nid = add_const_node_with_name(g, params, "Std", common_desc, std::move(std_accessor)); + + // Create normalize planar YUV node and add connections + NodeID norm_planar_yuv_nid = g.add_node(); + g.add_connection(input.node_id, input.index, norm_planar_yuv_nid, 0); + g.add_connection(mean_nid, 0, norm_planar_yuv_nid, 1); + g.add_connection(std_nid, 0, norm_planar_yuv_nid, 2); + set_node_params(g, norm_planar_yuv_nid, params); + + return norm_planar_yuv_nid; +} + NodeID GraphBuilder::add_permute_node(Graph &g, NodeParams params, NodeIdxPair input, PermutationVector perm, DataLayout layout) { return create_simple_single_input_output_node(g, params, input, perm, layout); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 25456e886f..29fd41e105 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -101,6 +101,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_fully_connected_layer(*polymorphic_downcast(node), ctx); case NodeType::NormalizationLayer: return detail::create_normalization_layer(*polymorphic_downcast(node), ctx); + case NodeType::NormalizePlanarYUVLayer: + return detail::create_normalize_planar_yuv_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return detail::create_permute_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: @@ -119,4 +121,4 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & } } // namespace backends } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index ece0d324f6..a565bcb710 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -57,6 +57,8 @@ Status CLNodeValidator::validate(INode *node) case NodeType::DepthwiseConvolutionLayer: return detail::validate_depthwise_convolution_layer(*polymorphic_downcast(node)); + case NodeType::NormalizePlanarYUVLayer: + return detail::validate_normalize_planar_yuv_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return detail::validate_permute_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: @@ -67,4 +69,4 @@ Status CLNodeValidator::validate(INode *node) } } // namespace backends } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/backends/GLES/GCFunctionsFactory.cpp b/src/graph/backends/GLES/GCFunctionsFactory.cpp index f72513c87c..6268583938 100644 --- a/src/graph/backends/GLES/GCFunctionsFactory.cpp +++ b/src/graph/backends/GLES/GCFunctionsFactory.cpp @@ -278,6 +278,8 @@ std::unique_ptr GCFunctionFactory::create(INode *node, GraphContext & return detail::create_fully_connected_layer(*polymorphic_downcast(node), ctx); case NodeType::NormalizationLayer: return detail::create_normalization_layer(*polymorphic_downcast(node), ctx); + case NodeType::NormalizePlanarYUVLayer: + return detail::create_normalize_planar_yuv_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: return detail::create_pooling_layer(*polymorphic_downcast(node)); case NodeType::ResizeLayer: @@ -290,4 +292,4 @@ std::unique_ptr GCFunctionFactory::create(INode *node, GraphContext & } } // namespace backends } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index 31d1c8b456..1e630598fe 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -111,8 +111,12 @@ Status GCNodeValidator::validate(INode *node) return validate_depthwise_convolution_layer(*polymorphic_downcast(node)); case NodeType::FlattenLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : FlattenLayer"); + case NodeType::NormalizePlanarYUVLayer: + return detail::validate_normalize_planar_yuv_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PermuteLayer"); + case NodeType::ReorgLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ReorgLayer"); case NodeType::ReshapeLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ReshapeLayer"); default: @@ -121,4 +125,4 @@ Status GCNodeValidator::validate(INode *node) } } // namespace backends } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/nodes/NormalizePlanarYUVLayerNode.cpp b/src/graph/nodes/NormalizePlanarYUVLayerNode.cpp new file mode 100644 index 0000000000..129b380ac0 --- /dev/null +++ b/src/graph/nodes/NormalizePlanarYUVLayerNode.cpp @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2018 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/NormalizePlanarYUVLayerNode.h" + +#include "arm_compute/core/Utils.h" +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +namespace arm_compute +{ +namespace graph +{ +NormalizePlanarYUVLayerNode::NormalizePlanarYUVLayerNode() +{ + _input_edges.resize(3, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +bool NormalizePlanarYUVLayerNode::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 NormalizePlanarYUVLayerNode::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); + + return src->desc(); +} + +NodeType NormalizePlanarYUVLayerNode::type() const +{ + return NodeType::NormalizePlanarYUVLayer; +} + +void NormalizePlanarYUVLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1