diff options
author | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-08-27 15:35:29 -0700 |
---|---|---|
committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-08-27 15:35:29 -0700 |
commit | 9aba527405b40132a308f5f782dacadf6ef50acd (patch) | |
tree | a5293be79a29c1fb068eb32217aa4f224e760410 /Eigen/src/Core | |
parent | b021cdea6dd84b0f51dd7aea691d47dd3eab8e9d (diff) |
Revert changes to std_falback::log1p that broke handling of arguments less than -1. Fix packet op accordingly.
Diffstat (limited to 'Eigen/src/Core')
-rw-r--r-- | Eigen/src/Core/MathFunctions.h | 3 | ||||
-rw-r--r-- | Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index 1eeb2752b..fcf62011e 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -550,9 +550,8 @@ namespace std_fallback { EIGEN_USING_STD_MATH(log); Scalar x1p = RealScalar(1) + x; Scalar log_1p = log(x1p); - const bool is_inf = numext::equal_strict(x1p, log_1p); const bool is_small = numext::equal_strict(x1p, Scalar(1)); - return (is_inf || is_small) ? x : x * (log_1p / (x1p - RealScalar(1))); + return is_small ? x : x * (log_1p / (x1p - RealScalar(1))); } } diff --git a/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h b/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h index 640aae05a..505a0eec8 100644 --- a/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h +++ b/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h @@ -137,10 +137,8 @@ Packet generic_plog1p(const Packet& x) Packet xp1 = padd(x, one); Packet small_mask = pcmp_eq(xp1, one); Packet log1 = plog(xp1); - // Add a check to handle x == +inf. - Packet pos_inf_mask = pcmp_eq(x, log1); Packet log_large = pmul(x, pdiv(log1, psub(xp1, one))); - return pselect(por(small_mask, pos_inf_mask), x, log_large); + return pselect(small_mask, x, log_large); } /** \internal \returns exp(x)-1 computed using W. Kahan's formula. |