diff options
author | Giorgio Arena <giorgio.arena@arm.com> | 2021-01-08 10:37:15 +0000 |
---|---|---|
committer | Giorgio Arena <giorgio.arena@arm.com> | 2021-01-08 11:54:50 +0000 |
commit | 33b103b8ad1b063ddf909a2c2027e25ef46c0d88 (patch) | |
tree | ada1e9265593a03030d6a98d369f92ba29ddb1ef /tests/validation/fixtures/BatchNormalizationLayerFixture.h | |
parent | b56c1758dfc233452ff73149fabe30e1c460e9d3 (diff) | |
download | ComputeLibrary-33b103b8ad1b063ddf909a2c2027e25ef46c0d88.tar.gz |
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>
Diffstat (limited to 'tests/validation/fixtures/BatchNormalizationLayerFixture.h')
-rw-r--r-- | tests/validation/fixtures/BatchNormalizationLayerFixture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/validation/fixtures/BatchNormalizationLayerFixture.h b/tests/validation/fixtures/BatchNormalizationLayerFixture.h index 8685543ee1..f5a5420df3 100644 --- a/tests/validation/fixtures/BatchNormalizationLayerFixture.h +++ b/tests/validation/fixtures/BatchNormalizationLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -60,7 +60,7 @@ protected: void fill(U &&src_tensor, U &&mean_tensor, U &&var_tensor, U &&beta_tensor, U &&gamma_tensor) { static_assert(std::is_floating_point<T>::value || std::is_same<T, half>::value, "Only floating point data types supported."); - using DistributionType = typename std::conditional<std::is_same<T, half>::value, arm_compute::utils::uniform_real_distribution_fp16, std::uniform_real_distribution<T>>::type; + using DistributionType = typename std::conditional<std::is_same<T, half>::value, arm_compute::utils::uniform_real_distribution_16bit<T>, std::uniform_real_distribution<T>>::type; const T min_bound = T(-1.f); const T max_bound = T(1.f); |