diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2019-03-04 14:14:02 +0000 |
|---|---|---|
| committer | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2019-03-19 10:18:10 +0000 |
| commit | 3dd5b6884a65c06bcb9d15589ee2dc2978e3b336 (patch) | |
| tree | e45ccae66b69c8db853ac883080c1c6358a57aec /src/graph | |
| parent | 2f7c149f36fa3e6296aba6de666962947f032558 (diff) | |
| download | ComputeLibrary-3dd5b6884a65c06bcb9d15589ee2dc2978e3b336.tar.gz | |
COMPMID-1933: Implement NEHeightConcatenateLayer.
Added support to concactenate tensors along the Y axis in NEConcatenateLayer.
Change-Id: Ib714bfcf9954cc35918efa7d52fc9164bb08bdf6
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/841
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/graph')
| -rw-r--r-- | src/graph/nodes/ConcatenateLayerNode.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/graph/nodes/ConcatenateLayerNode.cpp b/src/graph/nodes/ConcatenateLayerNode.cpp index ade3f6e1a9..3ce09d0073 100644 --- a/src/graph/nodes/ConcatenateLayerNode.cpp +++ b/src/graph/nodes/ConcatenateLayerNode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -71,10 +71,9 @@ TensorDescriptor ConcatenateLayerNode::compute_output_descriptor(const std::vect shapes.emplace_back(&input_descriptor.shape); } - // Calculate output shape - if(axis_idx == 0) + if(axis_idx < 2) { - output_descriptor.shape = arm_compute::misc::shape_calculator::calculate_width_concatenate_shape(shapes); + output_descriptor.shape = arm_compute::misc::shape_calculator::calculate_concatenate_shape(shapes, axis_idx); } else if(axis_idx == 2) { @@ -138,4 +137,4 @@ void ConcatenateLayerNode::accept(INodeVisitor &v) v.visit(*this); } } // namespace graph -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute |