From fe973ab0c57ffc14541d7fd5890d65d4311d5190 Mon Sep 17 00:00:00 2001 From: Nicholas Vinson Date: Tue, 16 Dec 2025 14:55:59 -0500 Subject: [PATCH] Force early evaluation of boost expressions. libeigen/eigen!2094 --- Eigen/src/Eigenvalues/ComplexSchur.h | 3 ++- unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Eigen/src/Eigenvalues/ComplexSchur.h b/Eigen/src/Eigenvalues/ComplexSchur.h index 22433f2bd..086977c42 100644 --- a/Eigen/src/Eigenvalues/ComplexSchur.h +++ b/Eigen/src/Eigenvalues/ComplexSchur.h @@ -277,7 +277,8 @@ typename ComplexSchur::ComplexScalar ComplexSchur::compu using std::abs; if ((iter == 10 || iter == 20) && iu > 1) { // exceptional shift, taken from http://www.netlib.org/eispack/comqr.f - return abs(numext::real(m_matT.coeff(iu, iu - 1))) + abs(numext::real(m_matT.coeff(iu - 1, iu - 2))); + return ComplexSchur::ComplexScalar( + abs(numext::real(m_matT.coeff(iu, iu - 1))) + abs(numext::real(m_matT.coeff(iu - 1, iu - 2)))); } // compute the shift as one of the eigenvalues of t, the 2x2 diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h index 0c18ad66a..001470032 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h @@ -86,7 +86,7 @@ MatrixType MatrixFunctionAtomic::compute(const MatrixType& A) { for (Index i = 0; i < rows; i++) mx = (std::max)(mx, std::abs(m_f(Ashifted(i, i) + avgEival, static_cast(s + r)))); if (r != 0) rfactorial *= RealScalar(r); - delta = (std::max)(delta, mx / rfactorial); + delta = (std::max)(delta, RealScalar(mx / rfactorial)); } const RealScalar P_norm = P.cwiseAbs().rowwise().sum().maxCoeff(); if (mu * delta * P_norm < NumTraits::epsilon() * F_norm) // series converged