From a9c4472188abef421adb589e2a6fef52727d465f Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Fri, 5 Apr 2019 17:18:36 +0100 Subject: COMPMID-2051 Refactor shape_calculator::calculate_concatenate_shape Change-Id: Ibf316718d11fa975d75f226925747b21c4efd127 Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/974 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- .../CL/kernels/CLDepthConcatenateLayerKernel.h | 5 +- .../kernels/GCDepthConcatenateLayerKernel.h | 5 +- .../NEON/kernels/NEDepthConcatenateLayerKernel.h | 7 +-- arm_compute/core/utils/misc/ShapeCalculator.h | 55 +++++++---------- arm_compute/runtime/GLES_COMPUTE/GCFunctions.h | 3 +- .../GLES_COMPUTE/functions/GCConcatenateLayer.h | 68 ++++++++++++++++++++++ .../functions/GCDepthConcatenateLayer.h | 3 +- 7 files changed, 98 insertions(+), 48 deletions(-) create mode 100644 arm_compute/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.h (limited to 'arm_compute') diff --git a/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h index ff8009085f..2a1845226f 100644 --- a/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -73,13 +73,10 @@ public: // Inherited methods overridden: void run(const Window &window, cl::CommandQueue &queue) override; - BorderSize border_size() const override; private: const ICLTensor *_input; ICLTensor *_output; - int _top_bottom; - int _left_right; unsigned int _depth_offset; }; } // namespace arm_compute diff --git a/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h b/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h index 06a54dd0b3..6a03170065 100644 --- a/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h +++ b/arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -64,13 +64,10 @@ public: // Inherited methods overridden: void run(const Window &window) override; - BorderSize border_size() const override; private: const IGCTensor *_input; IGCTensor *_output; - int _top_bottom; - int _left_right; int _depth_offset; }; } diff --git a/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h b/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h index 848d89fc9f..26e23a73a5 100644 --- a/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h +++ b/arm_compute/core/NEON/kernels/NEDepthConcatenateLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -76,17 +76,14 @@ public: // Inherited methods overridden: void run(const Window &window, const ThreadInfo &info) override; - BorderSize border_size() const override; private: - using DepthConcatFunction = void(const ITensor *in, ITensor *out, std::pair start_xy, int depth_offset, const Window &window); + using DepthConcatFunction = void(const ITensor *in, ITensor *out, int depth_offset, const Window &window); private: DepthConcatFunction *_func; const ITensor *_input; ITensor *_output; - int _top_bottom; - int _left_right; unsigned int _depth_offset; }; } // namespace arm_compute diff --git a/arm_compute/core/utils/misc/ShapeCalculator.h b/arm_compute/core/utils/misc/ShapeCalculator.h index 384bd460a0..f5058b35fb 100644 --- a/arm_compute/core/utils/misc/ShapeCalculator.h +++ b/arm_compute/core/utils/misc/ShapeCalculator.h @@ -1173,6 +1173,11 @@ inline TensorShape extract_shape(const TensorShape *data) return *data; } +inline TensorShape extract_shape(TensorShape *data) +{ + return *data; +} + /** Calculate the unstack shape of a tensor * * @param[in] input_shape Input tensor shape @@ -1187,37 +1192,6 @@ inline TensorShape calculate_unstack_shape(TensorShape input_shape, unsigned int return input_shape; } -/** Calculate the depth concatenate output shape of a vector of tensors - * - * @param[in] inputs_vector Vector containing the shapes of the inputs - * - * @return the calculated shape - */ -template -inline TensorShape calculate_depth_concatenate_shape(const std::vector &inputs_vector) -{ - TensorShape out_shape = extract_shape(inputs_vector[0]); - - size_t max_x = 0; - size_t max_y = 0; - size_t depth = 0; - - for(const auto &tensor : inputs_vector) - { - ARM_COMPUTE_ERROR_ON(tensor == nullptr); - const TensorShape shape = extract_shape(tensor); - max_x = std::max(shape.x(), max_x); - max_y = std::max(shape.y(), max_y); - depth += shape.z(); - } - - out_shape.set(0, max_x); - out_shape.set(1, max_y); - out_shape.set(2, depth); - - return out_shape; -} - /** Calculate the concatenate output shape of the concatenate operation along a single axis * * @param[in] input Vector containing the shapes of the inputs @@ -1230,12 +1204,27 @@ inline TensorShape calculate_concatenate_shape(const std::vector &input, si { TensorShape out_shape = extract_shape(input[0]); + // All dimensions must match except the axis one + for(unsigned int i = 0; i < MAX_DIMS; ++i) + { + if(i == axis) + { + continue; + } + + for(const auto &tensor : input) + { + ARM_COMPUTE_ERROR_ON(tensor == nullptr); + const TensorShape shape = extract_shape(tensor); + ARM_COMPUTE_ERROR_ON(out_shape[i] != shape[i]); + } + } + + // Calculate output shape size_t new_size = 0; for(const auto &tensor : input) { - ARM_COMPUTE_ERROR_ON(tensor == nullptr); const TensorShape shape = extract_shape(tensor); - ARM_COMPUTE_ERROR_ON(axis >= shape.num_dimensions()); new_size += shape[axis]; } diff --git a/arm_compute/runtime/GLES_COMPUTE/GCFunctions.h b/arm_compute/runtime/GLES_COMPUTE/GCFunctions.h index 6f338568c2..7e01480801 100644 --- a/arm_compute/runtime/GLES_COMPUTE/GCFunctions.h +++ b/arm_compute/runtime/GLES_COMPUTE/GCFunctions.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -29,6 +29,7 @@ #include "arm_compute/runtime/GLES_COMPUTE/functions/GCActivationLayer.h" #include "arm_compute/runtime/GLES_COMPUTE/functions/GCArithmeticAddition.h" #include "arm_compute/runtime/GLES_COMPUTE/functions/GCBatchNormalizationLayer.h" +#include "arm_compute/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.h" #include "arm_compute/runtime/GLES_COMPUTE/functions/GCConvolutionLayer.h" #include "arm_compute/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.h" #include "arm_compute/runtime/GLES_COMPUTE/functions/GCDepthwiseConvolutionLayer.h" diff --git a/arm_compute/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.h b/arm_compute/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.h new file mode 100644 index 0000000000..c57b282dbe --- /dev/null +++ b/arm_compute/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2019 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_GCDEPTHCONCATENATELAYER_H__ +#define __ARM_COMPUTE_GCDEPTHCONCATENATELAYER_H__ + +#include "arm_compute/core/GLES_COMPUTE/OpenGLES.h" +#include "arm_compute/core/GLES_COMPUTE/kernels/GCDepthConcatenateLayerKernel.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/IFunction.h" + +#include +#include + +namespace arm_compute +{ +class IGCTensor; + +/** Basic function to execute concatenate tensors along a given axis. This function calls the following kernels: + * + * @note only axis z is supported + * -# @ref GCDepthConcatenateLayerKernel + */ +class GCConcatenateLayer : public IFunction +{ +public: + /** Default constructor */ + GCConcatenateLayer(); + /** Initialise the kernel's inputs vector and output. + * + * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. + * + * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: F16/F32. + * @param[out] output Output tensor. Data types supported: Same as @p input. + * @param[in] axis Concatenation axis. Supported underlying concatenation axis is 2. + */ + void configure(std::vector inputs_vector, IGCTensor *output, size_t axis); + + // Inherited methods overridden: + void run() override; + +private: + std::vector> _concat_kernels; + unsigned int _num_inputs; + unsigned int _axis; +}; +} // namespace arm_compute +#endif /* __ARM_COMPUTE_GCDEPTHCONCATENATELAYER_H__ */ diff --git a/arm_compute/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.h b/arm_compute/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.h index 1151399f92..307ec49952 100644 --- a/arm_compute/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.h +++ b/arm_compute/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -39,6 +39,7 @@ class IGCTensor; /** Basic function to execute concatenate tensors along z axis. This function calls the following kernels: * + * @deprecated This function is deprecated and will be removed in release 19.08 * -# @ref GCFillBorderKernel (executed if input's lowest two dimensions are smaller than respective output's dimensions) * -# @ref GCDepthConcatenateLayerKernel * -- cgit v1.2.1