From 2bfadd92d638fd4e7b8b3398ce95f15930749189 Mon Sep 17 00:00:00 2001 From: thecha01 Date: Wed, 12 Aug 2020 17:25:51 +0100 Subject: Add StridedSliceLayerNode to graph API Signed-off-by: thecha01 Change-Id: I6d6fb2b053c74e35a86841621486bc0cd34b12b3 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3911 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- src/graph/GraphBuilder.cpp | 5 ++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 2 + src/graph/backends/NEON/NEFunctionFactory.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/StridedSliceLayerNode.cpp | 113 ++++++++++++++++++++++++++ 6 files changed, 126 insertions(+) create mode 100644 src/graph/nodes/StridedSliceLayerNode.cpp (limited to 'src') diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 01520421f0..a3953329d2 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -706,6 +706,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_strided_slice_node(Graph &g, NodeParams params, NodeIdxPair input, Coordinates &starts, Coordinates &ends, BiStrides &strides, StridedSliceLayerInfo info) +{ + return create_simple_single_input_output_node(g, params, input, starts, ends, strides, info); +} + NodeID GraphBuilder::add_stack_node(Graph &g, NodeParams params, const std::vector &inputs, int axis) { return create_simple_multiple_input_single_output_node(g, params, inputs, inputs.size(), axis); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 59db9129ab..594ad0a05a 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -306,6 +306,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_softmax_layer(*polymorphic_downcast(node), ctx); case NodeType::StackLayer: return detail::create_stack_layer(*polymorphic_downcast(node)); + case NodeType::StridedSliceLayer: + return detail::create_strided_slice_layer(*polymorphic_downcast(node)); case NodeType::UpsampleLayer: return detail::create_upsample_layer(*polymorphic_downcast(node), ctx); case NodeType::YOLOLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index ee77d58052..08d2f917ca 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -104,6 +104,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_roi_align_layer(*polymorphic_downcast(node)); case NodeType::SliceLayer: return detail::validate_slice_layer(*polymorphic_downcast(node)); + case NodeType::StridedSliceLayer: + return detail::validate_strided_slice_layer(*polymorphic_downcast(node)); case NodeType::UpsampleLayer: return detail::validate_upsample_layer(*polymorphic_downcast(node)); case NodeType::YOLOLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index d292977665..82f1abba9e 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -189,6 +189,8 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & return detail::create_softmax_layer(*polymorphic_downcast(node), ctx); case NodeType::StackLayer: return detail::create_stack_layer(*polymorphic_downcast(node)); + case NodeType::StridedSliceLayer: + return detail::create_strided_slice_layer(*polymorphic_downcast(node)); case NodeType::UpsampleLayer: return detail::create_upsample_layer(*polymorphic_downcast(node), ctx); case NodeType::YOLOLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 0f860b63f3..46f0051468 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -104,6 +104,8 @@ Status NENodeValidator::validate(INode *node) return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ROIAlignLayer"); case NodeType::SliceLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : SliceLayer"); + case NodeType::StridedSliceLayer: + return detail::validate_strided_slice_layer(*polymorphic_downcast(node)); case NodeType::UpsampleLayer: return detail::validate_upsample_layer(*polymorphic_downcast(node)); case NodeType::YOLOLayer: diff --git a/src/graph/nodes/StridedSliceLayerNode.cpp b/src/graph/nodes/StridedSliceLayerNode.cpp new file mode 100644 index 0000000000..6a1a724bb3 --- /dev/null +++ b/src/graph/nodes/StridedSliceLayerNode.cpp @@ -0,0 +1,113 @@ +/* + * 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. + */ +#include "arm_compute/graph/nodes/StridedSliceLayerNode.h" + +#include "arm_compute/core/Utils.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +namespace arm_compute +{ +namespace graph +{ +StridedSliceLayerNode::StridedSliceLayerNode(const Coordinates &starts, + const Coordinates &ends, + const BiStrides &strides, + StridedSliceLayerInfo info) + : _starts(starts), _ends(ends), _strides(strides), _info(std::move(info)) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +Coordinates StridedSliceLayerNode::starts() const +{ + return _starts; +} + +Coordinates StridedSliceLayerNode::ends() const +{ + return _ends; +} + +BiStrides StridedSliceLayerNode::strides() const +{ + return _strides; +} + +StridedSliceLayerInfo StridedSliceLayerNode::strided_slice_info() const +{ + return _info; +} + +TensorDescriptor StridedSliceLayerNode::compute_output_descriptor(const TensorDescriptor &input_descriptor, + const Coordinates &starts, + const Coordinates &ends, + const BiStrides &strides, + StridedSliceLayerInfo info) +{ + using namespace arm_compute::helpers::tensor_transform; + + TensorDescriptor output_desc = input_descriptor; + output_desc.shape = compute_strided_slice_output_shape(input_descriptor.shape, starts, ends, strides, + info.begin_mask(), info.end_mask(), info.shrink_axis_mask()); + + return output_desc; +} + +bool StridedSliceLayerNode::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 StridedSliceLayerNode::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(), _starts, _ends, _strides, _info); +} + +NodeType StridedSliceLayerNode::type() const +{ + return NodeType::StridedSliceLayer; +} + +void StridedSliceLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1