GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Protect further isnan/isfinite/isinf calls

Browse Source
This commit is contained in:
Christoph Hertzberg 2015-08-16 14:00:02 +02:00
parent a40f6ab276
commit d6a4805fdf
5 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Eigenvalues/EigenSolver.h
View File

@ -399,7 +399,7 @@ EigenSolver<MatrixType>::compute(const MatrixType& matrix, bool computeEigenvect
if (i == matrix.cols() - 1 || m_matT.coeff(i+1, i) == Scalar(0)) if (i == matrix.cols() - 1 || m_matT.coeff(i+1, i) == Scalar(0))
{ {
m_eivalues.coeffRef(i) = m_matT.coeff(i, i); m_eivalues.coeffRef(i) = m_matT.coeff(i, i);
if(!isfinite(m_eivalues.coeffRef(i))) if(!(isfinite)(m_eivalues.coeffRef(i)))
{ {
m_isInitialized = true; m_isInitialized = true;
m_eigenvectorsOk = false; m_eigenvectorsOk = false;
@ -426,7 +426,7 @@ EigenSolver<MatrixType>::compute(const MatrixType& matrix, bool computeEigenvect
m_eivalues.coeffRef(i) = ComplexScalar(m_matT.coeff(i+1, i+1) + p, z); m_eivalues.coeffRef(i) = ComplexScalar(m_matT.coeff(i+1, i+1) + p, z);
m_eivalues.coeffRef(i+1) = ComplexScalar(m_matT.coeff(i+1, i+1) + p, -z); m_eivalues.coeffRef(i+1) = ComplexScalar(m_matT.coeff(i+1, i+1) + p, -z);
if(!(isfinite(m_eivalues.coeffRef(i)) && isfinite(m_eivalues.coeffRef(i+1)))) if(!((isfinite)(m_eivalues.coeffRef(i)) && (isfinite)(m_eivalues.coeffRef(i+1))))
{ {
m_isInitialized = true; m_isInitialized = true;
m_eigenvectorsOk = false; m_eigenvectorsOk = false;

16
test/packetmath.cpp
View File

@ -318,7 +318,7 @@ template<typename Scalar> void packetmath_real()
data1[1] = std::numeric_limits<Scalar>::epsilon(); data1[1] = std::numeric_limits<Scalar>::epsilon();
packet_helper<internal::packet_traits<Scalar>::HasExp,Packet> h; packet_helper<internal::packet_traits<Scalar>::HasExp,Packet> h;
h.store(data2, internal::pexp(h.load(data1))); h.store(data2, internal::pexp(h.load(data1)));
VERIFY(numext::isnan(data2[0])); VERIFY((numext::isnan)(data2[0]));
VERIFY_IS_EQUAL(std::exp(std::numeric_limits<Scalar>::epsilon()), data2[1]); VERIFY_IS_EQUAL(std::exp(std::numeric_limits<Scalar>::epsilon()), data2[1]);
data1[0] = -std::numeric_limits<Scalar>::epsilon(); data1[0] = -std::numeric_limits<Scalar>::epsilon();
@ -354,34 +354,34 @@ template<typename Scalar> void packetmath_real()
data1[1] = std::numeric_limits<Scalar>::epsilon(); data1[1] = std::numeric_limits<Scalar>::epsilon();
packet_helper<internal::packet_traits<Scalar>::HasLog,Packet> h; packet_helper<internal::packet_traits<Scalar>::HasLog,Packet> h;
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
VERIFY(std::isnan(data2[0])); VERIFY((numext::isnan)(data2[0]));
// VERIFY_IS_EQUAL(std::log(std::numeric_limits<Scalar>::epsilon()), data2[1]); // VERIFY_IS_EQUAL(std::log(std::numeric_limits<Scalar>::epsilon()), data2[1]);
data1[0] = -std::numeric_limits<Scalar>::epsilon(); data1[0] = -std::numeric_limits<Scalar>::epsilon();
data1[1] = 0; data1[1] = 0;
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
VERIFY(std::isnan(data2[0])); VERIFY((numext::isnan)(data2[0]));
// VERIFY_IS_EQUAL(std::log(0), data2[1]); // VERIFY_IS_EQUAL(std::log(0), data2[1]);
data1[0] = (std::numeric_limits<Scalar>::min)(); data1[0] = (std::numeric_limits<Scalar>::min)();
data1[1] = -(std::numeric_limits<Scalar>::min)(); data1[1] = -(std::numeric_limits<Scalar>::min)();
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
VERIFY_IS_EQUAL(std::log((std::numeric_limits<Scalar>::min)()), data2[0]); VERIFY_IS_EQUAL(std::log((std::numeric_limits<Scalar>::min)()), data2[0]);
// VERIFY(std::isnan(data2[1])); // VERIFY((numext::isnan)(data2[1]));
data1[0] = std::numeric_limits<Scalar>::denorm_min(); data1[0] = std::numeric_limits<Scalar>::denorm_min();
data1[1] = -std::numeric_limits<Scalar>::denorm_min(); data1[1] = -std::numeric_limits<Scalar>::denorm_min();
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
// VERIFY_IS_EQUAL(std::log(std::numeric_limits<Scalar>::denorm_min()), data2[0]); // VERIFY_IS_EQUAL(std::log(std::numeric_limits<Scalar>::denorm_min()), data2[0]);
// VERIFY(std::isnan(data2[1])); // VERIFY((numext::isnan)(data2[1]));
data1[0] = -1.0f; data1[0] = -1.0f;
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
VERIFY(std::isnan(data2[0])); VERIFY((numext::isnan)(data2[0]));
#if !EIGEN_FAST_MATH #if !EIGEN_FAST_MATH
h.store(data2, internal::psqrt(h.load(data1))); h.store(data2, internal::psqrt(h.load(data1)));
VERIFY(numext::isnan(data2[0])); VERIFY((numext::isnan)(data2[0]));
VERIFY(numext::isnan(data2[1])); VERIFY((numext::isnan)(data2[1]));
#endif #endif
} }
} }

50
test/stable_norm.cpp
View File

@ -40,7 +40,7 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
&& "the stable norm algorithm cannot be guaranteed on this computer"); && "the stable norm algorithm cannot be guaranteed on this computer");
Scalar inf = std::numeric_limits<RealScalar>::infinity(); Scalar inf = std::numeric_limits<RealScalar>::infinity();
if(NumTraits<Scalar>::IsComplex && numext::isnan(inf*RealScalar(1)) ) if(NumTraits<Scalar>::IsComplex && (numext::isnan)(inf*RealScalar(1)) )
{ {
complex_real_product_ok = false; complex_real_product_ok = false;
static bool first = true; static bool first = true;
@ -81,18 +81,18 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
RealScalar size = static_cast<RealScalar>(m.size()); RealScalar size = static_cast<RealScalar>(m.size());
// test numext::isfinite // test numext::isfinite
VERIFY(!numext::isfinite( std::numeric_limits<RealScalar>::infinity())); VERIFY(!(numext::isfinite)( std::numeric_limits<RealScalar>::infinity()));
VERIFY(!numext::isfinite(sqrt(-abs(big)))); VERIFY(!(numext::isfinite)(sqrt(-abs(big))));
// test overflow // test overflow
VERIFY(numext::isfinite(sqrt(size)*abs(big))); VERIFY((numext::isfinite)(sqrt(size)*abs(big)));
VERIFY_IS_NOT_APPROX(sqrt(copy(vbig.squaredNorm())), abs(sqrt(size)*big)); // here the default norm must fail VERIFY_IS_NOT_APPROX(sqrt(copy(vbig.squaredNorm())), abs(sqrt(size)*big)); // here the default norm must fail
VERIFY_IS_APPROX(vbig.stableNorm(), sqrt(size)*abs(big)); VERIFY_IS_APPROX(vbig.stableNorm(), sqrt(size)*abs(big));
VERIFY_IS_APPROX(vbig.blueNorm(), sqrt(size)*abs(big)); VERIFY_IS_APPROX(vbig.blueNorm(), sqrt(size)*abs(big));
VERIFY_IS_APPROX(vbig.hypotNorm(), sqrt(size)*abs(big)); VERIFY_IS_APPROX(vbig.hypotNorm(), sqrt(size)*abs(big));
// test underflow // test underflow
VERIFY(numext::isfinite(sqrt(size)*abs(small))); VERIFY((numext::isfinite)(sqrt(size)*abs(small)));
VERIFY_IS_NOT_APPROX(sqrt(copy(vsmall.squaredNorm())), abs(sqrt(size)*small)); // here the default norm must fail VERIFY_IS_NOT_APPROX(sqrt(copy(vsmall.squaredNorm())), abs(sqrt(size)*small)); // here the default norm must fail
VERIFY_IS_APPROX(vsmall.stableNorm(), sqrt(size)*abs(small)); VERIFY_IS_APPROX(vsmall.stableNorm(), sqrt(size)*abs(small));
VERIFY_IS_APPROX(vsmall.blueNorm(), sqrt(size)*abs(small)); VERIFY_IS_APPROX(vsmall.blueNorm(), sqrt(size)*abs(small));
@ -115,39 +115,39 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
{ {
v = vrand; v = vrand;
v(i,j) = std::numeric_limits<RealScalar>::quiet_NaN(); v(i,j) = std::numeric_limits<RealScalar>::quiet_NaN();
VERIFY(!numext::isfinite(v.squaredNorm())); VERIFY(numext::isnan(v.squaredNorm())); VERIFY(!(numext::isfinite)(v.squaredNorm())); VERIFY((numext::isnan)(v.squaredNorm()));
VERIFY(!numext::isfinite(v.norm())); VERIFY(numext::isnan(v.norm())); VERIFY(!(numext::isfinite)(v.norm())); VERIFY((numext::isnan)(v.norm()));
VERIFY(!numext::isfinite(v.stableNorm())); VERIFY(numext::isnan(v.stableNorm())); VERIFY(!(numext::isfinite)(v.stableNorm())); VERIFY((numext::isnan)(v.stableNorm()));
VERIFY(!numext::isfinite(v.blueNorm())); VERIFY(numext::isnan(v.blueNorm())); VERIFY(!(numext::isfinite)(v.blueNorm())); VERIFY((numext::isnan)(v.blueNorm()));
VERIFY(!numext::isfinite(v.hypotNorm())); VERIFY(numext::isnan(v.hypotNorm())); VERIFY(!(numext::isfinite)(v.hypotNorm())); VERIFY((numext::isnan)(v.hypotNorm()));
} }
// +inf // +inf
{ {
v = vrand; v = vrand;
v(i,j) = std::numeric_limits<RealScalar>::infinity(); v(i,j) = std::numeric_limits<RealScalar>::infinity();
VERIFY(!numext::isfinite(v.squaredNorm())); VERIFY(isPlusInf(v.squaredNorm())); VERIFY(!(numext::isfinite)(v.squaredNorm())); VERIFY(isPlusInf(v.squaredNorm()));
VERIFY(!numext::isfinite(v.norm())); VERIFY(isPlusInf(v.norm())); VERIFY(!(numext::isfinite)(v.norm())); VERIFY(isPlusInf(v.norm()));
VERIFY(!numext::isfinite(v.stableNorm())); VERIFY(!(numext::isfinite)(v.stableNorm()));
if(complex_real_product_ok){ if(complex_real_product_ok){
VERIFY(isPlusInf(v.stableNorm())); VERIFY(isPlusInf(v.stableNorm()));
} }
VERIFY(!numext::isfinite(v.blueNorm())); VERIFY(isPlusInf(v.blueNorm())); VERIFY(!(numext::isfinite)(v.blueNorm())); VERIFY(isPlusInf(v.blueNorm()));
VERIFY(!numext::isfinite(v.hypotNorm())); VERIFY(isPlusInf(v.hypotNorm())); VERIFY(!(numext::isfinite)(v.hypotNorm())); VERIFY(isPlusInf(v.hypotNorm()));
} }
// -inf // -inf
{ {
v = vrand; v = vrand;
v(i,j) = -std::numeric_limits<RealScalar>::infinity(); v(i,j) = -std::numeric_limits<RealScalar>::infinity();
VERIFY(!numext::isfinite(v.squaredNorm())); VERIFY(isPlusInf(v.squaredNorm())); VERIFY(!(numext::isfinite)(v.squaredNorm())); VERIFY(isPlusInf(v.squaredNorm()));
VERIFY(!numext::isfinite(v.norm())); VERIFY(isPlusInf(v.norm())); VERIFY(!(numext::isfinite)(v.norm())); VERIFY(isPlusInf(v.norm()));
VERIFY(!numext::isfinite(v.stableNorm())); VERIFY(!(numext::isfinite)(v.stableNorm()));
if(complex_real_product_ok) { if(complex_real_product_ok) {
VERIFY(isPlusInf(v.stableNorm())); VERIFY(isPlusInf(v.stableNorm()));
} }
VERIFY(!numext::isfinite(v.blueNorm())); VERIFY(isPlusInf(v.blueNorm())); VERIFY(!(numext::isfinite)(v.blueNorm())); VERIFY(isPlusInf(v.blueNorm()));
VERIFY(!numext::isfinite(v.hypotNorm())); VERIFY(isPlusInf(v.hypotNorm())); VERIFY(!(numext::isfinite)(v.hypotNorm())); VERIFY(isPlusInf(v.hypotNorm()));
} }
// mix // mix
@ -157,11 +157,11 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
v = vrand; v = vrand;
v(i,j) = -std::numeric_limits<RealScalar>::infinity(); v(i,j) = -std::numeric_limits<RealScalar>::infinity();
v(i2,j2) = std::numeric_limits<RealScalar>::quiet_NaN(); v(i2,j2) = std::numeric_limits<RealScalar>::quiet_NaN();
VERIFY(!numext::isfinite(v.squaredNorm())); VERIFY(numext::isnan(v.squaredNorm())); VERIFY(!(numext::isfinite)(v.squaredNorm())); VERIFY((numext::isnan)(v.squaredNorm()));
VERIFY(!numext::isfinite(v.norm())); VERIFY(numext::isnan(v.norm())); VERIFY(!(numext::isfinite)(v.norm())); VERIFY((numext::isnan)(v.norm()));
VERIFY(!numext::isfinite(v.stableNorm())); VERIFY(numext::isnan(v.stableNorm())); VERIFY(!(numext::isfinite)(v.stableNorm())); VERIFY((numext::isnan)(v.stableNorm()));
VERIFY(!numext::isfinite(v.blueNorm())); VERIFY(numext::isnan(v.blueNorm())); VERIFY(!(numext::isfinite)(v.blueNorm())); VERIFY((numext::isnan)(v.blueNorm()));
VERIFY(!numext::isfinite(v.hypotNorm())); VERIFY(numext::isnan(v.hypotNorm())); VERIFY(!(numext::isfinite)(v.hypotNorm())); VERIFY((numext::isnan)(v.hypotNorm()));
} }
} }

