From 767bf0080279965036ef82cf66e532d623abdb75 Mon Sep 17 00:00:00 2001 From: conrad Date: Sun, 2 Apr 2023 23:47:23 +1000 Subject: [PATCH] remove no longer needed code --- include/armadillo_bits/sp_auxlib_bones.hpp | 6 -- include/armadillo_bits/sp_auxlib_meat.hpp | 73 ---------------------- 2 files changed, 79 deletions(-) diff --git a/include/armadillo_bits/sp_auxlib_bones.hpp b/include/armadillo_bits/sp_auxlib_bones.hpp index 62092dc1..5a8e9ea8 100644 --- a/include/armadillo_bits/sp_auxlib_bones.hpp +++ b/include/armadillo_bits/sp_auxlib_bones.hpp @@ -86,12 +86,6 @@ class sp_auxlib template inline static bool spsolve_refine(Mat& out, typename T1::pod_type& out_rcond, const SpBase& A, const Base& B, const superlu_opts& user_opts); - // // - // // rcond() via SuperLU - // - // template - // sinline static typename T1::pod_type rcond(const SpBase& A); - // // support functions diff --git a/include/armadillo_bits/sp_auxlib_meat.hpp b/include/armadillo_bits/sp_auxlib_meat.hpp index ecff1fc5..40c5984b 100644 --- a/include/armadillo_bits/sp_auxlib_meat.hpp +++ b/include/armadillo_bits/sp_auxlib_meat.hpp @@ -1434,79 +1434,6 @@ sp_auxlib::spsolve_refine(Mat& X, typename T1::pod_type& -// template -// inline -// typename T1::pod_type -// sp_auxlib::rcond(const SpBase& A_expr) -// { -// arma_extra_debug_sigprint(); -// -// #if defined(ARMA_USE_SUPERLU) -// { -// typedef typename T1::pod_type T; -// typedef typename T1::elem_type eT; -// -// const unwrap_spmat tmp1(A_expr.get_ref()); -// const SpMat& A = tmp1.M; -// -// arma_debug_check( (A.is_square() == false), "rcond(): matrix must be square sized" ); -// -// superlu_opts superlu_opts_default; -// superlu::superlu_options_t options; -// sp_auxlib::set_superlu_opts(options, superlu_opts_default); -// int lwork = 0; -// -// superlu::GlobalLU_t Glu; -// arrayops::fill_zeros(reinterpret_cast(&Glu), sizeof(superlu::GlobalLU_t)); -// -// superlu_supermatrix_wrangler a; -// superlu_supermatrix_wrangler aC; -// -// const bool status_a = sp_auxlib::copy_to_supermatrix(a.get_ref(), A); -// -// if(status_a == false) { arma_stop_runtime_error("rcond(): could not construct SuperLU matrix"); return T(0); } -// -// superlu_supermatrix_wrangler l; -// superlu_supermatrix_wrangler u; -// -// superlu_array_wrangler perm_c(A.n_cols+1); // paranoia: increase array length by 1 -// superlu_array_wrangler perm_r(A.n_rows+1); -// superlu_array_wrangler etree(A.n_cols+1); -// -// superlu_stat_wrangler stat; -// -// int panel_size = superlu::sp_ispec_environ(1); -// int relax = superlu::sp_ispec_environ(2); -// int slu_info = 0; // Return code. -// -// arma_extra_debug_print("superlu::gstrf()"); -// superlu::get_permutation_c(options.ColPerm, a.get_ptr(), perm_c.get_ptr()); -// superlu::sp_preorder_mat(&options, a.get_ptr(), perm_c.get_ptr(), etree.get_ptr(), aC.get_ptr()); -// superlu::gstrf(&options, aC.get_ptr(), relax, panel_size, etree.get_ptr(), NULL, lwork, perm_c.get_ptr(), perm_r.get_ptr(), l.get_ptr(), u.get_ptr(), &Glu, stat.get_ptr(), &slu_info); -// -// if(slu_info != 0) { return T(0); } -// -// T a_norm_val = sp_auxlib::norm1(a.get_ptr()); -// T a_rcond = sp_auxlib::lu_rcond(l.get_ptr(), u.get_ptr(), a_norm_val); -// -// if(arma_isnan(a_rcond)) { return T(0); } -// -// return a_rcond; -// } -// #else -// { -// typename T1::pod_type T; -// -// arma_ignore(A_expr); -// arma_stop_logic_error("rcond(): use of SuperLU must be enabled"); -// -// return T(0); -// } -// #endif -// } - - - #if defined(ARMA_USE_SUPERLU) template