GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 11:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #1008: stabilize isfinite/isinf/isnan/hasNaN/allFinite functions for fast-math mode.

Browse Source
This commit is contained in:
Gael Guennebaud 2015-10-27 15:39:50 +01:00
parent 699c33e76a
commit 2475a1de48
2 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Core/BooleanRedux.h
View File

@ -142,7 +142,11 @@ inline Eigen::Index DenseBase<Derived>::count() const
template<typename Derived> template<typename Derived>
inline bool DenseBase<Derived>::hasNaN() const inline bool DenseBase<Derived>::hasNaN() const
{ {
#if EIGEN_COMP_MSVC || (defined __FAST_MATH__)
return derived().array().isNaN().any();
#else
return !((derived().array()==derived().array()).all()); return !((derived().array()==derived().array()).all());
#endif
} }
/** \returns true if \c *this contains only finite numbers, i.e., no NaN and no +/-INF values. /** \returns true if \c *this contains only finite numbers, i.e., no NaN and no +/-INF values.
@ -152,7 +156,11 @@ inline bool DenseBase<Derived>::hasNaN() const
template<typename Derived> template<typename Derived>
inline bool DenseBase<Derived>::allFinite() const inline bool DenseBase<Derived>::allFinite() const
{ {
#if EIGEN_COMP_MSVC || (defined __FAST_MATH__)
return derived().array().isFinite().all();
#else
return !((derived()-derived()).hasNaN()); return !((derived()-derived()).hasNaN());
#endif
} }
} // end namespace Eigen } // end namespace Eigen

69
Eigen/src/Core/MathFunctions.h
View File

@ -818,11 +818,18 @@ inline EIGEN_MATHFUNC_RETVAL(pow, Scalar) pow(const Scalar& x, const Scalar& y)
return EIGEN_MATHFUNC_IMPL(pow, Scalar)::run(x, y); return EIGEN_MATHFUNC_IMPL(pow, Scalar)::run(x, y);
} }
// std::is* do not work with fast-math and gcc
#if EIGEN_HAS_CXX11_MATH && !(EIGEN_COMP_GNUC_STRICT && defined __FAST_MATH__)
#define EIGEN_USE_STD_FPCLASSIFY 1
#else
#define EIGEN_USE_STD_FPCLASSIFY 0
#endif
template<typename T> template<typename T>
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
bool (isfinite)(const T& x) bool (isfinite)(const T& x)
{ {
#if EIGEN_HAS_CXX11_MATH #if EIGEN_USE_STD_FPCLASSIFY
using std::isfinite; using std::isfinite;
return isfinite EIGEN_NOT_A_MACRO (x); return isfinite EIGEN_NOT_A_MACRO (x);
#else #else
@ -830,11 +837,23 @@ bool (isfinite)(const T& x)
#endif #endif
} }
template<typename T>
EIGEN_DEVICE_FUNC
bool (isinf)(const T& x)
{
#if EIGEN_USE_STD_FPCLASSIFY
using std::isinf;
return isinf EIGEN_NOT_A_MACRO (x);
#else
return x>NumTraits<T>::highest() || x<NumTraits<T>::lowest();
#endif
}
template<typename T> template<typename T>
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
bool (isnan)(const T& x) bool (isnan)(const T& x)
{ {
#if EIGEN_HAS_CXX11_MATH #if EIGEN_USE_STD_FPCLASSIFY
using std::isnan; using std::isnan;
return isnan EIGEN_NOT_A_MACRO (x); return isnan EIGEN_NOT_A_MACRO (x);
#else #else
@ -842,18 +861,48 @@ bool (isnan)(const T& x)
#endif #endif
} }
template<typename T> #if (!EIGEN_USE_STD_FPCLASSIFY)
EIGEN_DEVICE_FUNC
bool (isinf)(const T& x) #if EIGEN_COMP_MSVC
{
#if EIGEN_HAS_CXX11_MATH //MSVC defines a _isnan builtin function, but for double only
using std::isinf; template<> EIGEN_DEVICE_FUNC bool (isnan)(const long double& x) { return _isnan(double(x)); }
return isinf EIGEN_NOT_A_MACRO (x); template<> EIGEN_DEVICE_FUNC bool (isnan)(const double& x) { return _isnan(x); }
template<> EIGEN_DEVICE_FUNC bool (isnan)(const float& x) { return _isnan(double(x)); }
#elif defined __FAST_MATH__
#if EIGEN_COMP_CLANG
#define EIGEN_TMP_NOOPT_ATTRIB EIGEN_DEVICE_FUNC __attribute__((optnone))
#elif EIGEN_COMP_GNUC
#define EIGEN_TMP_NOOPT_ATTRIB EIGEN_DEVICE_FUNC __attribute__((optimize("no-fast-math")))
#else #else
return x>NumTraits<T>::highest() || x<NumTraits<T>::lowest(); #define EIGEN_TMP_NOOPT_ATTRIB EIGEN_DEVICE_FUNC
#endif #endif
template<typename T>
EIGEN_TMP_NOOPT_ATTRIB
bool isinf_helper(const T& x)
{
return x>NumTraits<T>::highest() || x<NumTraits<T>::lowest();
} }
template<> EIGEN_TMP_NOOPT_ATTRIB bool (isnan)(const long double& x) { return !(x <= std::numeric_limits<long double>::infinity()); }
template<> EIGEN_TMP_NOOPT_ATTRIB bool (isnan)(const double& x) { return x!=x; }
template<> EIGEN_TMP_NOOPT_ATTRIB bool (isnan)(const float& x) { return x!=x; }
template<> EIGEN_TMP_NOOPT_ATTRIB bool (isinf)(const double& x) { return isinf_helper(x); }
template<> EIGEN_TMP_NOOPT_ATTRIB bool (isinf)(const float& x) { return isinf_helper(x); }
#if EIGEN_COMP_CLANG
template<> EIGEN_TMP_NOOPT_ATTRIB bool (isinf)(const long double& x) { return isinf(double(x)); }
#endif
#undef EIGEN_TMP_NOOPT_ATTRIB
#endif
#endif
template<typename T> template<typename T>
bool (isfinite)(const std::complex<T>& x) bool (isfinite)(const std::complex<T>& x)
{ {