From 1ac3e5de5c41fd52aabf5fa5e1a36c40fc08cf3a Mon Sep 17 00:00:00 2001 From: Keith O'Hara Date: Mon, 26 Mar 2018 17:04:28 -0400 Subject: [PATCH] Remove several ARMA_CRIPPLED_LAPACK guards --- include/armadillo_bits/auxlib_meat.hpp | 80 +++----------------------- 1 file changed, 8 insertions(+), 72 deletions(-) diff --git a/include/armadillo_bits/auxlib_meat.hpp b/include/armadillo_bits/auxlib_meat.hpp index d3887f88..edd6976a 100644 --- a/include/armadillo_bits/auxlib_meat.hpp +++ b/include/armadillo_bits/auxlib_meat.hpp @@ -1335,17 +1335,7 @@ auxlib::eig_pair { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_ignore(vals); - arma_ignore(vecs); - arma_ignore(vecs_on); - arma_ignore(A_expr); - arma_ignore(B_expr); - arma_stop_logic_error("eig_pair() for complex matrices not available due to crippled LAPACK"); - return false; - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef typename T1::pod_type T; typedef typename std::complex eT; @@ -2734,13 +2724,7 @@ auxlib::svd_dc(Col& S, const Base, T1>& X, uword& X_n_rows, u { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_extra_debug_print("auxlib::svd_dc(): redirecting to auxlib::svd() due to crippled LAPACK"); - - return auxlib::svd(S, X, X_n_rows, X_n_cols); - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef std::complex eT; @@ -2895,13 +2879,7 @@ auxlib::svd_dc(Mat< std::complex >& U, Col& S, Mat< std::complex >& V, { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_extra_debug_print("auxlib::svd_dc(): redirecting to auxlib::svd() due to crippled LAPACK"); - - return auxlib::svd(U, S, V, X); - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef std::complex eT; @@ -3038,13 +3016,7 @@ auxlib::svd_dc_econ(Mat< std::complex >& U, Col& S, Mat< std::complex > { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_extra_debug_print("auxlib::svd_dc_econ(): redirecting to auxlib::svd_econ() due to crippled LAPACK"); - - return auxlib::svd_econ(U, S, V, X, 'b'); - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef std::complex eT; @@ -3313,16 +3285,7 @@ auxlib::solve_square_refine(Mat< std::complex >& out, typ { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_ignore(out_rcond); - arma_ignore(equilibrate); - - arma_debug_warn("solve(): refinement and/or equilibration not done due to crippled LAPACK"); - - return auxlib::solve_square_fast(out, A, B_expr); - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef typename T1::pod_type T; typedef typename std::complex eT; @@ -3605,15 +3568,7 @@ auxlib::solve_approx_svd(Mat< std::complex >& out, Mat< s { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_ignore(out); - arma_ignore(A); - arma_ignore(B_expr); - arma_debug_warn("solve() for rank-deficient matrices not available due to crippled LAPACK"); - return false; - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef typename T1::pod_type T; typedef typename std::complex eT; @@ -4167,15 +4122,7 @@ auxlib::schur(Mat >& U, Mat >& S, const bool cal { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_ignore(U); - arma_ignore(S); - arma_ignore(calc_U); - arma_stop_logic_error("schur() for complex matrices not available due to crippled LAPACK"); - return false; - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef std::complex eT; @@ -4392,18 +4339,7 @@ auxlib::qz(Mat< std::complex >& A, Mat< std::complex >& B, Mat< std::compl { arma_extra_debug_sigprint(); - #if defined(ARMA_CRIPPLED_LAPACK) - { - arma_ignore(A); - arma_ignore(B); - arma_ignore(vsl); - arma_ignore(vsr); - arma_ignore(X_expr); - arma_ignore(Y_expr); - arma_stop_logic_error("qz() for complex matrices not available due to crippled LAPACK"); - return false; - } - #elif defined(ARMA_USE_LAPACK) + #if defined(ARMA_USE_LAPACK) { typedef typename std::complex eT;