From 9d3a831d4131f8a8b37f127f11d36848d33e8496 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 20 Nov 2018 12:31:24 +0000 Subject: COMPMID-1648: CLNormalizationLayer IN_MAP_2D support for NHWC for FP32/FP16 Change-Id: I49f1d865f5e7562f1d80db849353a89ef77e6a9e --- arm_compute/core/CL/kernels/CLNormalizationLayerKernel.h | 6 ++++-- arm_compute/core/Types.h | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'arm_compute/core') diff --git a/arm_compute/core/CL/kernels/CLNormalizationLayerKernel.h b/arm_compute/core/CL/kernels/CLNormalizationLayerKernel.h index beeb8b838e..498fc11665 100644 --- a/arm_compute/core/CL/kernels/CLNormalizationLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLNormalizationLayerKernel.h @@ -48,16 +48,18 @@ public: /** Set the input and output tensors. * * @param[in] input Source tensor. 3 lower dims represent a single input with dimensions [width, height, IFM], - * and an optional 4th dimension for batch of inputs. Data types supported: F16/F32. + * and an optional 4th dimension for batch of inputs. Data types supported: F16/F32. Data layouts supported: NCHW/NHWC. * @param[out] output Destination tensor. Output will have the same number of dimensions as input. Data types supported: same as @p input. + * Data layouts supported: same as @p input. * @param[in] norm_info Normalization layer information like the normalization type, normalization size and other parameters. */ void configure(const ICLTensor *input, ICLTensor *output, NormalizationLayerInfo norm_info); /** Static function to check if given info will lead to a valid configuration of @ref CLNormalizationLayerKernel * * @param[in] input Source tensor. 3 lower dims represent a single input with dimensions [width, height, IFM], - * and an optional 4th dimension for batch of inputs. Data types supported: F16/F32. + * and an optional 4th dimension for batch of inputs. Data types supported: F16/F32. Data layouts supported: NCHW/NHWC. * @param[in] output Destination tensor. Output will have the same number of dimensions as input. Data types supported: same as @p input. + * Data layouts supported: same as @p input. * @param[in] norm_info Normalization layer information like the normalization type, normalization size and other parameters. * * @return a status diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index 0f2786cd12..9f3857c6cd 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -1345,7 +1345,7 @@ class NormalizationLayerInfo public: /** Default Constructor * - * @param[in] type The normalization type. Can be @ref NormType::IN_MAP_1D, @ref NormType::IN_MAP_2D or @ref NORM_TYPE::CROSS_MAP + * @param[in] type The normalization type. Can be @ref NormType::IN_MAP_1D, @ref NormType::IN_MAP_2D or @ref NormType::CROSS_MAP * @param[in] norm_size The normalization size is the number of elements to normalize across. Defaults to 5. * @param[in] alpha (Optional) Alpha parameter used by normalization equation. Defaults to 0.0001. * @param[in] beta (Optional) Beta parameter used by normalization equation. Defaults to 0.5. @@ -1382,6 +1382,11 @@ public: { return _kappa; } + /** Get the is_scaled value */ + bool is_scaled() const + { + return _is_scaled; + } /** Check if normalization is cross map */ bool is_cross_map() const { -- cgit v1.2.1