From 09f24975437e2e141ba51a07055a9372b0d173a2 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 17 May 2019 18:14:40 +0100 Subject: COMPMID-2109: Remove CL/NE Width/Depth ConcatenateLayer functions. Change-Id: Icbda771abffbb45d4ed0958933c60ff9ace01314 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/1178 Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- arm_compute/runtime/CL/CLFunctions.h | 2 - .../runtime/CL/functions/CLConcatenateLayer.h | 10 +-- .../runtime/CL/functions/CLDepthConcatenateLayer.h | 95 ---------------------- arm_compute/runtime/CL/functions/CLLSTMLayer.h | 4 +- .../runtime/CL/functions/CLWidthConcatenateLayer.h | 88 -------------------- 5 files changed, 7 insertions(+), 192 deletions(-) delete mode 100644 arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h delete mode 100644 arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h (limited to 'arm_compute/runtime/CL') diff --git a/arm_compute/runtime/CL/CLFunctions.h b/arm_compute/runtime/CL/CLFunctions.h index e314f44370..fbaab35414 100644 --- a/arm_compute/runtime/CL/CLFunctions.h +++ b/arm_compute/runtime/CL/CLFunctions.h @@ -53,7 +53,6 @@ #include "arm_compute/runtime/CL/functions/CLCropResize.h" #include "arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h" -#include "arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h" #include "arm_compute/runtime/CL/functions/CLDepthConvertLayer.h" #include "arm_compute/runtime/CL/functions/CLDepthwiseConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h" @@ -143,7 +142,6 @@ #include "arm_compute/runtime/CL/functions/CLUpsampleLayer.h" #include "arm_compute/runtime/CL/functions/CLWarpAffine.h" #include "arm_compute/runtime/CL/functions/CLWarpPerspective.h" -#include "arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h" #include "arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLWinogradInputTransform.h" #include "arm_compute/runtime/CL/functions/CLYOLOLayer.h" diff --git a/arm_compute/runtime/CL/functions/CLConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLConcatenateLayer.h index d85a4453d8..c56fc117b9 100644 --- a/arm_compute/runtime/CL/functions/CLConcatenateLayer.h +++ b/arm_compute/runtime/CL/functions/CLConcatenateLayer.h @@ -26,7 +26,7 @@ #include "arm_compute/runtime/IFunction.h" -#include "arm_compute/core/CL/kernels/CLHeightConcatenateLayerKernel.h" +#include "arm_compute/core/CL/ICLKernel.h" #include "arm_compute/core/Types.h" #include @@ -41,9 +41,9 @@ class Status; /** Basic function to execute concatenate tensors along a given axis. This function calls the following kernels: * - * -# @ref CLWidthConcatenateLayer (if underlying concatenation axis is 0). + * -# @ref CLWidthConcatenateLayerKernel (if underlying concatenation axis is 0). * -# @ref CLHeightConcatenateLayerKernel (if underlying concatenation axis is 1). - * -# @ref CLDepthConcatenateLayer (if underlying concatenation axis is 2). + * -# @ref CLDepthConcatenateLayerKernel (if underlying concatenation axis is 2). */ class CLConcatenateLayer : public IFunction { @@ -53,7 +53,7 @@ public: /** Initialise the kernel's inputs vector and output. * * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. - * @note Preconditions can be found respectively at @ref CLWidthConcatenateLayer, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayer. + * @note Preconditions can be found respectively at @ref CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. * * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/F16/F32. * @param[out] output Output tensor. Data types supported: Same as @p input. @@ -63,7 +63,7 @@ public: /** Static function to check if given info will lead to a valid configuration of @ref CLConcatenateLayer * * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. - * @note Preconditions can be found respectively at @ref CLWidthConcatenateLayer, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayer. + * @note Preconditions can be found respectively at @ref CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. * * @param[in] inputs_vector The vectors containing all the tensors info to concatenate. Data types supported: QASYMM8/F16/F32. * @param[in] output Output tensor info. Data types supported: Same as @p input. diff --git a/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h deleted file mode 100644 index 9ef21f32d7..0000000000 --- a/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2017-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_CLDEPTHCONCATENATE_H__ -#define __ARM_COMPUTE_CLDEPTHCONCATENATE_H__ - -#include "arm_compute/core/CL/OpenCL.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/core/Window.h" -#include "arm_compute/runtime/IFunction.h" - -#include "arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h" -#include "arm_compute/core/CL/kernels/CLFillBorderKernel.h" - -#include -#include - -namespace arm_compute -{ -class ICLTensor; - -/** 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 CLFillBorderKernel (executed if input's lowest two dimensions are smaller than respective output's dimensions) - * -# @ref CLDepthConcatenateLayerKernel - * - */ -class CLDepthConcatenateLayer : public IFunction -{ -public: - /** Default constructor */ - CLDepthConcatenateLayer(); - /** Initialise the kernel's inputs vector and output. - * - * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/F16/F32. - * Input dimensions might differ for each input for the first three dimensions (width, height, depth) - * and must match for the rest. - * Note that the difference between the minimum and maximum width and height among the input tensors - * must be divisible by 2 otherwise it is not clear how padding should be added on the inputs' width and - * height when they are less than the maximum input sizes. - * @param[out] output Output tensor. Data types supported: Same as @p input. - * Output tensor dimensions match the inputs' ones from the fourth dimension and above, - * while width and height are the maximum width and height of the input tensors. - * Finally, depth is the sum of the input depths. - */ - void configure(const std::vector &inputs_vector, ICLTensor *output); - /** Static function to check if given info will lead to a valid configuration of @ref CLDepthConcatenateLayer - * - * @param[in] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/F16/F32. - * Input dimensions might differ for each input for the first three dimensions (width, height, depth) - * and must match for the rest. - * Note that the difference between the minimum and maximum width and height among the input tensors - * must be divisible by 2 otherwise it is not clear how padding should be added on the inputs' width and - * height when they are less than the maximum input sizes. - * @param[in] output Output tensor. Data types supported: Same as @p input. - * Output tensor dimensions match the inputs' ones from the fourth dimension and above, - * while width and height are the maximum width and height of the input tensors. - * Finally, depth is the sum of the input depths. - * - * @return a status - */ - static Status validate(const std::vector &inputs_vector, const ITensorInfo *output); - - // Inherited methods overridden: - void run() override; - -private: - std::vector _concat_kernels_vector; - std::vector _border_handlers_vector; - unsigned int _num_inputs; -}; -} -#endif /* __ARM_COMPUTE_CLDEPTHCONCATENATE_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLLSTMLayer.h b/arm_compute/runtime/CL/functions/CLLSTMLayer.h index 8bd47cbf8e..3add152878 100644 --- a/arm_compute/runtime/CL/functions/CLLSTMLayer.h +++ b/arm_compute/runtime/CL/functions/CLLSTMLayer.h @@ -35,10 +35,10 @@ #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/CLMemoryGroup.h" #include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLConcatenateLayer.h" #include "arm_compute/runtime/CL/functions/CLElementwiseOperations.h" #include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" #include "arm_compute/runtime/CL/functions/CLGEMM.h" -#include "arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h" #include "arm_compute/runtime/IMemoryManager.h" #include "arm_compute/runtime/common/LSTMParams.h" @@ -184,7 +184,7 @@ private: CLActivationLayerKernel _projection_clip; CLCopyKernel _copy_cell_state; CLCopyKernel _copy_output; - CLWidthConcatenateLayer _concat_scratch_buffer; + CLConcatenateLayer _concat_scratch_buffer; CLWidthConcatenate2TensorsKernel _concat_inputs_forget_gate; CLWidthConcatenate2TensorsKernel _concat_weights_forget_gate; CLWidthConcatenate2TensorsKernel _concat_weights_input_gate; diff --git a/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h deleted file mode 100644 index 6a30fcfa92..0000000000 --- a/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2018-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_CLWIDTHCONCATENATELAYER_H__ -#define __ARM_COMPUTE_CLWIDTHCONCATENATELAYER_H__ - -#include "arm_compute/core/CL/OpenCL.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/core/Window.h" -#include "arm_compute/runtime/IFunction.h" - -#include "arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.h" -#include "arm_compute/core/CL/kernels/CLWidthConcatenate4TensorsKernel.h" -#include "arm_compute/core/CL/kernels/CLWidthConcatenateLayerKernel.h" - -#include -#include - -namespace arm_compute -{ -class ICLTensor; - -/** Basic function to execute concatenate tensors along x axis. This function calls the following kernel: - * - * @deprecated This function is deprecated and will be removed in release 19.08 - * - * -# @ref CLWidthConcatenateLayerKernel - * -# @ref CLWidthConcatenate2TensorsKernel (if there are exactly 2 input tensors) - * -# @ref CLWidthConcatenate4TensorsKernel (if there are exactly 4 input tensors) - * - */ -class CLWidthConcatenateLayer : public IFunction -{ -public: - /** Default constructor */ - CLWidthConcatenateLayer(); - /** Initialise the kernel's inputs vector and output. - * - * @param[in] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/F16/F32. - * Dimensions of all the inputs should match apart for the width which can differ. - * @param[out] output Output tensor. Data types supported: Same as @p input. - * Output tensor dimensions are the same with the inputs from the second dimension and above. - * The first dimension (width) is the sum of the input tensors' widths. - */ - void configure(std::vector inputs_vector, ICLTensor *output); - /** Static function to check if given info will lead to a valid configuration of @ref CLDepthConcatenateLayerKernel - * - * @param[in] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/F16/F32. - * Dimensions of all the inputs should match apart for the width which can differ. - * @param[in] output Output tensor. Data types supported: Same as @p input. - * Output tensor dimensions are the same with the inputs from the second dimension and above. - * The first dimension (width) is the sum of the input tensors' widths. - * - * @return a status - */ - static Status validate(const std::vector &inputs_vector, const ITensorInfo *output); - - // Inherited methods overridden: - void run() override; - -private: - std::vector _concat_kernels_vector; - CLWidthConcatenate2TensorsKernel _concat_x2_kernel; - CLWidthConcatenate4TensorsKernel _concat_x4_kernel; - unsigned int _num_inputs; -}; -} // namespace arm_compute -#endif /* __ARM_COMPUTE_CLWIDTHCONCATENATELAYER_H__ */ -- cgit v1.2.1