diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/TensorLibrary.h | 5 | ||||
| -rw-r--r-- | tests/dataset/NormalizationTypeDataset.h | 2 | ||||
| -rw-r--r-- | tests/validation/NEON/NormalizationLayer.cpp | 25 | ||||
| -rw-r--r-- | tests/validation/NEON/PixelWiseMultiplication.cpp | 22 |
4 files changed, 47 insertions, 7 deletions
diff --git a/tests/TensorLibrary.h b/tests/TensorLibrary.h index 3fb593c886..b0a0556583 100644 --- a/tests/TensorLibrary.h +++ b/tests/TensorLibrary.h @@ -501,11 +501,6 @@ void TensorLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_t } #if ARM_COMPUTE_ENABLE_FP16 case DataType::F16: - { - std::uniform_real_distribution<float> distribution_f16(-1000.f, 1000.f); - fill(tensor, distribution_f16, seed_offset); - break; - } #endif /* ARM_COMPUTE_ENABLE_FP16 */ case DataType::F32: { diff --git a/tests/dataset/NormalizationTypeDataset.h b/tests/dataset/NormalizationTypeDataset.h index 9edadbf8ab..756772ee8f 100644 --- a/tests/dataset/NormalizationTypeDataset.h +++ b/tests/dataset/NormalizationTypeDataset.h @@ -73,7 +73,7 @@ public: } private: - std::array<NormType, 3> _types{ { NormType::IN_MAP_1D, NormType::IN_MAP_2D, NormType::CROSS_MAP } }; + const std::array<NormType, 3> _types{ { NormType::IN_MAP_1D, NormType::IN_MAP_2D, NormType::CROSS_MAP } }; }; } // namespace test } // namespace arm_compute diff --git a/tests/validation/NEON/NormalizationLayer.cpp b/tests/validation/NEON/NormalizationLayer.cpp index a8ba7dac55..60c2646b77 100644 --- a/tests/validation/NEON/NormalizationLayer.cpp +++ b/tests/validation/NEON/NormalizationLayer.cpp @@ -52,6 +52,8 @@ float normalization_layer_tolerance(DataType dt) { case DataType::QS8: return 2.0f; + case DataType::F16: + return 0.001f; case DataType::F32: return 1e-05; default: @@ -108,6 +110,29 @@ Tensor compute_normalization_layer(const TensorShape &shape, DataType dt, Normal BOOST_AUTO_TEST_SUITE(NEON) BOOST_AUTO_TEST_SUITE(NormalizationLayer) +#ifdef ARM_COMPUTE_ENABLE_FP16 +BOOST_AUTO_TEST_SUITE(Float16) +BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) +BOOST_DATA_TEST_CASE(RunSmall, + SmallShapes() * DataType::F16 *NormalizationTypes() * boost::unit_test::data::xrange(3, 9, 2) * boost::unit_test::data::make({ 0.5f, 1.0f, 2.0f }), + shape, dt, norm_type, norm_size, beta) +{ + // Provide normalization layer information + NormalizationLayerInfo norm_info(norm_type, norm_size, 5, beta); + + // Compute function + Tensor dst = compute_normalization_layer(shape, dt, norm_info); + + // Compute reference + RawTensor ref_dst = Reference::compute_reference_normalization_layer(shape, dt, norm_info); + + // Validate output + validate(NEAccessor(dst), ref_dst, normalization_layer_tolerance(DataType::F16)); +} + +BOOST_AUTO_TEST_SUITE_END() +#endif /* ARM_COMPUTE_ENABLE_FP16 */ + BOOST_AUTO_TEST_SUITE(Float) BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) BOOST_DATA_TEST_CASE(RunSmall, diff --git a/tests/validation/NEON/PixelWiseMultiplication.cpp b/tests/validation/NEON/PixelWiseMultiplication.cpp index 56417056af..26ea38a52b 100644 --- a/tests/validation/NEON/PixelWiseMultiplication.cpp +++ b/tests/validation/NEON/PixelWiseMultiplication.cpp @@ -122,7 +122,6 @@ BOOST_AUTO_TEST_SUITE(NEON) BOOST_AUTO_TEST_SUITE(PixelWiseMultiplication) BOOST_AUTO_TEST_SUITE(U8) - BOOST_AUTO_TEST_SUITE(Scale255) BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * (1.f / 255.f) * ConvertPolicies() @@ -314,6 +313,27 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * boost::unit_test::data::make({ Da BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END() +#ifdef ARM_COMPUTE_ENABLE_FP16 +BOOST_AUTO_TEST_SUITE(F16) +BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) + +BOOST_DATA_TEST_CASE(RunSmall, SmallShapes() * (1.f / 255.f) * ConvertPolicies() * RoundingPolicy::TO_NEAREST_UP, + shape, scale, convert_policy, rounding_policy) +{ + // Compute function + Tensor dst = compute_pixel_wise_multiplication(shape, DataType::F16, DataType::F16, DataType::F16, scale, convert_policy, rounding_policy); + + // Compute reference + RawTensor ref_dst = Reference::compute_reference_pixel_wise_multiplication(shape, DataType::F16, DataType::F16, DataType::F16, scale, convert_policy, rounding_policy); + + // Validate output + // Allow tolerance value of 1.f to counteract imprecision due to 32-bit float conversion + validate(NEAccessor(dst), ref_dst, 1.f, 0.f, std::numeric_limits<int16_t>::max()); +} + +BOOST_AUTO_TEST_SUITE_END() +#endif /* ARM_COMPUTE_ENABLE_FP16 */ + BOOST_AUTO_TEST_SUITE(Float) BOOST_AUTO_TEST_SUITE(Scale255) BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) |