From 721c4cb0e1fbf1f151a79cd4c9d67e832f94f9bf Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 4 Sep 2018 15:27:25 +0100 Subject: COMPMID-1461 SSD support: Create NEON PriorBox Change-Id: I99e1c3939cfea4b9cb0ddfa313706f31b213ca89 --- arm_compute/core/NEON/NEKernels.h | 1 + .../core/NEON/kernels/NEPriorBoxLayerKernel.h | 105 +++++++++++++++++++++ arm_compute/core/Types.h | 4 +- arm_compute/runtime/CL/functions/CLPriorBoxLayer.h | 2 - arm_compute/runtime/NEON/NEFunctions.h | 1 + .../runtime/NEON/functions/NEPriorBoxLayer.h | 59 ++++++++++++ 6 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h create mode 100644 arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h (limited to 'arm_compute') diff --git a/arm_compute/core/NEON/NEKernels.h b/arm_compute/core/NEON/NEKernels.h index 76eb5cb5f2..0cfde722d9 100644 --- a/arm_compute/core/NEON/NEKernels.h +++ b/arm_compute/core/NEON/NEKernels.h @@ -99,6 +99,7 @@ #include "arm_compute/core/NEON/kernels/NEPermuteKernel.h" #include "arm_compute/core/NEON/kernels/NEPixelWiseMultiplicationKernel.h" #include "arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h" +#include "arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEQuantizationLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h" #include "arm_compute/core/NEON/kernels/NEReductionOperationKernel.h" diff --git a/arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h b/arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h new file mode 100644 index 0000000000..ac61b61142 --- /dev/null +++ b/arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2018 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_NEPRIORBOXLAYERKERNEL_H__ +#define __ARM_COMPUTE_NEPRIORBOXLAYERKERNEL_H__ + +#include "arm_compute/core/NEON/INEKernel.h" + +namespace arm_compute +{ +class ITensor; + +/** Interface for the kernel to calculate prior boxes */ +class NEPriorBoxLayerKernel : public INEKernel +{ +public: + const char *name() const override + { + return "NEPriorBoxLayerKernel"; + } + /** Default constructor */ + NEPriorBoxLayerKernel(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEPriorBoxLayerKernel(const NEPriorBoxLayerKernel &) = delete; + /** Prevent instances of this class from being copied (As this class contains pointers) */ + NEPriorBoxLayerKernel &operator=(const NEPriorBoxLayerKernel &) = delete; + /** Allow instances of this class to be moved */ + NEPriorBoxLayerKernel(NEPriorBoxLayerKernel &&) = default; + /** Allow instances of this class to be moved */ + NEPriorBoxLayerKernel &operator=(NEPriorBoxLayerKernel &&) = default; + /** Set the input and output tensors. + * + * @param[in] input1 First source tensor. Data types supported: F32. Data layouts supported: NCHW/NHWC. + * @param[in] input2 Second source tensor. Data types and layouts supported: same as @p input1 + * @param[out] output Destination tensor. Output dimensions are [W * H * num_priors * 4, 2]. Data type supported: same as @p input + * @param[in] info Prior box layer info. + */ + void configure(const ITensor *input1, const ITensor *input2, ITensor *output, const PriorBoxLayerInfo &info); + /** Static function to check if given info will lead to a valid configuration of @ref NEPriorBoxLayerKernel + * + * @param[in] input1 First source tensor info. Data types supported: F32. Data layouts supported: NCHW/NHWC. + * @param[in] input2 Second source tensor info. Data types and layouts supported: same as @p input1 + * @param[in] output Destination tensor info. Output dimensions are [W * H * num_priors * 4, 2]. Data type supported: same as @p input + * @param[in] info Prior box layer info. + * + * @return a status + */ + static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const PriorBoxLayerInfo &info); + + // Inherited methods overridden: + void run(const Window &window, const ThreadInfo &info) override; + +private: + /** Stores the coordinates of the calculated prior boxes. + * + * @param[out] out Output pointer. + * @param[in] offset Output offset to write to. + * @param[in] center_x Center pixel value on x-axis. + * @param[in] center_y Center pixel value on y-axis. + * @param[in] box_width Prior box width. + * @param[in] box_height Prior box height. + * @param[in] width Input width. + * @param[in] height Input height. + */ + template + void store_coordinates(float *out, const int offset, const float center_x, const float center_y, const float box_width, const float box_height, const int width, const int height); + /** Function to calculate prior boxes. + * + * @param[in] window Input region on which to execute the kernel. + */ + template + void calculate_prior_boxes(const Window &window); + /** Common signature for all the specialised PriorBox functions + * + * @param[in] window Input region on which to execute the kernel.. + */ + using PriorBoxFunction = void (NEPriorBoxLayerKernel::*)(const Window &window); + PriorBoxFunction _func; + const ITensor *_input1; + const ITensor *_input2; + ITensor *_output; + PriorBoxLayerInfo _info; +}; +} // namespace arm_compute +#endif /* __ARM_COMPUTE_NEPRIORBOXLAYERKERNEL_H__ */ diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index 1c9571463b..fb277584fd 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -847,7 +847,7 @@ public: /** Constructor * * @param[in] min_sizes Min sizes vector. - * @param[in] variances Variances vector. Size must be equal to 4. + * @param[in] variances Variances vector. * @param[in] offset Offset value. * @param[in] flip (Optional) Flip the aspect ratios. * @param[in] clip (Optional) Clip coordinates so that they're within [0,1]. @@ -864,7 +864,7 @@ public: _flip(flip), _clip(clip), _max_sizes(max_sizes), - _aspect_ratios(aspect_ratios), + _aspect_ratios(), _img_size(img_size), _steps(steps) { diff --git a/arm_compute/runtime/CL/functions/CLPriorBoxLayer.h b/arm_compute/runtime/CL/functions/CLPriorBoxLayer.h index 2376cd3fc6..6adf7f9dd1 100644 --- a/arm_compute/runtime/CL/functions/CLPriorBoxLayer.h +++ b/arm_compute/runtime/CL/functions/CLPriorBoxLayer.h @@ -24,8 +24,6 @@ #ifndef __ARM_COMPUTE_CLPRIORBOXLAYER_H__ #define __ARM_COMPUTE_CLPRIORBOXLAYER_H__ -#include "arm_compute/runtime/IFunction.h" - #include "arm_compute/core/CL/kernels/CLPriorBoxLayerKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/ICLSimpleFunction.h" diff --git a/arm_compute/runtime/NEON/NEFunctions.h b/arm_compute/runtime/NEON/NEFunctions.h index 555d7d7551..d9c8355178 100644 --- a/arm_compute/runtime/NEON/NEFunctions.h +++ b/arm_compute/runtime/NEON/NEFunctions.h @@ -99,6 +99,7 @@ #include "arm_compute/runtime/NEON/functions/NEPhase.h" #include "arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h" #include "arm_compute/runtime/NEON/functions/NEPoolingLayer.h" +#include "arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h" #include "arm_compute/runtime/NEON/functions/NEQuantizationLayer.h" #include "arm_compute/runtime/NEON/functions/NERNNLayer.h" #include "arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h" diff --git a/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h b/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h new file mode 100644 index 0000000000..34ba39d960 --- /dev/null +++ b/arm_compute/runtime/NEON/functions/NEPriorBoxLayer.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2018 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_NEPRIORBOXLAYER_H__ +#define __ARM_COMPUTE_NEPRIORBOXLAYER_H__ + +#include "arm_compute/core/NEON/kernels/NEPriorBoxLayerKernel.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/NEON/INESimpleFunction.h" + +namespace arm_compute +{ +class ITensor; + +/** Basic function to run @ref NEPriorBoxLayerKernel. */ +class NEPriorBoxLayer : public INESimpleFunction +{ +public: + /** Set the input and output tensors. + * + * @param[in] input1 First source tensor. Data types supported: F32. Data layouts supported: NCHW/NHWC. + * @param[in] input2 Second source tensor. Data types and layouts supported: same as @p input1 + * @param[out] output Destination tensor. Output dimensions are [W * H * num_priors * 4, 2]. Data type supported: same as @p input + * @param[in] info Prior box layer info. + */ + void configure(const ITensor *input1, const ITensor *input2, ITensor *output, const PriorBoxLayerInfo &info); + /** Static function to check if given info will lead to a valid configuration of @ref NEPriorBoxLayer + * + * @param[in] input1 First source tensor info. Data types supported: F32. Data layouts supported: NCHW/NHWC. + * @param[in] input2 Second source tensor info. Data types and layouts supported: same as @p input1 + * @param[in] output Destination tensor info. Output dimensions are [W * H * num_priors * 4, 2]. Data type supported: same as @p input + * @param[in] info Prior box layer info. + * + * @return a status + */ + static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const PriorBoxLayerInfo &info); +}; +} // namespace arm_compute +#endif /* __ARM_COMPUTE_NEPRIORBOXLAYER_H__ */ -- cgit v1.2.1