From 4bb17337e8330d01e469dfcb42220fe56b85a59f Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Wed, 26 Sep 2018 13:56:51 +0100 Subject: COMPMID-1603: Add PadLayer to graph API Change-Id: Ic985ac8b0b09c3a6b3f2d43274af8ce89f8c90dd Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/150313 Reviewed-by: Georgios Pinitas Tested-by: bsgcomp --- src/graph/GraphBuilder.cpp | 5 ++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 2 + src/graph/backends/GLES/GCNodeValidator.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/PadLayerNode.cpp | 87 ++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+) create mode 100644 src/graph/nodes/PadLayerNode.cpp (limited to 'src/graph') diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index b3879d2951..7e511502f8 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -449,6 +449,11 @@ NodeID GraphBuilder::add_normalize_planar_yuv_node(Graph &g, NodeParams params, return norm_planar_yuv_nid; } +NodeID GraphBuilder::add_pad_node(Graph &g, NodeParams params, NodeIdxPair input, PaddingList padding) +{ + return create_simple_single_input_output_node(g, params, input, padding); +} + 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 bd908c1ca4..43fe706b9a 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -103,6 +103,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_normalization_layer(*polymorphic_downcast(node), ctx); case NodeType::NormalizePlanarYUVLayer: return detail::create_normalize_planar_yuv_layer(*polymorphic_downcast(node)); + case NodeType::PadLayer: + return detail::create_pad_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return detail::create_permute_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index a91efce6e4..5f6fa0ad41 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -59,6 +59,8 @@ Status CLNodeValidator::validate(INode *node) CLDepthwiseConvolutionLayer3x3>(*polymorphic_downcast(node)); case NodeType::NormalizePlanarYUVLayer: return detail::validate_normalize_planar_yuv_layer(*polymorphic_downcast(node)); + case NodeType::PadLayer: + return detail::validate_pad_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return detail::validate_permute_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index 17dc5836dd..1a8876a411 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -113,6 +113,8 @@ Status GCNodeValidator::validate(INode *node) 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::PadLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PadLayer"); case NodeType::PermuteLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PermuteLayer"); case NodeType::ReorgLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 0bc3339162..4f35298c7d 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -59,6 +59,8 @@ Status NENodeValidator::validate(INode *node) NEDepthwiseConvolutionLayer3x3>(*polymorphic_downcast(node)); case NodeType::NormalizePlanarYUVLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : NormalizePlanarYUVLayer"); + case NodeType::PadLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PadLayer"); case NodeType::PermuteLayer: return detail::validate_permute_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: diff --git a/src/graph/nodes/PadLayerNode.cpp b/src/graph/nodes/PadLayerNode.cpp new file mode 100644 index 0000000000..e7996d2684 --- /dev/null +++ b/src/graph/nodes/PadLayerNode.cpp @@ -0,0 +1,87 @@ +/* + * 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/PadLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +#include "arm_compute/core/Helpers.h" + +namespace arm_compute +{ +namespace graph +{ +PadLayerNode::PadLayerNode(PaddingList &padding) + : _padding(padding) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +const PaddingList &PadLayerNode::padding() const +{ + return _padding; +} + +bool PadLayerNode::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 PadLayerNode::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(); + const TensorShape input_shape = src->desc().shape; + for(size_t dim = 0; dim < _padding.size(); ++dim) + { + output_desc.shape.set(dim, _padding[dim].first + input_shape[dim] + _padding[dim].second); + } + + return output_desc; +} + +NodeType PadLayerNode::type() const +{ + return NodeType::PadLayer; +} + +void PadLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1