COMPMID-1586: Add support for NHWC CLDeconvolutionLayer

COMPMID-1651: Fix QASYMM8 CLDeconvolutionLayer

This patch also extends the range of values used for testing Convolution and
Deconvolution to cover quantized [-1.0f, 1.0f].

Change-Id: I8b280669db67bb3ec25bf5d411c8f5954f5b0dab
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/149869
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Tested-by: bsgcomp <bsgcomp@arm.com>

3 files changed, 77 insertions, 38 deletions

diff --git a/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp b/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp
index be3a926b96..dd7d79002d 100644
--- a/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp
+++ b/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp
@@ -45,11 +45,19 @@ Status CLDeconvolutionLayerUpsampleKernel::validate(const ITensorInfo *input, co
 
     ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8, DataType::F16, DataType::F32);
     ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output);
-    ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(0) == 0);
-    ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(1) == 0);
+
+    const DataLayout data_layout = input->data_layout();
+
+    const size_t idx_w = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH);
+    const size_t idx_h = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT);
+    const size_t idx_c = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL);
+
+    ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(idx_w) == 0);
+    ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(idx_h) == 0);
     ARM_COMPUTE_RETURN_ERROR_ON(!info.padding_is_symmetric());
 
-    for(size_t i = 2; i < Coordinates::num_max_dimensions; ++i)
+    ARM_COMPUTE_RETURN_ERROR_ON(input->dimension(idx_c) != output->dimension(idx_c));
+    for(size_t i = 3; i < Coordinates::num_max_dimensions; ++i)
     {
         ARM_COMPUTE_RETURN_ERROR_ON(input->dimension(i) != output->dimension(i));
     }
@@ -93,28 +101,61 @@ void CLDeconvolutionLayerUpsampleKernel::run(const Window &window, cl::CommandQu
     ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this);
     ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICLKernel::window(), window);
 
+    const DataLayout data_layout = _input->info()->data_layout();
+
+    const size_t idx_w = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH);
+    const size_t idx_h = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT);
+
     const int out_start_x = _info.pad().first;
-    const int out_end_x   = _output->info()->dimension(0) - _inner_border.right - _info.pad().first + _info.stride().first - 1;
+    const int out_end_x   = _output->info()->dimension(idx_w) - _inner_border.right - _info.pad().first + _info.stride().first - 1;
     const int out_step_x  = _info.stride().first;
 
     const int out_start_y = _inner_border.top + _info.pad().second;
-    const int out_end_y   = _output->info()->dimension(1) - _info.pad().second + _info.stride().second - 1;
+    const int out_end_y   = _output->info()->dimension(idx_h) - _info.pad().second + _info.stride().second - 1;
     const int out_step_y  = _info.stride().second;
 
-    Window collapsed = window.collapse_if_possible(ICLKernel::window(), Window::DimZ);
-
-    Window slice_out = collapsed.first_slice_window_3D();
-    slice_out.set(Window::DimX, Window::Dimension(out_start_x, out_end_x, out_step_x));
-    slice_out.set(Window::DimY, Window::Dimension(out_start_y, out_end_y, out_step_y));
-
-    Window slice_in = collapsed.first_slice_window_3D();
-
-    do
+    switch(data_layout)
     {
-        unsigned int idx = 0;
-        add_3D_tensor_argument(idx, _input, slice_in);
-        add_3D_tensor_argument(idx, _output, slice_out);
-        enqueue(queue, *this, slice_out);
+        case DataLayout::NCHW:
+        {
+            Window collapsed = window.collapse_if_possible(ICLKernel::window(), Window::DimZ);
+
+            Window slice_out = collapsed.first_slice_window_3D();
+            slice_out.set(Window::DimX, Window::Dimension(out_start_x, out_end_x, out_step_x));
+            slice_out.set(Window::DimY, Window::Dimension(out_start_y, out_end_y, out_step_y));
+
+            Window slice_in = collapsed.first_slice_window_3D();
+
+            do
+            {
+                unsigned int idx = 0;
+                add_3D_tensor_argument(idx, _input, slice_in);
+                add_3D_tensor_argument(idx, _output, slice_out);
+                enqueue(queue, *this, slice_out);
+            }
+            while(collapsed.slide_window_slice_3D(slice_in) && collapsed.slide_window_slice_3D(slice_out));
+            break;
+        }
+        case DataLayout::NHWC:
+        {
+            // NOTE: not collapsing in NHWC
+            Window slice_out = window.first_slice_window_3D();
+            slice_out.set(Window::DimY, Window::Dimension(out_start_x, out_end_x, out_step_x));
+            slice_out.set(Window::DimZ, Window::Dimension(out_start_y, out_end_y, out_step_y));
+
+            Window slice_in = window.first_slice_window_3D();
+
+            do
+            {
+                unsigned int idx = 0;
+                add_3D_tensor_argument(idx, _input, slice_in);
+                add_3D_tensor_argument(idx, _output, slice_out);
+                enqueue(queue, *this, slice_out);
+            }
+            while(window.slide_window_slice_3D(slice_in) && window.slide_window_slice_3D(slice_out));
+            break;
+        }
+        default:
+            ARM_COMPUTE_ERROR("Unsupported data layout");
     }
