commit 11fedda86532cf632b9a3ae4b0f57e85f2a7c4f4
author Sang-Hoon Park <sang-hoon.park@arm.com> Wed Jan 15 14:44:04 2020 +0000
committer Georgios Pinitas <georgios.pinitas@arm.com> Tue Jan 28 16:05:27 2020 +0000
tree 6fd8003a38fe9baa262696754bdd5cb1d1595947
parent 6c89ffac750010cb9335794defe8a366c04db937

COMPMID-2985 add data_layout to PoolingLayerInfo

- use data layout from PoolingLayerInfo if it's available
- deprecate constructors without data_layout
- (3RDPARTY_UPDATE) modify examples and test suites to give data layout

Change-Id: Ie9ae8cc4837c339ff69a16a816110be704863c2d
Signed-off-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2603
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

src/core/CL/kernels/CLPoolingLayerKernel.cpp

diff --git a/src/core/CL/kernels/CLPoolingLayerKernel.cpp b/src/core/CL/kernels/CLPoolingLayerKernel.cpp
index 2c45df8..1d9aa33 100644
--- a/src/core/CL/kernels/CLPoolingLayerKernel.cpp
+++ b/src/core/CL/kernels/CLPoolingLayerKernel.cpp
@@ -80,7 +80,7 @@
     ARM_COMPUTE_ERROR_ON_NULLPTR(input, output);
 
     // Get data layout
-    const DataLayout data_layout = input->data_layout();
+    const DataLayout data_layout = pool_info.data_layout == DataLayout::UNKNOWN ? input->data_layout() : pool_info.data_layout;
     const int        idx_width   = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH);
     const int        idx_height  = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT);
 
@@ -179,7 +179,7 @@
     _input       = input;
     _output      = output;
     _pool_info   = pool_info;
-    _data_layout = input->info()->data_layout();
+    _data_layout = pool_info.data_layout == DataLayout::UNKNOWN ? input->info()->data_layout() : pool_info.data_layout;
 
     int                 pool_stride_x   = 0;
     int                 pool_stride_y   = 0;