commit e250389ed6d78153a55382fa5b3519c151bfd79f
author Michalis Spyrou <michalis.spyrou@arm.com> Mon Apr 23 15:17:31 2018 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:51:37 2018 +0000
tree 80c63793769ad18fd0406e7f8b40840aed7ac3ce
parent 79ffadebd8dff7eaecbcfa3a28106736f240f1c5

COMPMID-810 Add NHWC data format support for NEON convolution

Change-Id: I2a7b49a12da7f3bc3f04749243b1dc111160de6e
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/129348
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h

diff --git a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
index 7526931..d64fd9e 100644
--- a/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
+++ b/arm_compute/runtime/NEON/functions/NEGEMMConvolutionLayer.h
@@ -26,6 +26,7 @@
 
 #include "arm_compute/runtime/IFunction.h"
 
+#include "arm_compute/core/NEON/kernels/NEArithmeticAdditionKernel.h"
 #include "arm_compute/core/NEON/kernels/NECol2ImKernel.h"
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
 #include "arm_compute/core/NEON/kernels/NEGEMMAssemblyBaseKernel.h"
@@ -176,6 +177,7 @@
     NEGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPoint _gemmlowp_output_stage;
     NECol2ImKernel                                      _output_col2im_kernel;
     NEActivationLayer                                   _activationlayer_function;
+    NEArithmeticAdditionKernel                          _add_bias_kernel;
 
     const ITensor *_original_weights;
 
@@ -187,12 +189,14 @@
     Tensor _workspace;
     Tensor _B_pretransposed;
 
-    bool _append_bias;
-    bool _is_fully_connected_convolution;
-    bool _are_weights_reshaped;
-    bool _is_quantized;
-    bool _is_interleaved;
-    bool _is_activationlayer_enabled;
+    DataLayout _data_layout;
+    bool       _append_bias;
+    bool       _is_fully_connected_convolution;
+    bool       _are_weights_reshaped;
+    bool       _is_quantized;
+    bool       _is_interleaved;
+    bool       _is_activationlayer_enabled;
+    bool       _skip_im2col;
 };
 }
 #endif /* __ARM_COMPUTE_NECONVOLUTIONGEMMLAYER_H__ */