8
unsupported/test/cxx11_tensor_thread_pool.cpp
View File

@ -126,7 +126,7 @@ static void test_contraction_corner_cases()
m_result = m_left.transpose() * m_right; m_result = m_left.transpose() * m_right;
for (ptrdiff_t i = 0; i < t_result.size(); i++) { for (ptrdiff_t i = 0; i < t_result.size(); i++) {
assert(!std::isnan(t_result.data()[i])); assert(!(numext::isnan)(t_result.data()[i]));
if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) { if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) {
std::cout << "mismatch detected at index " << i << " : " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl; std::cout << "mismatch detected at index " << i << " : " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
assert(false); assert(false);
@ -141,7 +141,7 @@ static void test_contraction_corner_cases()
new(&m_left) MapXf(t_left.data(), 32, 1); new(&m_left) MapXf(t_left.data(), 32, 1);
m_result = m_left.transpose() * m_right; m_result = m_left.transpose() * m_right;
for (ptrdiff_t i = 0; i < t_result.size(); i++) { for (ptrdiff_t i = 0; i < t_result.size(); i++) {
assert(!std::isnan(t_result.data()[i])); assert(!(numext::isnan)(t_result.data()[i]));
if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) { if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) {
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl; std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
assert(false); assert(false);
@ -159,7 +159,7 @@ static void test_contraction_corner_cases()
new(&m_right) MapXf(t_right.data(), 32, 4); new(&m_right) MapXf(t_right.data(), 32, 4);
m_result = m_left.transpose() * m_right; m_result = m_left.transpose() * m_right;
for (ptrdiff_t i = 0; i < t_result.size(); i++) { for (ptrdiff_t i = 0; i < t_result.size(); i++) {
assert(!std::isnan(t_result.data()[i])); assert(!(numext::isnan)(t_result.data()[i]));
if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) { if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) {
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl; std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
assert(false); assert(false);
@ -177,7 +177,7 @@ static void test_contraction_corner_cases()
new(&m_right) MapXf(t_right.data(), 32, 4); new(&m_right) MapXf(t_right.data(), 32, 4);
m_result = m_left.transpose() * m_right; m_result = m_left.transpose() * m_right;
for (ptrdiff_t i = 0; i < t_result.size(); i++) { for (ptrdiff_t i = 0; i < t_result.size(); i++) {
assert(!std::isnan(t_result.data()[i])); assert(!(numext::isnan)(t_result.data()[i]));
if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) { if (fabs(t_result.data()[i] - m_result.data()[i]) >= 1e-4) {
std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl; std::cout << "mismatch detected: " << t_result.data()[i] << " vs " << m_result.data()[i] << std::endl;
assert(false); assert(false);

16
unsupported/test/mpreal/mpreal.h
View File

@ -72,13 +72,13 @@
// Detect compiler using signatures from http://predef.sourceforge.net/ // Detect compiler using signatures from http://predef.sourceforge.net/
#if defined(__GNUC__) && defined(__INTEL_COMPILER) #if defined(__GNUC__) && defined(__INTEL_COMPILER)
#define IsInf(x) isinf(x) // Intel ICC compiler on Linux #define IsInf(x) (isinf)(x) // Intel ICC compiler on Linux
#elif defined(_MSC_VER) // Microsoft Visual C++ #elif defined(_MSC_VER) // Microsoft Visual C++
#define IsInf(x) (!_finite(x)) #define IsInf(x) (!_finite(x))
#else #else
#define IsInf(x) std::isinf(x) // GNU C/C++ (and/or other compilers), just hope for C99 conformance #define IsInf(x) (std::isinf)(x) // GNU C/C++ (and/or other compilers), just hope for C99 conformance
#endif #endif
// A Clang feature extension to determine compiler features. // A Clang feature extension to determine compiler features.
@ -530,9 +530,9 @@ public:
#endif #endif
// Instance Checkers // Instance Checkers
friend bool isnan (const mpreal& v); friend bool (isnan) (const mpreal& v);
friend bool isinf (const mpreal& v); friend bool (isinf) (const mpreal& v);
friend bool isfinite (const mpreal& v); friend bool (isfinite) (const mpreal& v);
friend bool isnum (const mpreal& v); friend bool isnum (const mpreal& v);
friend bool iszero (const mpreal& v); friend bool iszero (const mpreal& v);
@ -1687,9 +1687,9 @@ inline bool operator == (const mpreal& a, const long double b ){ return
inline bool operator == (const mpreal& a, const double b ){ return (mpfr_cmp_d (a.mpfr_srcptr(),b) == 0 ); } inline bool operator == (const mpreal& a, const double b ){ return (mpfr_cmp_d (a.mpfr_srcptr(),b) == 0 ); }
inline bool isnan (const mpreal& op){ return (mpfr_nan_p (op.mpfr_srcptr()) != 0 ); } inline bool (isnan) (const mpreal& op){ return (mpfr_nan_p (op.mpfr_srcptr()) != 0 ); }
inline bool isinf (const mpreal& op){ return (mpfr_inf_p (op.mpfr_srcptr()) != 0 ); } inline bool (isinf) (const mpreal& op){ return (mpfr_inf_p (op.mpfr_srcptr()) != 0 ); }
inline bool isfinite (const mpreal& op){ return (mpfr_number_p (op.mpfr_srcptr()) != 0 ); } inline bool (isfinite) (const mpreal& op){ return (mpfr_number_p (op.mpfr_srcptr()) != 0 ); }
inline bool iszero (const mpreal& op){ return (mpfr_zero_p (op.mpfr_srcptr()) != 0 ); } inline bool iszero (const mpreal& op){ return (mpfr_zero_p (op.mpfr_srcptr()) != 0 ); }
inline bool isint (const mpreal& op){ return (mpfr_integer_p(op.mpfr_srcptr()) != 0 ); } inline bool isint (const mpreal& op){ return (mpfr_integer_p(op.mpfr_srcptr()) != 0 ); }