From 4e7e13f283189e51fc650d52b1b16237c00f309b Mon Sep 17 00:00:00 2001 From: sbalandi Date: Tue, 27 Feb 2024 13:03:33 +0100 Subject: [PATCH] Revert PR 22972 --- .../common_test_utils/src/ov_tensor_utils.cpp | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp index 832bb6b618f5f7..f4467eb7af390f 100644 --- a/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp +++ b/src/tests/test_utils/common_test_utils/src/ov_tensor_utils.cpp @@ -383,33 +383,14 @@ void compare(const ov::Tensor& expected, if (abs_threshold == std::numeric_limits::max() && rel_threshold == std::numeric_limits::max()) { if (sizeof(ExpectedT) == 1 || sizeof(ActualT) == 1) { abs_threshold = 1.; - rel_threshold = 1.; - if (expected.get_element_type() == ov::element::Type_t::boolean) { - abs_threshold = 0.; - rel_threshold = 0.; - } } else { std::vector abs_values(shape_size_cnt); for (size_t i = 0; i < shape_size_cnt; i++) { abs_values[i] = std::fabs(static_cast(expected_data[i])); } auto abs_median = calculate_median(abs_values); - auto elem_type = expected.get_element_type(); - abs_threshold = abs_median * 0.05 < 1e-5 ? 1e-5 : 0.05 * abs_median; - if (elem_type == ov::element::Type_t::boolean) { - abs_threshold = 0.; - } else if (elem_type.is_integral_number()) { - abs_threshold = 1.0; - } else if (elem_type == ov::element::Type_t::f32 || elem_type == ov::element::Type_t::f64) { - abs_threshold = abs_median * 0.05 < 1e-5 ? 1e-5 : 0.05 * abs_median; - } else if (elem_type == ov::element::Type_t::bf16 || elem_type == ov::element::Type_t::f16) { - abs_threshold = abs_median * 0.05 < 1e-3 ? 1e-3 : 0.05 * abs_median; - } - - rel_threshold = abs_threshold; - if (std::is_integral::value) { abs_threshold = std::ceil(abs_threshold); } @@ -451,15 +432,14 @@ void compare(const ov::Tensor& expected, } double abs = std::fabs(expected_value - actual_value); - double rel = - expected_value && actual_value && !std::isinf(expected_value) ? (abs / std::fabs(expected_value)) : 0; + double rel = expected_value ? (abs / std::fabs(expected_value)) : abs; abs_error.update(abs, i); rel_error.update(rel, i); } abs_error.mean /= shape_size_cnt; rel_error.mean /= shape_size_cnt; - if (!(less_or_equal(abs_error.max, abs_threshold) || less_or_equal(rel_error.mean, rel_threshold))) { + if (!(less_or_equal(abs_error.max, abs_threshold) && less_or_equal(rel_error.max, rel_threshold))) { std::ostringstream out_stream; out_stream << "abs_max < abs_threshold && rel_max < rel_threshold" << "\n\t abs_max: " << abs_error.max << "\n\t\t coordinate " << abs_error.max_coordinate