From 75ce9cd2a7aefaaea8543e2db14ce4dc149eeb03 Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Fri, 12 Feb 2021 13:14:05 -0800 Subject: Augment NumTraits with min/max_exponent(). Replace usage of `std::numeric_limits<...>::min/max_exponent` in codebase. Also replaced some other `numeric_limits` usages in affected tests with the `NumTraits` equivalent. Fixes #2148 --- test/array_cwise.cpp | 10 ++++---- test/packetmath.cpp | 64 ++++++++++++++++++++++++++-------------------------- 2 files changed, 37 insertions(+), 37 deletions(-) (limited to 'test') diff --git a/test/array_cwise.cpp b/test/array_cwise.cpp index 6a88e0e27..1bc8e19f9 100644 --- a/test/array_cwise.cpp +++ b/test/array_cwise.cpp @@ -14,18 +14,18 @@ template void pow_test() { const Scalar zero = Scalar(0); - const Scalar eps = std::numeric_limits::epsilon(); + const Scalar eps = Eigen::NumTraits::epsilon(); const Scalar one = Scalar(1); const Scalar two = Scalar(2); const Scalar three = Scalar(3); const Scalar sqrt_half = Scalar(std::sqrt(0.5)); const Scalar sqrt2 = Scalar(std::sqrt(2)); - const Scalar inf = std::numeric_limits::infinity(); - const Scalar nan = std::numeric_limits::quiet_NaN(); + const Scalar inf = Eigen::NumTraits::infinity(); + const Scalar nan = Eigen::NumTraits::quiet_NaN(); const Scalar denorm_min = std::numeric_limits::denorm_min(); const Scalar min = (std::numeric_limits::min)(); const Scalar max = (std::numeric_limits::max)(); - const Scalar max_exp = (static_cast(int(std::numeric_limits::max_exponent)) * Scalar(EIGEN_LN2)) / eps; + const Scalar max_exp = (static_cast(int(Eigen::NumTraits::max_exponent())) * Scalar(EIGEN_LN2)) / eps; const static Scalar abs_vals[] = {zero, denorm_min, @@ -613,7 +613,7 @@ template void min_max(const ArrayType& m) // min/max with various NaN propagation options. if (m1.size() > 1 && !NumTraits::IsInteger) { - m1(0,0) = std::numeric_limits::quiet_NaN(); + m1(0,0) = NumTraits::quiet_NaN(); maxM1 = m1.template maxCoeff(); minM1 = m1.template minCoeff(); VERIFY((numext::isnan)(maxM1)); diff --git a/test/packetmath.cpp b/test/packetmath.cpp index f5cce6436..67d329a67 100644 --- a/test/packetmath.cpp +++ b/test/packetmath.cpp @@ -273,7 +273,7 @@ void packetmath_boolean_mask_ops() { //Test NaN for (int i = 0; i < PacketSize; ++i) { - data1[i] = std::numeric_limits::quiet_NaN(); + data1[i] = NumTraits::quiet_NaN(); data1[i + PacketSize] = internal::random() ? data1[i] : Scalar(0); } CHECK_CWISE2_IF(true, internal::pcmp_eq, internal::pcmp_eq); @@ -634,7 +634,7 @@ void packetmath_real() { if (PacketTraits::HasExp) { // Check denormals: for (int j=0; j<3; ++j) { - data1[0] = Scalar(std::ldexp(1, std::numeric_limits::min_exponent-j)); + data1[0] = Scalar(std::ldexp(1, NumTraits::min_exponent()-j)); CHECK_CWISE1_BYREF1_IF(PacketTraits::HasExp, REF_FREXP, internal::pfrexp); data1[0] = -data1[0]; CHECK_CWISE1_BYREF1_IF(PacketTraits::HasExp, REF_FREXP, internal::pfrexp); @@ -671,10 +671,10 @@ void packetmath_real() { if (PacketTraits::HasExp) { data1[0] = Scalar(-1); // underflow to zero - data1[PacketSize] = Scalar(std::numeric_limits::min_exponent-55); + data1[PacketSize] = Scalar(NumTraits::min_exponent()-55); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); // overflow to inf - data1[PacketSize] = Scalar(std::numeric_limits::max_exponent+10); + data1[PacketSize] = Scalar(NumTraits::max_exponent()+10); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); // NaN stays NaN data1[0] = NumTraits::quiet_NaN(); @@ -682,21 +682,21 @@ void packetmath_real() { VERIFY((numext::isnan)(data2[0])); // inf stays inf data1[0] = NumTraits::infinity(); - data1[PacketSize] = Scalar(std::numeric_limits::min_exponent-10); + data1[PacketSize] = Scalar(NumTraits::min_exponent()-10); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); // zero stays zero data1[0] = Scalar(0); - data1[PacketSize] = Scalar(std::numeric_limits::max_exponent+10); + data1[PacketSize] = Scalar(NumTraits::max_exponent()+10); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); // Small number big exponent. - data1[0] = Scalar(std::ldexp(Scalar(1.0), std::numeric_limits::min_exponent-1)); - data1[PacketSize] = Scalar(-std::numeric_limits::min_exponent - +std::numeric_limits::max_exponent); + data1[0] = Scalar(std::ldexp(Scalar(1.0), NumTraits::min_exponent()-1)); + data1[PacketSize] = Scalar(-NumTraits::min_exponent() + +NumTraits::max_exponent()); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); // Big number small exponent. - data1[0] = Scalar(std::ldexp(Scalar(1.0), std::numeric_limits::max_exponent-1)); - data1[PacketSize] = Scalar(+std::numeric_limits::min_exponent - -std::numeric_limits::max_exponent); + data1[0] = Scalar(std::ldexp(Scalar(1.0), NumTraits::max_exponent()-1)); + data1[PacketSize] = Scalar(+NumTraits::min_exponent() + -NumTraits::max_exponent()); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); } @@ -707,8 +707,8 @@ void packetmath_real() { data1[0] = Scalar(1e-20); CHECK_CWISE1_IF(PacketTraits::HasTanh, std::tanh, internal::ptanh); if (PacketTraits::HasExp && PacketSize >= 2) { - const Scalar small = std::numeric_limits::epsilon(); - data1[0] = std::numeric_limits::quiet_NaN(); + const Scalar small = NumTraits::epsilon(); + data1[0] = NumTraits::quiet_NaN(); data1[1] = small; test::packet_helper h; h.store(data2, internal::pexp(h.load(data1))); @@ -742,7 +742,7 @@ void packetmath_real() { if (PacketTraits::HasTanh) { // NOTE this test migh fail with GCC prior to 6.3, see MathFunctionsImpl.h for details. - data1[0] = std::numeric_limits::quiet_NaN(); + data1[0] = NumTraits::quiet_NaN(); test::packet_helper::HasTanh, Packet> h; h.store(data2, internal::ptanh(h.load(data1))); VERIFY((numext::isnan)(data2[0])); @@ -762,17 +762,17 @@ void packetmath_real() { } #if EIGEN_HAS_C99_MATH && (EIGEN_COMP_CXXVER >= 11) - data1[0] = std::numeric_limits::infinity(); + data1[0] = NumTraits::infinity(); data1[1] = Scalar(-1); CHECK_CWISE1_IF(PacketTraits::HasLog1p, std::log1p, internal::plog1p); - data1[0] = std::numeric_limits::infinity(); - data1[1] = -std::numeric_limits::infinity(); + data1[0] = NumTraits::infinity(); + data1[1] = -NumTraits::infinity(); CHECK_CWISE1_IF(PacketTraits::HasExpm1, std::expm1, internal::pexpm1); #endif if (PacketSize >= 2) { - data1[0] = std::numeric_limits::quiet_NaN(); - data1[1] = std::numeric_limits::epsilon(); + data1[0] = NumTraits::quiet_NaN(); + data1[1] = NumTraits::epsilon(); if (PacketTraits::HasLog) { test::packet_helper h; h.store(data2, internal::plog(h.load(data1))); @@ -782,7 +782,7 @@ void packetmath_real() { VERIFY_IS_APPROX(std::log(data1[1]), data2[1]); } - data1[0] = -std::numeric_limits::epsilon(); + data1[0] = -NumTraits::epsilon(); data1[1] = Scalar(0); h.store(data2, internal::plog(h.load(data1))); VERIFY((numext::isnan)(data2[0])); @@ -813,14 +813,14 @@ void packetmath_real() { h.store(data2, internal::plog(h.load(data1))); VERIFY((numext::isnan)(data2[0])); - data1[0] = std::numeric_limits::infinity(); + data1[0] = NumTraits::infinity(); h.store(data2, internal::plog(h.load(data1))); VERIFY((numext::isinf)(data2[0])); } if (PacketTraits::HasLog1p) { test::packet_helper h; data1[0] = Scalar(-2); - data1[1] = -std::numeric_limits::infinity(); + data1[1] = -NumTraits::infinity(); h.store(data2, internal::plog1p(h.load(data1))); VERIFY((numext::isnan)(data2[0])); VERIFY((numext::isnan)(data2[1])); @@ -831,7 +831,7 @@ void packetmath_real() { if (std::numeric_limits::has_denorm == std::denorm_present) { data1[1] = -std::numeric_limits::denorm_min(); } else { - data1[1] = -std::numeric_limits::epsilon(); + data1[1] = -NumTraits::epsilon(); } h.store(data2, internal::psqrt(h.load(data1))); VERIFY((numext::isnan)(data2[0])); @@ -842,7 +842,7 @@ void packetmath_real() { && !internal::is_same::value && !internal::is_same::value) { test::packet_helper h; - for (Scalar k = Scalar(1); k < Scalar(10000) / std::numeric_limits::epsilon(); k *= Scalar(2)) { + for (Scalar k = Scalar(1); k < Scalar(10000) / NumTraits::epsilon(); k *= Scalar(2)) { for (int k1 = 0; k1 <= 1; ++k1) { data1[0] = Scalar((2 * double(k) + k1) * double(EIGEN_PI) / 2 * internal::random(0.8, 1.2)); data1[1] = Scalar((2 * double(k) + 2 + k1) * double(EIGEN_PI) / 2 * internal::random(0.8, 1.2)); @@ -863,8 +863,8 @@ void packetmath_real() { } } - data1[0] = std::numeric_limits::infinity(); - data1[1] = -std::numeric_limits::infinity(); + data1[0] = NumTraits::infinity(); + data1[1] = -NumTraits::infinity(); h.store(data2, internal::psin(h.load(data1))); VERIFY((numext::isnan)(data2[0])); VERIFY((numext::isnan)(data2[1])); @@ -873,7 +873,7 @@ void packetmath_real() { VERIFY((numext::isnan)(data2[0])); VERIFY((numext::isnan)(data2[1])); - data1[0] = std::numeric_limits::quiet_NaN(); + data1[0] = NumTraits::quiet_NaN(); h.store(data2, internal::psin(h.load(data1))); VERIFY((numext::isnan)(data2[0])); h.store(data2, internal::pcos(h.load(data1))); @@ -997,13 +997,13 @@ void packetmath_notcomplex() { VERIFY(internal::isApprox(ref[0], internal::predux_max(internal::pload(data1))) && "internal::predux_max"); // A single NaN. const size_t index = std::numeric_limits::quiet_NaN() % PacketSize; - data1[index] = std::numeric_limits::quiet_NaN(); + data1[index] = NumTraits::quiet_NaN(); VERIFY(PacketSize==1 || !(numext::isnan)(internal::predux_min(internal::pload(data1)))); VERIFY((numext::isnan)(internal::predux_min(internal::pload(data1)))); VERIFY(PacketSize==1 || !(numext::isnan)(internal::predux_max(internal::pload(data1)))); VERIFY((numext::isnan)(internal::predux_max(internal::pload(data1)))); // All NaNs. - for (int i = 0; i < 4 * PacketSize; ++i) data1[i] = std::numeric_limits::quiet_NaN(); + for (int i = 0; i < 4 * PacketSize; ++i) data1[i] = NumTraits::quiet_NaN(); VERIFY((numext::isnan)(internal::predux_min(internal::pload(data1)))); VERIFY((numext::isnan)(internal::predux_min(internal::pload(data1)))); VERIFY((numext::isnan)(internal::predux_max(internal::pload(data1)))); @@ -1011,8 +1011,8 @@ void packetmath_notcomplex() { // Test NaN propagation for coefficient-wise min and max. for (int i = 0; i < PacketSize; ++i) { - data1[i] = internal::random() ? std::numeric_limits::quiet_NaN() : Scalar(0); - data1[i + PacketSize] = internal::random() ? std::numeric_limits::quiet_NaN() : Scalar(0); + data1[i] = internal::random() ? NumTraits::quiet_NaN() : Scalar(0); + data1[i + PacketSize] = internal::random() ? NumTraits::quiet_NaN() : Scalar(0); } // Note: NaN propagation is implementation defined for pmin/pmax, so we do not test it here. CHECK_CWISE2_IF(PacketTraits::HasMin, propagate_number_min, (internal::pmin)); -- cgit v1.2.3