commit 296580423e262c8914ebf50b378730ed47c0b323
author Sadik Armagan <sadik.armagan@arm.com> Mon May 11 10:35:08 2020 +0100
committer Michele Di Giorgio <michele.digiorgio@arm.com> Tue May 12 11:31:16 2020 +0000
tree 564f236fcf183c46c21aa02f3e6b047710fa8aed
parent 6e10aa395e81b83edb3437191acd7abe1639c7dc

IVGCVSW-4744 CTS: RandomGraphTest LargeGraph failures in CpuAcc HAL 1.2 and 1.3

* Retain data layout for SpaceToBatchLayerKernel and BatchToSpaceLayerKernel

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I5bd0c3ca90a4964eda9f838c97c784aced0f4579
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3166
Reviewed-by: Manuel Bottini <manuel.bottini@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/NEON/kernels/NESpaceToBatchLayerKernel.cpp

diff --git a/src/core/NEON/kernels/NESpaceToBatchLayerKernel.cpp b/src/core/NEON/kernels/NESpaceToBatchLayerKernel.cpp
index ba3377f..88ea44a 100644
--- a/src/core/NEON/kernels/NESpaceToBatchLayerKernel.cpp
+++ b/src/core/NEON/kernels/NESpaceToBatchLayerKernel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 ARM Limited.
+ * Copyright (c) 2019-2020 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -89,7 +89,7 @@
 } // namespace
 
 NESpaceToBatchLayerKernel::NESpaceToBatchLayerKernel()
-    : _input(nullptr), _block_shape(nullptr), _paddings(nullptr), _output(nullptr), _padding_left(), _block_shape_x(), _block_shape_y()
+    : _input(nullptr), _block_shape(nullptr), _paddings(nullptr), _output(nullptr), _data_layout(DataLayout::UNKNOWN), _padding_left(), _block_shape_x(), _block_shape_y()
 {
 }
 
@@ -102,6 +102,7 @@
     _block_shape = block_shape;
     _paddings    = paddings;
     _output      = output;
+    _data_layout = input->info()->data_layout();
 
     // Configure kernel window
     Window win = calculate_max_window(*output->info(), Steps());
@@ -123,6 +124,7 @@
     _block_shape_x = block_shape_x;
     _block_shape_y = block_shape_y;
     _padding_left  = padding_left;
+    _data_layout   = input->info()->data_layout();
 
     // Configure kernel window
     Window win = calculate_max_window(*output->info(), Steps());
@@ -160,21 +162,21 @@
         const size_t pad_left_y = *reinterpret_cast<const size_t *>(_paddings->ptr_to_element({ 1, 0 }));
         _padding_left           = Size2D(pad_left_x, pad_left_y);
     }
-    const DataLayout data_layout  = _input->info()->data_layout();
-    const int        height_idx   = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT);
-    const int        width_idx    = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH);
-    const int        element_size = _input->info()->element_size();
+    const int height_idx   = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::HEIGHT);
+    const int width_idx    = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::WIDTH);
+    const int batch_idx    = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::BATCHES);
+    const int element_size = _input->info()->element_size();
 
     const size_t height     = _input->info()->dimension(height_idx);
     const size_t width      = _input->info()->dimension(width_idx);
-    const size_t batch_size = _input->info()->dimension(3);
+    const size_t batch_size = _input->info()->dimension(batch_idx);
 
     Window slice_out = window.first_slice_window_3D();
 
     int batch_id = 0;
 
     // Main loop for NCHW and NHWC
-    if(_output->info()->data_layout() == DataLayout::NCHW)
+    if(_data_layout == DataLayout::NCHW)
     {
         do
         {