diff options
author | Gael Guennebaud <g.gael@free.fr> | 2009-08-03 16:05:15 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2009-08-03 16:05:15 +0200 |
commit | 3cf5bb31f6b6e3b6b8f229ed1658cb867fe6e8f5 (patch) | |
tree | 1b6f62f691f4879fe742c56a7234ca284a86e370 /bench/btl/libs/eigen2 | |
parent | ce1dc1ab165929edd7608d83e448d81e4f968038 (diff) |
* Bye bye MultiplierBase, extend a bit AnyMatrixBase to allow =, +=, and -=
* This probably makes ReturnByValue needless
Diffstat (limited to 'bench/btl/libs/eigen2')
-rw-r--r-- | bench/btl/libs/eigen2/eigen2_interface.hh | 8 | ||||
-rw-r--r-- | bench/btl/libs/eigen2/main_adv.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bench/btl/libs/eigen2/eigen2_interface.hh b/bench/btl/libs/eigen2/eigen2_interface.hh index ffc800a8d..7a014723f 100644 --- a/bench/btl/libs/eigen2/eigen2_interface.hh +++ b/bench/btl/libs/eigen2/eigen2_interface.hh @@ -190,10 +190,10 @@ public : } static inline void trisolve_lower_matrix(const gene_matrix & L, const gene_matrix& B, gene_matrix& X, int N){ -// X = L.template triangularView<LowerTriangular>().solve(B); - X = B; - ei_triangular_solve_matrix<real,ColMajor,ColMajor,LowerTriangular> - ::run(L.cols(), X.cols(), L.data(), L.stride(), X.data(), X.stride()); + X = L.template triangularView<LowerTriangular>().solve(B); +// +// ei_triangular_solve_matrix<real,ColMajor,ColMajor,LowerTriangular> +// ::run(L.cols(), X.cols(), L.data(), L.stride(), X.data(), X.stride()); } static inline void cholesky(const gene_matrix & X, gene_matrix & C, int N){ diff --git a/bench/btl/libs/eigen2/main_adv.cpp b/bench/btl/libs/eigen2/main_adv.cpp index c3e5fac30..d98c0cd39 100644 --- a/bench/btl/libs/eigen2/main_adv.cpp +++ b/bench/btl/libs/eigen2/main_adv.cpp @@ -23,7 +23,7 @@ #include "action_cholesky.hh" #include "action_hessenberg.hh" #include "action_lu_decomp.hh" -// #include "action_partial_lu_decomp.hh" +#include "action_partial_lu.hh" BTL_MAIN; @@ -33,7 +33,7 @@ int main() bench<Action_trisolve_matrix<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_cholesky<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_lu_decomp<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); -// bench<Action_partial_lu_decomp<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); + bench<Action_partial_lu<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_hessenberg<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_tridiagonalization<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); |