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

bug #1520: workaround some -Wfloat-equal warnings by calling std::equal_to

Browse Source
This commit is contained in:
Gael Guennebaud 2018-04-11 15:24:13 +02:00
parent b0eda3cb9f
commit e43ca0320d
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,11 +473,11 @@ namespace std_fallback {
EIGEN_USING_STD_MATH(exp); EIGEN_USING_STD_MATH(exp);
Scalar u = exp(x); Scalar u = exp(x);
if (u == Scalar(1)) { if (numext::equal_strict(u, Scalar(1))) {
return x; return x;
} }
Scalar um1 = u - RealScalar(1); Scalar um1 = u - RealScalar(1);
if (um1 == Scalar(-1)) { if (numext::equal_strict(um1, Scalar(-1))) {
return RealScalar(-1); return RealScalar(-1);
} }
@ -519,7 +519,7 @@ namespace std_fallback {
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
EIGEN_USING_STD_MATH(log); EIGEN_USING_STD_MATH(log);
Scalar x1p = RealScalar(1) + x; Scalar x1p = RealScalar(1) + x;
return ( x1p == Scalar(1) ) ? x : x * ( log(x1p) / (x1p - RealScalar(1)) ); return numext::equal_strict(x1p, Scalar(1)) ? x : x * ( log(x1p) / (x1p - RealScalar(1)) );
} }
} }

4
Eigen/src/Core/arch/CUDA/Half.h
View File

@ -299,10 +299,10 @@ EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC half& operator /= (half& a, const half& b)
return a; return a;
} }
EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC bool operator == (const half& a, const half& b) { EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC bool operator == (const half& a, const half& b) {
return float(a) == float(b); return numext::equal_strict(float(a),float(b));
} }
EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC bool operator != (const half& a, const half& b) { EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC bool operator != (const half& a, const half& b) {
return float(a) != float(b); return numext::not_equal_strict(float(a), float(b));
} }
EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC bool operator < (const half& a, const half& b) { EIGEN_STRONG_INLINE EIGEN_DEVICE_FUNC bool operator < (const half& a, const half& b) {
return float(a) < float(b); return float(a) < float(b);

20
Eigen/src/Core/util/Meta.h
View File

@ -543,6 +543,26 @@ T div_ceil(const T &a, const T &b)
return (a+b-1) / b; return (a+b-1) / b;
} }
// The aim of the following functions is to bypass -Wfloat-equal warnings
// when we really want a strict equality comparison on floating points.
template<typename X, typename Y>
bool equal_strict(const X& x,const Y& y) { return x == y; }
template<>
bool equal_strict(const float& x,const float& y) { return std::equal_to<float>()(x,y); }
template<>
bool equal_strict(const double& x,const double& y) { return std::equal_to<double>()(x,y); }
template<typename X, typename Y>
bool not_equal_strict(const X& x,const Y& y) { return x != y; }
template<>
bool not_equal_strict(const float& x,const float& y) { return std::not_equal_to<float>()(x,y); }
template<>
bool not_equal_strict(const double& x,const double& y) { return std::not_equal_to<double>()(x,y); }
} // end namespace numext } // end namespace numext
} // end namespace Eigen } // end namespace Eigen