COMPMID-807: NHWC support in CLDirectConvolution.

Change-Id: I8738aca2cc0104e4c4d7c9605762ab59fce10a33
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/137333
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>

2 files changed, 2 insertions, 4 deletions

diff --git a/tests/validation/CL/DirectConvolutionLayer.cpp b/tests/validation/CL/DirectConvolutionLayer.cpp
index 87f9449359..e29ec7ef4c 100644
--- a/tests/validation/CL/DirectConvolutionLayer.cpp
+++ b/tests/validation/CL/DirectConvolutionLayer.cpp
@@ -172,7 +172,7 @@ TEST_SUITE_END()
 TEST_SUITE(FP32)
 FIXTURE_DATA_TEST_CASE(Run, CLDirectConvolutionLayerFixture<float>, framework::DatasetMode::ALL, combine(combine(combine(data, framework::dataset::make("DataType", DataType::F32)),
                                                                                                                  ActivationFunctionsDataset),
-                                                                                                         framework::dataset::make("DataLayout", DataLayout::NCHW)))
+                                                                                                         framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })))
 {
     // Validate output
     validate(CLAccessor(_target), _reference, tolerance_fp32);
diff --git a/tests/validation/fixtures/DirectConvolutionLayerFixture.h b/tests/validation/fixtures/DirectConvolutionLayerFixture.h
index 9a58167605..f9a220b0bb 100644
--- a/tests/validation/fixtures/DirectConvolutionLayerFixture.h
+++ b/tests/validation/fixtures/DirectConvolutionLayerFixture.h
@@ -106,7 +106,7 @@ protected:
             case DataType::F16:
             case DataType::F32:
             {
-                std::uniform_real_distribution<> distribution(-1.0f, 1.0f);
+                std::uniform_real_distribution<> distribution(-1.f, 1.f);
                 library->fill(tensor, distribution, i);
                 break;
             }
@@ -182,10 +182,8 @@ protected:
         fill(bias, 2);
 
         SimpleTensor<T> dst = reference::convolution_layer<T>(src, weights, bias, output_shape, info);
-
         return (act_info.enabled()) ? reference::activation_layer<T>(dst, act_info) : dst;
     }
-
     TensorType       _target{};
     SimpleTensor<T>  _reference{};
     QuantizationInfo _quantization_info{};