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 --- .../NEON/functions/NEWidthConcatenateLayer.h | 90 ---------------------- 1 file changed, 90 deletions(-) delete mode 100644 arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h (limited to 'arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h') diff --git a/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h deleted file mode 100644 index 8d221766cd..0000000000 --- a/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h +++ /dev/null @@ -1,90 +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_NEWIDTHCONCATENATELAYER_H__ -#define __ARM_COMPUTE_NEWIDTHCONCATENATELAYER_H__ - -#include "arm_compute/core/Types.h" -#include "arm_compute/core/Window.h" -#include "arm_compute/runtime/IFunction.h" - -#include "arm_compute/core/NEON/kernels/NEWidthConcatenateLayerKernel.h" - -#include "arm_compute/core/utils/misc/Requires.h" - -#include -#include -#include - -namespace arm_compute -{ -// Forward declarations -class ITensor; - -/** Basic function to execute concatenate tensors along x axis. This function calls the following kernel: - * - * -# @ref NEWidthConcatenateLayerKernel - * - * @deprecated This function is deprecated and will be removed in release 19.08 - */ -class NEWidthConcatenateLayer : public IFunction -{ -public: - /** Default constructor */ - NEWidthConcatenateLayer(); - /** Initialise the kernel's inputs vector and output. - * - * @param[in] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/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, ITensor *output); - void configure(std::vector inputs_vector, ITensor *output); - /** Static function to check if given info will lead to a valid configuration of @ref NEWidthConcatenateLayer - * - * @param[in] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/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); - static Status validate(const std::vector &inputs_vector, const ITensorInfo *output); - - // Inherited methods overridden: - void run() override; - -private: - std::vector _concat_kernels_vector; - unsigned int _num_inputs; - template ::type, ITensor>::value)> - void configure_internal(std::vector &&inputs_vector, ITensor *output); - template ::type, ITensorInfo>::value)> - static Status validate_internal(const std::vector &inputs_vector, const ITensorInfo *output); -}; -} // namespace arm_compute -#endif /* __ARM_COMPUTE_NEWIDTHCONCATENATELAYER_H__ */ -- cgit v1.2.1