commit 41caa625231c24533a514606bbf2683f7d4964ad
author Georgios Pinitas <georgios.pinitas@arm.com> Thu Nov 16 14:37:08 2017 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:35:24 2018 +0000
tree 4e897dfbcc77d57c996f15bab014b20e4cb4868d
parent 181e65145d153210ec5587a42d2938e27e1d5b01

COMPMID-683: Normalization layer API clarification.

Adds a is_scaled parameter in the NormalizationLayerInfo that flags if
the alpha parameter should be scaled by the normalization size of not.
Unscaled parameter is used by [Krichevksy 2012] which is used in
AndroidNN and TensorFlow LRN layer.

Change-Id: Iad2aa5e688cf4dcd6cc77a6e28c0663764f34ccb
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/96102
Reviewed-by: Diego Lopez Recas <diego.lopezrecas@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

src/core/GLES_COMPUTE/kernels/GCNormalizationLayerKernel.cpp

diff --git a/src/core/GLES_COMPUTE/kernels/GCNormalizationLayerKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCNormalizationLayerKernel.cpp
index c0c2445..5dad767 100644
--- a/src/core/GLES_COMPUTE/kernels/GCNormalizationLayerKernel.cpp
+++ b/src/core/GLES_COMPUTE/kernels/GCNormalizationLayerKernel.cpp
@@ -60,7 +60,7 @@
     _squared_input = squared_input;
     _output        = output;
 
-    const bool         is_in_map    = (norm_info.type() == NormType::IN_MAP_1D);
+    const bool         is_in_map    = norm_info.is_in_map();
     const unsigned int border_width = is_in_map ? std::min(norm_info.norm_size() / 2, 3U) : 0;
     _border_size                    = BorderSize(0, border_width);