diff options
| author | Yi Kong <yikong@google.com> | 2022-02-25 17:02:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-25 17:02:53 +0000 |
| commit | edb0ad5bb04b48aab7dd0978f0475edd3550de7c (patch) | |
| tree | fb979fb4cf4f8052c8cc66b1ec9516d91fcd859b /bench/spbench/spbenchsolver.h | |
| parent | 8fd413e275f78a4c240f1442ce5cf77c73a20a55 (diff) | |
| parent | bc0f5df265caa21a2120c22453655a7fcc941991 (diff) | |
| download | eigen-edb0ad5bb04b48aab7dd0978f0475edd3550de7c.tar.gz | |
Merge changes Iee153445,Iee274471 am: 79df15ea88 am: 10f298fc41 am: 7cb5001398 am: bc0f5df265aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/eigen/+/1999079
Change-Id: Ife39d10c8b23d3eeb174cd52f462f9d20527ad03
Diffstat (limited to 'bench/spbench/spbenchsolver.h')
| -rw-r--r-- | bench/spbench/spbenchsolver.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/bench/spbench/spbenchsolver.h b/bench/spbench/spbenchsolver.h index 19c719c04..8f59d1071 100644 --- a/bench/spbench/spbenchsolver.h +++ b/bench/spbench/spbenchsolver.h @@ -37,6 +37,10 @@ #include <Eigen/UmfPackSupport> #endif +#ifdef EIGEN_KLU_SUPPORT +#include <Eigen/KLUSupport> +#endif + #ifdef EIGEN_PARDISO_SUPPORT #include <Eigen/PardisoSupport> #endif @@ -51,6 +55,7 @@ // CONSTANTS #define EIGEN_UMFPACK 10 +#define EIGEN_KLU 11 #define EIGEN_SUPERLU 20 #define EIGEN_PASTIX 30 #define EIGEN_PARDISO 40 @@ -109,6 +114,12 @@ void printStatheader(std::ofstream& out) out << " <PACKAGE> UMFPACK </PACKAGE> \n"; out << " </SOLVER> \n"; #endif +#ifdef EIGEN_KLU_SUPPORT + out <<" <SOLVER ID='" << EIGEN_KLU << "'>\n"; + out << " <TYPE> LU </TYPE> \n"; + out << " <PACKAGE> KLU </PACKAGE> \n"; + out << " </SOLVER> \n"; +#endif #ifdef EIGEN_SUPERLU_SUPPORT out <<" <SOLVER ID='" << EIGEN_SUPERLU << "'>\n"; out << " <TYPE> LU </TYPE> \n"; @@ -316,6 +327,14 @@ void SelectSolvers(const SparseMatrix<Scalar>&A, unsigned int sym, Matrix<Scalar call_directsolver(solver, EIGEN_UMFPACK, A, b, refX,statFile); } #endif + //KLU + #ifdef EIGEN_KLU_SUPPORT + { + cout << "Solving with KLU LU ... \n"; + KLU<SpMat> solver; + call_directsolver(solver, EIGEN_KLU, A, b, refX,statFile); + } + #endif //SuperLU #ifdef EIGEN_SUPERLU_SUPPORT { |