COMPMID-1576: Add SliceLayer to graph API
Change-Id: I42260cc529ca7721e221d3d0576b1668e09f8307
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148255
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h
index 21c85b5..3821eb3 100644
--- a/arm_compute/graph/GraphBuilder.h
+++ b/arm_compute/graph/GraphBuilder.h
@@ -329,6 +329,17 @@
* @return Node ID of the created node, EmptyNodeID in case of error
*/
static NodeID add_softmax_node(Graph &g, NodeParams params, NodeIdxPair input, float beta = 1.f);
+ /** Adds a slice 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 slice layer node as a NodeID-Index pair
+ * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ *
+ * @return Node ID of the created node, EmptyNodeID in case of error
+ */
+ static NodeID add_slice_node(Graph &g, NodeParams params, NodeIdxPair input, Coordinates &starts, Coordinates &ends);
/** Adds a split 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 0d11169..983400f 100644
--- a/arm_compute/graph/TypePrinter.h
+++ b/arm_compute/graph/TypePrinter.h
@@ -116,6 +116,9 @@
case NodeType::SoftmaxLayer:
os << "SoftmaxLayer";
break;
+ case NodeType::SliceLayer:
+ os << "SliceLayer";
+ break;
case NodeType::SplitLayer:
os << "SplitLayer";
break;
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index cc3e346..1e613f7 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -148,6 +148,7 @@
ReshapeLayer,
ResizeLayer,
SoftmaxLayer,
+ SliceLayer,
SplitLayer,
YOLOLayer,
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index 9ef7226..7f5093a 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -735,7 +735,7 @@
/** Create a backend reorg layer function
*
- * @tparam ReorgLayerFunction Backend reshape function
+ * @tparam ReorgLayerFunction Backend reorg function
* @tparam TargetInfo Target-specific information
*
* @param[in] node Node to create the backend function for
@@ -840,6 +840,41 @@
return std::move(func);
}
+/** Create a backend slice layer function
+ *
+ * @tparam SliceLayerFunction Backend slice function
+ * @tparam TargetInfo Target-specific information
+ *
+ * @param[in] node Node to create the backend function for
+ *
+ * @return Backend slice layer function
+ */
+template <typename SliceLayerFunction, typename TargetInfo>
+std::unique_ptr<IFunction> create_slice_layer(SliceLayerNode &node)
+{
+ validate_node<TargetInfo>(node, 1 /* expected inputs */, 1 /* expected outputs */);
+
+ // Extract IO and info
+ typename TargetInfo::TensorType *input = get_backing_tensor<TargetInfo>(node.input(0));
+ typename TargetInfo::TensorType *output = get_backing_tensor<TargetInfo>(node.output(0));
+ ARM_COMPUTE_ERROR_ON(input == nullptr);
+ ARM_COMPUTE_ERROR_ON(output == nullptr);
+
+ // Create and configure function
+ auto func = support::cpp14::make_unique<SliceLayerFunction>();
+ func->configure(input, output, node.starts(), node.ends());
+
+ // Log info
+ ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type()
+ << " Target " << TargetInfo::TargetType
+ << " Data Type: " << input->info()->data_type()
+ << " Input shape: " << input->info()->tensor_shape()
+ << " Output shape: " << output->info()->tensor_shape()
+ << std::endl);
+
+ return std::move(func);
+}
+
/** Create a backend softmax layer function
*
* @tparam SoftmaxLayerFunction Backend softmax function
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index eb37625..2dc3491 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -249,6 +249,30 @@
return ReorgLayer::validate(input, output, node.stride());
}
+/** Validates a Slice layer node
+ *
+ * @tparam SliceLayer Slice layer function type
+ *
+ * @param[in] node Node to validate
+ *
+ * @return Status
+ */
+template <typename SliceLayer>
+Status validate_slice_layer(SliceLayerNode &node)
+{
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating Slice node with ID : " << node.id() << " and Name: " << node.name() << std::endl);
+ ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 1);
+ ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 1);
+
+ // Extract IO and info
+ arm_compute::ITensorInfo *input = get_backing_tensor_info(node.input(0));
+ arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0));
+ const Coordinates starts = node.starts();
+ const Coordinates ends = node.ends();
+
+ return SliceLayer::validate(input, output, starts, ends);
+}
+
/** Validates a YOLO layer node
*
* @tparam YOLOLayer YOLO layer type
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index bbfda9c..3a45115 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -718,6 +718,32 @@
ITensorAccessorUPtr _add_w;
};
+/** Slice Layer */
+class SliceLayer final : public ILayer
+{
+public:
+ /** Construct a slice layer.
+ *
+ * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ */
+ SliceLayer(Coordinates &starts, Coordinates &ends)
+ : _starts(starts), _ends(ends)
+ {
+ }
+
+ NodeID create_layer(IStream &s) override
+ {
+ NodeParams common_params = { name(), s.hints().target_hint };
+ NodeIdxPair input = { s.tail_node(), 0 };
+ return GraphBuilder::add_slice_node(s.graph(), common_params, input, _starts, _ends);
+ }
+
+private:
+ Coordinates _starts;
+ Coordinates _ends;
+};
+
/** Softmax Layer */
class SoftmaxLayer final : public ILayer
{
diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h
index 92dfa41..f1b899f 100644
--- a/arm_compute/graph/nodes/Nodes.h
+++ b/arm_compute/graph/nodes/Nodes.h
@@ -45,6 +45,7 @@
#include "arm_compute/graph/nodes/ReorgLayerNode.h"
#include "arm_compute/graph/nodes/ReshapeLayerNode.h"
#include "arm_compute/graph/nodes/ResizeLayerNode.h"
+#include "arm_compute/graph/nodes/SliceLayerNode.h"
#include "arm_compute/graph/nodes/SoftmaxLayerNode.h"
#include "arm_compute/graph/nodes/SplitLayerNode.h"
#include "arm_compute/graph/nodes/YOLOLayerNode.h"
diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h
index c000834..18a8e2e 100644
--- a/arm_compute/graph/nodes/NodesFwd.h
+++ b/arm_compute/graph/nodes/NodesFwd.h
@@ -52,6 +52,7 @@
class ReshapeLayerNode;
class ResizeLayerNode;
class SoftmaxLayerNode;
+class SliceLayerNode;
class SplitLayerNode;
class YOLOLayerNode;
} // namespace graph
diff --git a/arm_compute/graph/nodes/SliceLayerNode.h b/arm_compute/graph/nodes/SliceLayerNode.h
new file mode 100644
index 0000000..861654e
--- /dev/null
+++ b/arm_compute/graph/nodes/SliceLayerNode.h
@@ -0,0 +1,78 @@
+/*
+ * 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_SLICE_LAYER_NODE_H__
+#define __ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H__
+
+#include "arm_compute/graph/INode.h"
+
+#include <tuple>
+
+namespace arm_compute
+{
+namespace graph
+{
+/** Slice Layer node */
+class SliceLayerNode final : public INode
+{
+public:
+ /** Default Constructor
+ *
+ * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ */
+ SliceLayerNode(Coordinates &starts, Coordinates &ends);
+ /** Computes slice layer output descriptor
+ *
+ * @param[in] input_descriptor Descriptor of the input tensor
+ * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input).
+ *
+ * @return Output descriptor
+ */
+ static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor,
+ const Coordinates &starts, const Coordinates &ends);
+ /** Start coordinates accessor
+ *
+ * @return Start coordinates of the dimensions
+ */
+ Coordinates starts() const;
+ /** End coordinates accessor
+ *
+ * @return End coordinates of the dimensions
+ */
+ Coordinates ends() const;
+
+ // Inherited overridden methods:
+ NodeType type() const override;
+ bool forward_descriptors() override;
+ TensorDescriptor configure_output(size_t idx) const override;
+ void accept(INodeVisitor &v) override;
+
+private:
+ Coordinates _starts;
+ Coordinates _ends;
+};
+} // namespace graph
+} // namespace arm_compute
+#endif /* __ARM_COMPUTE_GRAPH_SLICE_LAYER_NODE_H__ */