From 33b103b8ad1b063ddf909a2c2027e25ef46c0d88 Mon Sep 17 00:00:00 2001 From: Giorgio Arena 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 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4782 Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/fixtures/InstanceNormalizationLayerFixture.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/validation/fixtures/InstanceNormalizationLayerFixture.h') diff --git a/tests/validation/fixtures/InstanceNormalizationLayerFixture.h b/tests/validation/fixtures/InstanceNormalizationLayerFixture.h index 3f2853dece..611d9aae5b 100644 --- a/tests/validation/fixtures/InstanceNormalizationLayerFixture.h +++ b/tests/validation/fixtures/InstanceNormalizationLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 Arm Limited. + * Copyright (c) 2019-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -56,7 +56,7 @@ protected: void fill(U &&tensor) { static_assert(std::is_floating_point::value || std::is_same::value, "Only floating point data types supported."); - using DistributionType = typename std::conditional::value, arm_compute::utils::uniform_real_distribution_fp16, std::uniform_real_distribution>::type; + using DistributionType = typename std::conditional::value, arm_compute::utils::uniform_real_distribution_16bit, std::uniform_real_distribution>::type; DistributionType distribution{ T(1.0f), T(2.0f) }; library->fill(tensor, distribution, 0); -- cgit v1.2.1