Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove several ARMA_CRIPPLED_LAPACK guards #63

Merged
merged 1 commit into from
Mar 28, 2018
Merged

Remove several ARMA_CRIPPLED_LAPACK guards #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 8 additions & 72 deletions include/armadillo_bits/auxlib_meat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> eT;
Expand Down Expand Up @@ -2734,13 +2724,7 @@ auxlib::svd_dc(Col<T>& S, const Base<std::complex<T>, 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<T> eT;

Expand Down Expand Up @@ -2895,13 +2879,7 @@ auxlib::svd_dc(Mat< std::complex<T> >& U, Col<T>& S, Mat< std::complex<T> >& 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<T> eT;

Expand Down Expand Up @@ -3038,13 +3016,7 @@ auxlib::svd_dc_econ(Mat< std::complex<T> >& U, Col<T>& S, Mat< std::complex<T> >
{
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<T> eT;

Expand Down Expand Up @@ -3313,16 +3285,7 @@ auxlib::solve_square_refine(Mat< std::complex<typename T1::pod_type> >& 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<T> eT;
Expand Down Expand Up @@ -3605,15 +3568,7 @@ auxlib::solve_approx_svd(Mat< std::complex<typename T1::pod_type> >& 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<T> eT;
Expand Down Expand Up @@ -4167,15 +4122,7 @@ auxlib::schur(Mat<std::complex<T> >& U, Mat<std::complex<T> >& 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<T> eT;

Expand Down Expand Up @@ -4392,18 +4339,7 @@ auxlib::qz(Mat< std::complex<T> >& A, Mat< std::complex<T> >& 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<T> eT;

Expand Down