Fix fill() for FP data type in fixtures - Part 2
Resolves: COMPMID-4056
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I6623eb9c0e66e52af4e0e9fb386031f4a09125b7
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4722
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
diff --git a/tests/validation/fixtures/ElementWiseUnaryFixture.h b/tests/validation/fixtures/ElementWiseUnaryFixture.h
index f414daf..f8e0dfa 100644
--- a/tests/validation/fixtures/ElementWiseUnaryFixture.h
+++ b/tests/validation/fixtures/ElementWiseUnaryFixture.h
@@ -55,17 +55,20 @@
template <typename U>
void fill(U &&tensor, int i, DataType data_type)
{
+ using FloatType = typename std::conditional < std::is_same<T, half>::value || std::is_floating_point<T>::value, T, float >::type;
+ using FloatDistributionType = typename std::conditional<std::is_same<T, half>::value, arm_compute::utils::uniform_real_distribution_fp16, std::uniform_real_distribution<FloatType>>::type;
+
switch(_op)
{
case ElementWiseUnary::EXP:
{
- std::uniform_real_distribution<> distribution(-1.0f, 1.0f);
+ FloatDistributionType distribution{ FloatType(-1.0f), FloatType(1.0f) };
library->fill(tensor, distribution, i);
break;
}
case ElementWiseUnary::RSQRT:
{
- std::uniform_real_distribution<> distribution(1.0f, 2.0f);
+ FloatDistributionType distribution{ FloatType(1.0f), FloatType(2.0f) };
library->fill(tensor, distribution, i);
break;
}
@@ -82,7 +85,7 @@
}
case DataType::F32:
{
- std::uniform_real_distribution<float> distribution(-2.0f, 2.0f);
+ FloatDistributionType distribution{ FloatType(-2.0f), FloatType(2.0f) };
library->fill(tensor, distribution, i);
break;
}
@@ -99,19 +102,19 @@
}
case ElementWiseUnary::LOG:
{
- std::uniform_real_distribution<> distribution(0.0000001f, 100.0f);
+ FloatDistributionType distribution{ FloatType(0.0000001f), FloatType(100.0f) };
library->fill(tensor, distribution, i);
break;
}
case ElementWiseUnary::SIN:
{
- std::uniform_real_distribution<> distribution(-100.00f, 100.00f);
+ FloatDistributionType distribution{ FloatType(-100.00f), FloatType(100.00f) };
library->fill(tensor, distribution, i);
break;
}
case ElementWiseUnary::ROUND:
{
- std::uniform_real_distribution<> distribution(100.0f, -100.0f);
+ FloatDistributionType distribution{ FloatType(100.0f), FloatType(-100.0f) };
library->fill(tensor, distribution, i);
break;
}