From df4bc2731c00f9e0556f9d25545b9797cf6cc277 Mon Sep 17 00:00:00 2001 From: David Tellenbach Date: Wed, 17 Mar 2021 03:06:08 +0100 Subject: Revert "Augment NumTraits with min/max_exponent()." This reverts commit 75ce9cd2a7aefaaea8543e2db14ce4dc149eeb03. --- Eigen/src/Core/NumTraits.h | 22 +--------------------- Eigen/src/Core/StableNorm.h | 6 +++--- .../Core/arch/Default/GenericPacketMathFunctions.h | 14 +++++++------- 3 files changed, 11 insertions(+), 31 deletions(-) (limited to 'Eigen') diff --git a/Eigen/src/Core/NumTraits.h b/Eigen/src/Core/NumTraits.h index aa7b66f02..609e11402 100644 --- a/Eigen/src/Core/NumTraits.h +++ b/Eigen/src/Core/NumTraits.h @@ -135,18 +135,9 @@ EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC Tgt bit_cast(const Src& src) { * \li A dummy_precision() function returning a weak epsilon value. It is mainly used as a default * value by the fuzzy comparison operators. * \li highest() and lowest() functions returning the highest and lowest possible values respectively. - * \li digits() function returning the number of radix digits (non-sign digits for integers, mantissa for floating-point). This is - * the analogue of std::numeric_limits::digits - * which is used as the default implementation if specialized. * \li digits10() function returning the number of decimal digits that can be represented without change. This is * the analogue of std::numeric_limits::digits10 * which is used as the default implementation if specialized. - * \li min_exponent() and max_exponent() functions returning the highest and lowest possible values, respectively, - * such that the radix raised to the power exponent-1 is a normalized floating-point number. These are equivalent to - * std::numeric_limits::min_exponent/ - * std::numeric_limits::max_exponent. - * \li infinity() function returning a representation of positive infinity, if available. - * \li quiet_NaN function returning a non-signaling "not-a-number", if available. */ template struct GenericNumTraits @@ -187,18 +178,6 @@ template struct GenericNumTraits { return internal::default_digits_impl::run(); } - - EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR - static inline int min_exponent() - { - return numext::numeric_limits::min_exponent; - } - - EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR - static inline int max_exponent() - { - return numext::numeric_limits::max_exponent; - } EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR static inline Real dummy_precision() @@ -207,6 +186,7 @@ template struct GenericNumTraits return Real(0); } + EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR static inline T highest() { return (numext::numeric_limits::max)(); diff --git a/Eigen/src/Core/StableNorm.h b/Eigen/src/Core/StableNorm.h index 4a3f0cca8..04fe0b371 100644 --- a/Eigen/src/Core/StableNorm.h +++ b/Eigen/src/Core/StableNorm.h @@ -134,9 +134,9 @@ blueNorm_impl(const EigenBase& _vec) // statements can be replaced static const int ibeta = std::numeric_limits::radix; // base for floating-point numbers static const int it = NumTraits::digits(); // number of base-beta digits in mantissa - static const int iemin = NumTraits::min_exponent(); // minimum exponent - static const int iemax = NumTraits::max_exponent(); // maximum exponent - static const RealScalar rbig = NumTraits::highest(); // largest floating-point number + static const int iemin = std::numeric_limits::min_exponent; // minimum exponent + static const int iemax = std::numeric_limits::max_exponent; // maximum exponent + static const RealScalar rbig = (std::numeric_limits::max)(); // largest floating-point number static const RealScalar b1 = RealScalar(pow(RealScalar(ibeta),RealScalar(-((1-iemin)/2)))); // lower boundary of midrange static const RealScalar b2 = RealScalar(pow(RealScalar(ibeta),RealScalar((iemax + 1 - it)/2))); // upper boundary of midrange static const RealScalar s1m = RealScalar(pow(RealScalar(ibeta),RealScalar((2-iemin)/2))); // scaling factor for lower range diff --git a/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h b/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h index 75de2d28f..411640ee8 100644 --- a/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h +++ b/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h @@ -36,7 +36,7 @@ template EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC Packet pfrexp_generic_get_biased_exponent(const Packet& a) { typedef typename unpacket_traits::type Scalar; typedef typename unpacket_traits::integer_packet PacketI; - enum { mantissa_bits = NumTraits::digits() - 1}; + enum { mantissa_bits = numext::numeric_limits::digits - 1}; return pcast(plogical_shift_right(preinterpret(pabs(a)))); } @@ -48,7 +48,7 @@ Packet pfrexp_generic(const Packet& a, Packet& exponent) { typedef typename make_unsigned::type>::type ScalarUI; enum { TotalBits = sizeof(Scalar) * CHAR_BIT, - MantissaBits = NumTraits::digits() - 1, + MantissaBits = numext::numeric_limits::digits - 1, ExponentBits = int(TotalBits) - int(MantissaBits) - 1 }; @@ -116,7 +116,7 @@ Packet pldexp_generic(const Packet& a, const Packet& exponent) { typedef typename unpacket_traits::type ScalarI; enum { TotalBits = sizeof(Scalar) * CHAR_BIT, - MantissaBits = NumTraits::digits() - 1, + MantissaBits = numext::numeric_limits::digits - 1, ExponentBits = int(TotalBits) - int(MantissaBits) - 1 }; @@ -135,7 +135,7 @@ Packet pldexp_generic(const Packet& a, const Packet& exponent) { // Explicitly multiplies // a * (2^e) // clamping e to the range -// [NumTraits::min_exponent()-2, NumTraits::max_exponent()] +// [numeric_limits::min_exponent-2, numeric_limits::max_exponent] // // This is approx 7x faster than pldexp_impl, but will prematurely over/underflow // if 2^e doesn't fit into a normal floating-point Scalar. @@ -148,7 +148,7 @@ struct pldexp_fast_impl { typedef typename unpacket_traits::type ScalarI; enum { TotalBits = sizeof(Scalar) * CHAR_BIT, - MantissaBits = NumTraits::digits() - 1, + MantissaBits = numext::numeric_limits::digits - 1, ExponentBits = int(TotalBits) - int(MantissaBits) - 1 }; @@ -1480,8 +1480,8 @@ Packet generic_pow(const Packet& x, const Packet& y) { const Packet y_is_nan = pandnot(ptrue(y), pcmp_eq(y, y)); const Packet abs_y_is_inf = pcmp_eq(pabs(y), cst_pos_inf); EIGEN_CONSTEXPR Scalar huge_exponent = - (NumTraits::max_exponent() * Scalar(EIGEN_LN2)) / - NumTraits::epsilon(); + (std::numeric_limits::max_exponent * Scalar(EIGEN_LN2)) / + std::numeric_limits::epsilon(); const Packet abs_y_is_huge = pcmp_le(pset1(huge_exponent), pabs(y)); // Predicates for whether y is integer and/or even. -- cgit v1.2.3