From 57c48243af8fd4b503fe629166531299c1b083d3 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 2 Aug 2018 13:41:49 +0100 Subject: MLCE-37: Adds PermuteNode support in graph Change-Id: Iaa93a497e7913c27f2fd09e974125cda5f04bc4b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/142463 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- 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 | 4 ++ src/graph/backends/NEON/NEFunctionFactory.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/PermuteLayerNode.cpp | 87 +++++++++++++++++++++++++++ 7 files changed, 104 insertions(+) create mode 100644 src/graph/nodes/PermuteLayerNode.cpp (limited to 'src/graph') diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 007f69177a..996af1dc90 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -471,6 +471,11 @@ 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_permute_node(Graph &g, NodeParams params, NodeIdxPair input, PermutationVector perm, DataLayout layout) +{ + return create_simple_single_input_output_node(g, params, input, perm, layout); +} + NodeID GraphBuilder::add_pooling_node(Graph &g, NodeParams params, NodeIdxPair input, PoolingLayerInfo pool_info) { return create_simple_single_input_output_node(g, params, input, pool_info); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 57871487ef..bf3dcba224 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::PermuteLayer: + return detail::create_permute_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: return detail::create_pooling_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 3e63617478..ba5b59d76a 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::PermuteLayer: + return detail::validate_permute_layer(*polymorphic_downcast(node)); default: return Status{}; } diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index 8118a7c476..542cfdf973 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -105,12 +105,16 @@ Status GCNodeValidator::validate(INode *node) NodeType type = node->type(); switch(type) { + case NodeType::ChannelShuffleLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ChannelShuffleLayer"); case NodeType::ConvolutionLayer: return validate_convolution_layer(*polymorphic_downcast(node)); case NodeType::DepthwiseConvolutionLayer: 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::PermuteLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PermuteLayer"); case NodeType::ReshapeLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ReshapeLayer"); default: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 6c912a02f1..36a25ada10 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -195,6 +195,8 @@ std::unique_ptr NEFunctionFactory::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::PermuteLayer: + return detail::create_permute_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: return detail::create_pooling_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 58589d5449..58ffaf024b 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -57,6 +57,8 @@ Status NENodeValidator::validate(INode *node) case NodeType::DepthwiseConvolutionLayer: return detail::validate_depthwise_convolution_layer(*polymorphic_downcast(node)); + case NodeType::PermuteLayer: + return detail::validate_permute_layer(*polymorphic_downcast(node)); default: return Status{}; } diff --git a/src/graph/nodes/PermuteLayerNode.cpp b/src/graph/nodes/PermuteLayerNode.cpp new file mode 100644 index 0000000000..042ec09167 --- /dev/null +++ b/src/graph/nodes/PermuteLayerNode.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/PermuteLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +#include "arm_compute/core/Helpers.h" + +namespace arm_compute +{ +namespace graph +{ +PermuteLayerNode::PermuteLayerNode(PermutationVector perm, DataLayout layout) + : _perm(perm), _layout(layout) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +const PermutationVector &PermuteLayerNode::permutation_vector() const +{ + return _perm; +} + +bool PermuteLayerNode::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 PermuteLayerNode::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(); + permute(output_desc.shape, _perm); + if(_layout != DataLayout::UNKNOWN) + { + output_desc.layout = _layout; + } + + return output_desc; +} + +NodeType PermuteLayerNode::type() const +{ + return NodeType::PermuteLayer; +} + +void PermuteLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute \ No newline at end of file -- cgit v1.2.1