From 4b7a0157e7037d3d81593c7e8e2cfb32e48a23f4 Mon Sep 17 00:00:00 2001 From: conrad Date: Wed, 21 Apr 2021 12:56:47 +1000 Subject: [PATCH] fix --- .../newarp_SparseGenRealShiftSolve_meat.hpp | 8 ++++---- include/armadillo_bits/sp_auxlib_meat.hpp | 12 ++++++------ src/wrapper1.cpp | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp b/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp index b07e7914..141faaa7 100644 --- a/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp +++ b/include/armadillo_bits/newarp_SparseGenRealShiftSolve_meat.hpp @@ -49,10 +49,10 @@ SparseGenRealShiftSolve::SparseGenRealShiftSolve(const SpMat& mat_obj, c if(status_x == false) { arma_stop_runtime_error("newarp::SparseGenRealShiftSolve::SparseGenRealShiftSolve(): could not construct SuperLU matrix"); return; } - int panel_size = superlu::sp_ispec_environ(1); - int relax = superlu::sp_ispec_environ(2); - int slu_info = 0; // Return code - int lwork = 0; // lwork = 0: allocate space internally by system malloc + int panel_size = superlu::sp_ispec_environ(1); + int relax = superlu::sp_ispec_environ(2); + int slu_info = 0; // Return code + int lwork = 0; // lwork = 0: allocate space internally by system malloc superlu_stat_wrangler stat; diff --git a/include/armadillo_bits/sp_auxlib_meat.hpp b/include/armadillo_bits/sp_auxlib_meat.hpp index 85902a8a..3882aec5 100644 --- a/include/armadillo_bits/sp_auxlib_meat.hpp +++ b/include/armadillo_bits/sp_auxlib_meat.hpp @@ -1444,9 +1444,9 @@ sp_auxlib::spsolve_refine(Mat& X, typename T1::pod_type& // // 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. +// 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()); @@ -2215,9 +2215,9 @@ sp_auxlib::run_aupd_shiftinvert 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. + 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, x.get_ptr(), perm_c.get_ptr()); diff --git a/src/wrapper1.cpp b/src/wrapper1.cpp index 4de92c70..923ef030 100644 --- a/src/wrapper1.cpp +++ b/src/wrapper1.cpp @@ -1590,17 +1590,17 @@ extern "C" void wrapper_sgstrf(superlu::superlu_options_t* a, superlu::SuperMatrix* b, int d, int e, int* f, void* g, int h, int* i, int* j, superlu::SuperMatrix* k, superlu::SuperMatrix* l, superlu::GlobalLU_t* m, superlu::SuperLUStat_t* n, int* o) { - sgstrf(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o); + sgstrf(a, b, d, e, f, g, h, i, j, k, l, m, n, o); } void wrapper_dgstrf(superlu::superlu_options_t* a, superlu::SuperMatrix* b, int d, int e, int* f, void* g, int h, int* i, int* j, superlu::SuperMatrix* k, superlu::SuperMatrix* l, superlu::GlobalLU_t* m, superlu::SuperLUStat_t* n, int* o) { - dgstrf(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o); + dgstrf(a, b, d, e, f, g, h, i, j, k, l, m, n, o); } void wrapper_cgstrf(superlu::superlu_options_t* a, superlu::SuperMatrix* b, int d, int e, int* f, void* g, int h, int* i, int* j, superlu::SuperMatrix* k, superlu::SuperMatrix* l, superlu::GlobalLU_t* m, superlu::SuperLUStat_t* n, int* o) { - cgstrf(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o); + cgstrf(a, b, d, e, f, g, h, i, j, k, l, m, n, o); } void wrapper_zgstrf(superlu::superlu_options_t* a, superlu::SuperMatrix* b, int d, int e, int* f, void* g, int h, int* i, int* j, superlu::SuperMatrix* k, superlu::SuperMatrix* l, superlu::GlobalLU_t* m, superlu::SuperLUStat_t* n, int* o)