-    while(collapsed.slide_window_slice_3D(slice_in) && collapsed.slide_window_slice_3D(slice_out));
 }
diff --git a/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp b/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp
index 741218e4f7..2d4c0ce5c8 100644
--- a/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp
+++ b/src/core/CPP/kernels/CPPFlipWeightsKernel.cpp
@@ -42,25 +42,36 @@ CPPFlipWeightsKernel::CPPFlipWeightsKernel()
 }
 
 template <typename T>
-void CPPFlipWeightsKernel::flip_weights(const Window &window_input, const Window &window)
+void CPPFlipWeightsKernel::flip_weights(const Window &window_input)
 {
     // Create iterators
     Iterator in(_input, window_input);
 
-    Iterator out(_output, window);
+    const DataLayout data_layout = _input->info()->data_layout();
+    const size_t     idx_w       = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH);
+    const size_t     idx_h       = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT);
 
-    const int kernel_size = _input->info()->dimension(0);
+    const int kernel_width  = _input->info()->dimension(idx_w);
+    const int kernel_height = _input->info()->dimension(idx_h);
 
     execute_window_loop(window_input, [&](const Coordinates & id)
     {
-        *((reinterpret_cast<T *>(out.ptr()) + kernel_size * (kernel_size - id.y() - 1) + (kernel_size - id.x() - 1))) = *(reinterpret_cast<const T *>(in.ptr()));
+        const unsigned int x = kernel_width - id[idx_w] - 1;
+        const unsigned int y = kernel_height - id[idx_h] - 1;
+        Coordinates        output_coord(id);
+        output_coord.set(idx_w, x);
+        output_coord.set(idx_h, y);
+        *(reinterpret_cast<T *>(_output->ptr_to_element(output_coord))) = *(reinterpret_cast<const T *>(in.ptr()));
     },
-    in, out);
+    in);
 }
 
 void CPPFlipWeightsKernel::configure(const ITensor *input, ITensor *output)
 {
     ARM_COMPUTE_ERROR_ON_NULLPTR(input, output);
+    ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8, DataType::F16, DataType::F32);
+    ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_LAYOUT(input, output);
+    ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output);
 
     _input  = input;
     _output = output;
@@ -98,9 +109,5 @@ void CPPFlipWeightsKernel::run(const Window &window, const ThreadInfo &info)
     ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICPPKernel::window(), window);
     ARM_COMPUTE_ERROR_ON(_func == nullptr);
 
-    Window out_window{ window };
-    out_window.set(Window::DimX, Window::Dimension(0, 0, 0));
-    out_window.set(Window::DimY, Window::Dimension(0, 0, 0));
-
-    (this->*_func)(window, out_window);
+    (this->*_func)(window);
 }
diff --git a/src/core/Utils.cpp b/src/core/Utils.cpp
index a6a5771ec1..41fc87e87a 100644
--- a/src/core/Utils.cpp
+++ b/src/core/Utils.cpp
@@ -323,15 +323,6 @@ PadStrideInfo arm_compute::calculate_same_pad(TensorShape input_shape, TensorSha
     return PadStrideInfo(strides.first, strides.second, same_pad_left, same_pad_right, same_pad_top, same_pad_bottom, DimensionRoundingType::CEIL);
 }
 
-TensorShape arm_compute::deconvolution_output_shape(const std::pair<unsigned int, unsigned int> &out_dims, TensorShape input, TensorShape weights)
-{
-    TensorShape out_shape(input);
-    out_shape.set(0, out_dims.first);
-    out_shape.set(1, out_dims.second);
-    out_shape.set(2, weights[3]);
-    return out_shape;
-}
-
 const std::pair<unsigned int, unsigned int> arm_compute::deconvolution_output_dimensions(
     unsigned int in_width, unsigned int in_height, unsigned int kernel_width, unsigned int kernel_height, unsigned int padx, unsigned int pady,
     unsigned int stride_x, unsigned int stride_y)