From 4e1c3f336133319cfe45b037befdb252ffd9b744 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 20 Sep 2018 17:14:03 +0100 Subject: COMPMID-1595 Add UpsampleLayer to graph API Change-Id: I7427b0fbb222ff9760d47b01a59aee654f2f860f Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/149587 Tested-by: bsgcomp Reviewed-by: Georgios Pinitas --- 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/UpsampleLayerNode.cpp | 97 ++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 src/graph/nodes/UpsampleLayerNode.cpp (limited to 'src/graph') diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 12c5a950af..b3879d2951 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -519,6 +519,11 @@ NodeID GraphBuilder::add_split_node(Graph &g, NodeParams params, NodeIdxPair inp return create_simple_single_input_output_node(g, params, input, num_splits, axis); } +NodeID GraphBuilder::add_upsample_node(Graph &g, NodeParams params, NodeIdxPair input, Size2D info, InterpolationPolicy upsampling_policy) +{ + return create_simple_single_input_output_node(g, params, input, info, upsampling_policy); +} + NodeID GraphBuilder::add_yolo_node(Graph &g, NodeParams params, NodeIdxPair input, ActivationLayerInfo act_info, int32_t num_classes) { return create_simple_single_input_output_node(g, params, input, act_info, num_classes); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 30a6a10558..bd908c1ca4 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -117,6 +117,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_slice_layer(*polymorphic_downcast(node)); case NodeType::SoftmaxLayer: return detail::create_softmax_layer(*polymorphic_downcast(node), ctx); + case NodeType::UpsampleLayer: + return detail::create_upsample_layer(*polymorphic_downcast(node), ctx); case NodeType::YOLOLayer: return detail::create_yolo_layer(*polymorphic_downcast(node), ctx); default: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index eaf754decb..a91efce6e4 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -65,6 +65,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::SliceLayer: return detail::validate_slice_layer(*polymorphic_downcast(node)); + case NodeType::UpsampleLayer: + return detail::validate_upsample_layer(*polymorphic_downcast(node)); case NodeType::YOLOLayer: return detail::validate_yolo_layer(*polymorphic_downcast(node)); default: diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index fd82bf4a66..17dc5836dd 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -121,6 +121,8 @@ Status GCNodeValidator::validate(INode *node) return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ReshapeLayer"); case NodeType::SliceLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : SliceLayer"); + case NodeType::UpsampleLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : UpsampleLayer"); case NodeType::YOLOLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : YOLOLayer"); default: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index e70b993cc1..0bc3339162 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -65,6 +65,8 @@ Status NENodeValidator::validate(INode *node) return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::SliceLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : SliceLayer"); + case NodeType::UpsampleLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : UpsampleLayer"); case NodeType::YOLOLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : YOLOLayer"); default: diff --git a/src/graph/nodes/UpsampleLayerNode.cpp b/src/graph/nodes/UpsampleLayerNode.cpp new file mode 100644 index 0000000000..bdd39e8ebd --- /dev/null +++ b/src/graph/nodes/UpsampleLayerNode.cpp @@ -0,0 +1,97 @@ +/* + * 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/UpsampleLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" +#include "arm_compute/graph/Utils.h" + +namespace arm_compute +{ +namespace graph +{ +UpsampleLayerNode::UpsampleLayerNode(Size2D info, InterpolationPolicy upsampling_policy) + : _info(info), _upsampling_policy(upsampling_policy) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +Size2D UpsampleLayerNode::info() const +{ + return _info; +} + +InterpolationPolicy UpsampleLayerNode::upsampling_policy() const +{ + return _upsampling_policy; +} + +TensorDescriptor UpsampleLayerNode::compute_output_descriptor(const TensorDescriptor &input_descriptor, + Size2D info) +{ + const unsigned int input_width = get_dimension_size(input_descriptor, DataLayoutDimension::WIDTH); + const unsigned int input_height = get_dimension_size(input_descriptor, DataLayoutDimension::HEIGHT); + + TensorDescriptor output_descriptor = input_descriptor; + output_descriptor.shape.set(get_dimension_idx(output_descriptor, DataLayoutDimension::WIDTH), input_width * info.x()); + output_descriptor.shape.set(get_dimension_idx(output_descriptor, DataLayoutDimension::HEIGHT), input_height * info.y()); + + return output_descriptor; +} + +bool UpsampleLayerNode::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 UpsampleLayerNode::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 compute_output_descriptor(src->desc(), _info); +} + +NodeType UpsampleLayerNode::type() const +{ + return NodeType::UpsampleLayer; +} + +void UpsampleLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute \ No newline at end of file -- cgit v1.2.1