From 73d4aef12463ac42fa9e31174675f32535a7edd8 Mon Sep 17 00:00:00 2001 From: John Richardson Date: Tue, 8 May 2018 14:34:33 +0100 Subject: COMPMID-948: Add validation to NEL2NormalizeLayer Change-Id: I0cfea24884066412c2f13d9acdb72ddbccac7545 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/130407 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- .../runtime/NEON/functions/NEL2NormalizeLayer.h | 25 ++++++++++++++++------ .../runtime/NEON/functions/NEReductionOperation.h | 17 ++++++++++++--- 2 files changed, 32 insertions(+), 10 deletions(-) (limited to 'arm_compute/runtime') diff --git a/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h b/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h index 100e239406..3c88bbd9d3 100644 --- a/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h +++ b/arm_compute/runtime/NEON/functions/NEL2NormalizeLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef __ARM_COMPUTE_NEL2NORMALIZE_H__ -#define __ARM_COMPUTE_NEL2NORMALIZE_H__ +#ifndef __ARM_COMPUTE_NEL2NORMALIZELAYER_H__ +#define __ARM_COMPUTE_NEL2NORMALIZELAYER_H__ #include "arm_compute/core/NEON/kernels/NEL2NormalizeLayerKernel.h" #include "arm_compute/runtime/IFunction.h" @@ -50,13 +50,24 @@ public: NEL2NormalizeLayer(std::shared_ptr memory_manager = nullptr); /** Set the input and output tensors. * - * @param[in, out] input Source tensor. Data types supported: F32. (Written to only for border_size != 0) - * @param[out] output Destination tensor. Data types supported: same as @p input. + * @param[in, out] input Source tensor. Data types supported: F32. Data layouts supported: NCHW. (Written to only for border_size != 0) + * @param[out] output Destination tensor. Data types and data layouts supported: same as @p input. * @param[in] axis Dimension along which to reduce. Supported reduction axis : 0 - * @param[in] epsilon Lower bound value for the normalization. + * @param[in] epsilon (Optional) Lower bound value for the normalization. */ void configure(ITensor *input, ITensor *output, unsigned int axis, float epsilon = 1e-12); + /** Static function to check if given info will lead to a valid configuration of @ref NEL2NormalizeLayer. + * + * @param[in] input Source tensor info. Data types supported: F32. Data layouts supported: NCHW. (Written to only for border_size != 0) + * @param[in] output Destination tensor info. Data types and data layouts supported: same as @p input. + * @param[in] axis Dimension along which to reduce. Supported reduction axis : 0 + * @param[in] epsilon (Optional) Lower bound value for the normalization. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output, unsigned int axis, float epsilon = 1e-12); + // Inherited methods overridden: void run() override; @@ -67,4 +78,4 @@ private: Tensor _sumsq; }; } -#endif /* __ARM_COMPUTE_NEL2NORMALIZE_H__ */ +#endif /* __ARM_COMPUTE_NEL2NORMALIZELAYER_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEReductionOperation.h b/arm_compute/runtime/NEON/functions/NEReductionOperation.h index 9aa5228b16..02b29fb64e 100644 --- a/arm_compute/runtime/NEON/functions/NEReductionOperation.h +++ b/arm_compute/runtime/NEON/functions/NEReductionOperation.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,13 +47,24 @@ public: NEReductionOperation(); /** Set the input and output tensors. * - * @param[in, out] input Source tensor. Data type supported: F32. (Written to only for border_size != 0) - * @param[out] output Destination tensor. Data types supported: same as @p input. + * @param[in, out] input Source tensor. Data type supported: F32. Data layouts supported: NCHW. (Written to only for border_size != 0) + * @param[out] output Destination tensor. Data types and data layouts supported: same as @p input. * @param[in] axis Dimension along which to reduce. Supported reduction axis : 0 * @param[in] op Reduction operation to perform. */ void configure(ITensor *input, ITensor *output, unsigned int axis, ReductionOperation op); + /** Static function to check if given info will lead to a valid configuration of @ref NEReductionOperation. + * + * @param[in] input Source tensor info. Data type supported: F32. Data layouts supported: NCHW. (Written to only for border_size != 0) + * @param[in] output Destination tensor info. Data types and data layouts supported: same as @p input. + * @param[in] axis Dimension along which to reduce. Supported reduction axis : 0 + * @param[in] op Reduction operation to perform. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output, unsigned int axis, ReductionOperation op); + // Inherited methods overridden: void run() override; -- cgit v1.2.1