From 04f089cbcb4407e8d2883525edb661ba15ea922d Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 8 Aug 2017 17:42:38 +0100 Subject: COMPMID-476 L2 Normalization for CL Change-Id: I88f87173645880eb823916c5d4ac884c372a4fb4 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/83269 Reviewed-by: Anthony Barbier Tested-by: Kaizen --- arm_compute/core/CL/CLKernels.h | 2 + arm_compute/core/CL/kernels/CLL2NormalizeKernel.h | 72 ++++++++++++++++++++++ .../core/CL/kernels/CLReductionOperationKernel.h | 72 ++++++++++++++++++++++ arm_compute/core/Types.h | 1 + 4 files changed, 147 insertions(+) create mode 100644 arm_compute/core/CL/kernels/CLL2NormalizeKernel.h create mode 100644 arm_compute/core/CL/kernels/CLReductionOperationKernel.h (limited to 'arm_compute/core') diff --git a/arm_compute/core/CL/CLKernels.h b/arm_compute/core/CL/CLKernels.h index 0e64851457..5a61c9a970 100644 --- a/arm_compute/core/CL/CLKernels.h +++ b/arm_compute/core/CL/CLKernels.h @@ -64,6 +64,7 @@ #include "arm_compute/core/CL/kernels/CLHistogramKernel.h" #include "arm_compute/core/CL/kernels/CLIm2ColKernel.h" #include "arm_compute/core/CL/kernels/CLIntegralImageKernel.h" +#include "arm_compute/core/CL/kernels/CLL2NormalizeKernel.h" #include "arm_compute/core/CL/kernels/CLLKTrackerKernel.h" #include "arm_compute/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.h" #include "arm_compute/core/CL/kernels/CLMagnitudePhaseKernel.h" @@ -75,6 +76,7 @@ #include "arm_compute/core/CL/kernels/CLNormalizationLayerKernel.h" #include "arm_compute/core/CL/kernels/CLPixelWiseMultiplicationKernel.h" #include "arm_compute/core/CL/kernels/CLPoolingLayerKernel.h" +#include "arm_compute/core/CL/kernels/CLReductionOperationKernel.h" #include "arm_compute/core/CL/kernels/CLRemapKernel.h" #include "arm_compute/core/CL/kernels/CLScaleKernel.h" #include "arm_compute/core/CL/kernels/CLScharr3x3Kernel.h" diff --git a/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h b/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h new file mode 100644 index 0000000000..6a1f59d112 --- /dev/null +++ b/arm_compute/core/CL/kernels/CLL2NormalizeKernel.h @@ -0,0 +1,72 @@ +/* + * 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_CLL2NORMALIZEKERNEL_H__ +#define __ARM_COMPUTE_CLL2NORMALIZEKERNEL_H__ + +#include "arm_compute/core/CL/ICLKernel.h" +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Interface for the reduction operation kernel */ +class CLL2NormalizeKernel : public ICLKernel +{ +public: + /** Default constructor */ + CLL2NormalizeKernel(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLL2NormalizeKernel(const CLL2NormalizeKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLL2NormalizeKernel &operator=(const CLL2NormalizeKernel &) = delete; + /** Allow instances of this class to be moved */ + CLL2NormalizeKernel(CLL2NormalizeKernel &&) = default; + /** Allow instances of this class to be moved */ + CLL2NormalizeKernel &operator=(CLL2NormalizeKernel &&) = default; + /** Default destructor */ + ~CLL2NormalizeKernel() = default; + + /** Set the input and output tensors. + * + * @param[in] input Source tensor. Data types supported: QS8, QS16, F32. + * @param[in] sum Sum values tensor. Data types supported: same as @p input. + * @param[out] output Destination tensor. Data types supported: Same as @p input. + * @param[in] axis Axis along which to reduce. Supported reduction axis : 0 + * @param[in] epsilon Lower bound value for the normalization. + */ + void configure(const ICLTensor *input, const ICLTensor *sum, ICLTensor *output, unsigned int axis, float epsilon); + + // Inherited methods overridden: + void run(const Window &window, cl::CommandQueue &queue) override; + +private: + const ICLTensor *_input; + const ICLTensor *_sum; + ICLTensor *_output; + unsigned int _axis; + float _epsilon; +}; +} +#endif /*__ARM_COMPUTE_CLL2NORMALIZEKERNEL_H__ */ diff --git a/arm_compute/core/CL/kernels/CLReductionOperationKernel.h b/arm_compute/core/CL/kernels/CLReductionOperationKernel.h new file mode 100644 index 0000000000..77cac7b4e6 --- /dev/null +++ b/arm_compute/core/CL/kernels/CLReductionOperationKernel.h @@ -0,0 +1,72 @@ +/* + * 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_CLREDUCTIONOPERATIONKERNEL_H__ +#define __ARM_COMPUTE_CLREDUCTIONOPERATIONKERNEL_H__ + +#include "arm_compute/core/CL/ICLKernel.h" +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +class ICLTensor; + +/** Interface for the reduction operation kernel */ +class CLReductionOperationKernel : public ICLKernel +{ +public: + /** Default constructor */ + CLReductionOperationKernel(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLReductionOperationKernel(const CLReductionOperationKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLReductionOperationKernel &operator=(const CLReductionOperationKernel &) = delete; + /** Allow instances of this class to be moved */ + CLReductionOperationKernel(CLReductionOperationKernel &&) = default; + /** Allow instances of this class to be moved */ + CLReductionOperationKernel &operator=(CLReductionOperationKernel &&) = default; + /** Default destructor */ + ~CLReductionOperationKernel() = default; + + /** Set the input and output tensors. + * + * @param[in] input Source tensor. Data types supported: F32. + * @param[out] output Destination tensor. Data types supported: Same as @p input. + * @param[in] axis Axis along which to reduce. Supported reduction axis : 0 + * @param[in] op Reduction operation to perform. + */ + void configure(const ICLTensor *input, ICLTensor *output, unsigned int axis, ReductionOperation op); + + // Inherited methods overridden: + void run(const Window &window, cl::CommandQueue &queue) override; + BorderSize border_size() const override; + +private: + const ICLTensor *_input; + ICLTensor *_output; + unsigned int _reduction_axis; + ReductionOperation _op; + BorderSize _border_size; +}; +} +#endif /*__ARM_COMPUTE_CLREDUCTIONOPERATIONKERNEL_H__ */ diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index 1d04f35359..5eaaee6b7b 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -346,6 +346,7 @@ enum class NonLinearFilterFunction : unsigned enum class ReductionOperation { SUM_SQUARE, /**< Sum of squares */ + SUM, /**< Sum */ }; /** The normalization type used for the normalization layer */ -- cgit v1.2.1