From 33b103b8ad1b063ddf909a2c2027e25ef46c0d88 Mon Sep 17 00:00:00 2001
From: Giorgio Arena <giorgio.arena@arm.com>
Date: Fri, 8 Jan 2021 10:37:15 +0000
Subject: Resolve merge conflicts between new fills and new fp16 generator

Resolves: COMPMID-4083

Change-Id: Ia1b595d972854ede7ff4104183d014ac6afe30d1
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4782
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
---
 tests/validation/fixtures/DirectConvolutionLayerTensorShiftFixture.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/validation/fixtures/DirectConvolutionLayerTensorShiftFixture.h')

diff --git a/tests/validation/fixtures/DirectConvolutionLayerTensorShiftFixture.h b/tests/validation/fixtures/DirectConvolutionLayerTensorShiftFixture.h
index f39595f0de..44edc91231 100644
--- a/tests/validation/fixtures/DirectConvolutionLayerTensorShiftFixture.h
+++ b/tests/validation/fixtures/DirectConvolutionLayerTensorShiftFixture.h
@@ -94,7 +94,7 @@ protected:
             }
             case DataType::F16:
             {
-                arm_compute::utils::uniform_real_distribution_16bit<half> distribution{ float(-1.0f), float(1.0f) };
+                arm_compute::utils::uniform_real_distribution_16bit<half> distribution{ -1.0f, 1.0f };
                 library->fill(tensor, distribution, i);
                 break;
             }
-- 
cgit v1.2.1