From bf17955e2bf36c635acbac7c3bb03fbbd7732671 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Tue, 5 Sep 2017 13:51:21 +0100 Subject: COMPMID-522 - Added support for GlobalPooling in CLPoolingLayer and CLFlattening for 3D tensor Change-Id: Ifc7db1e4d4af322a4dcbfeb3e132e5c326596872 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/86618 Reviewed-by: Georgios Pinitas Tested-by: Kaizen --- arm_compute/core/CL/kernels/CLPoolingLayerKernel.h | 7 +-- arm_compute/runtime/CL/CLFunctions.h | 1 + arm_compute/runtime/CL/functions/CLFlattenLayer.h | 52 ++++++++++++++++++++++ arm_compute/runtime/CL/functions/CLPoolingLayer.h | 2 +- 4 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 arm_compute/runtime/CL/functions/CLFlattenLayer.h (limited to 'arm_compute') diff --git a/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h b/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h index 971e1506af..9251a8ed98 100644 --- a/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLPoolingLayerKernel.h @@ -49,10 +49,11 @@ public: /** Set the input and output tensors. * - * @param[in] input Source tensor. Data types supported: F16/F32. + * @note QS8 and QS16 are supported only for pool sizes 3, 5 and 7 + * + * @param[in] input Source tensor. Data types supported: QS8/QS16/F16/F32. * @param[out] output Destination tensor. Data types supported: Same as @p input. * @param[in] pool_info Contains pooling operation information described in @ref PoolingLayerInfo. - * Supported pooling sizes : 2, 3 and 7 */ void configure(const ICLTensor *input, ICLTensor *output, const PoolingLayerInfo &pool_info); @@ -67,5 +68,5 @@ private: BorderSize _border_size; unsigned int _num_elems_processed_per_iteration; }; -} +} // namespace arm_compute #endif /*__ARM_COMPUTE_CLPOOLINGLAYERKERNEL_H__ */ diff --git a/arm_compute/runtime/CL/CLFunctions.h b/arm_compute/runtime/CL/CLFunctions.h index 9c1177f43e..64b2deb3bf 100644 --- a/arm_compute/runtime/CL/CLFunctions.h +++ b/arm_compute/runtime/CL/CLFunctions.h @@ -53,6 +53,7 @@ #include "arm_compute/runtime/CL/functions/CLErode.h" #include "arm_compute/runtime/CL/functions/CLFastCorners.h" #include "arm_compute/runtime/CL/functions/CLFillBorder.h" +#include "arm_compute/runtime/CL/functions/CLFlattenLayer.h" #include "arm_compute/runtime/CL/functions/CLFloor.h" #include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" #include "arm_compute/runtime/CL/functions/CLGEMM.h" diff --git a/arm_compute/runtime/CL/functions/CLFlattenLayer.h b/arm_compute/runtime/CL/functions/CLFlattenLayer.h new file mode 100644 index 0000000000..e19b0e465f --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLFlattenLayer.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2017 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_CLFLATTENLAYER_H__ +#define __ARM_COMPUTE_CLFLATTENLAYER_H__ + +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/ICLSimpleFunction.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Basic function to execute flatten. This function calls the following OpenCL kernel: +* +* -# @ref CLIm2ColKernel +* +*/ +class CLFlattenLayer : public ICLSimpleFunction +{ +public: + /** Initialise the kernel's input and output. + * + * @param[in] input First input tensor to flatten with at least 3 dimensions. The dimensions over the third will be interpreted as batches. Data types supported: QS8/QS16/F16/F32 + * @param[out] output Output tensor with shape [w*h*d, input_batches] where: + * w = width input tensor, h = height input tensor and d = depth input tensor. Data type supported: same as @p input + */ + void configure(const ICLTensor *input, ICLTensor *output); +}; +} // namespace arm_compute + +#endif /* __ARM_COMPUTE_CLFLATTENLAYER_H__ */ \ No newline at end of file diff --git a/arm_compute/runtime/CL/functions/CLPoolingLayer.h b/arm_compute/runtime/CL/functions/CLPoolingLayer.h index b9675b94e0..80233d400e 100644 --- a/arm_compute/runtime/CL/functions/CLPoolingLayer.h +++ b/arm_compute/runtime/CL/functions/CLPoolingLayer.h @@ -48,5 +48,5 @@ public: */ void configure(ICLTensor *input, ICLTensor *output, const PoolingLayerInfo &pool_info); }; -} +} // namespace arm_compute #endif /* __ARM_COMPUTE_CLPOOLINGLAYER_H__ */ -- cgit v1.2.1