diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-02-26 12:51:20 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-02-26 12:51:20 +0100 |
| commit | c05047d28e7d84d2a5312c3c958063d4415b6dcc (patch) | |
| tree | 14de1065948bf4567cbece02966a6bde3216b08c /bench/btl | |
| parent | 3ac2b96a2f131e8162d39f0976cfb31b1a853237 (diff) | |
fix some BTL issues
Diffstat (limited to 'bench/btl')
| -rw-r--r-- | bench/btl/actions/action_lu_decomp.hh | 2 | ||||
| -rw-r--r-- | bench/btl/data/action_settings.txt | 2 | ||||
| -rwxr-xr-x | bench/btl/data/go_mean | 2 | ||||
| -rw-r--r-- | bench/btl/libs/eigen2/eigen2_interface.hh | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bench/btl/actions/action_lu_decomp.hh b/bench/btl/actions/action_lu_decomp.hh index 147884e76..93de7866b 100644 --- a/bench/btl/actions/action_lu_decomp.hh +++ b/bench/btl/actions/action_lu_decomp.hh @@ -76,7 +76,7 @@ public : static inline std::string name( void ) { - return "lu_decomp_"+Interface::name(); + return "complete_lu_decomp_"+Interface::name(); } double nb_op_base( void ){ diff --git a/bench/btl/data/action_settings.txt b/bench/btl/data/action_settings.txt index 9bee1651c..b7382ec43 100644 --- a/bench/btl/data/action_settings.txt +++ b/bench/btl/data/action_settings.txt @@ -8,7 +8,7 @@ matrix_vector ; "{/*1.5 matrix vector product}" ; "matrix size" ; 4:3000 trisolve ; "{/*1.5 triangular solver (X = inv(L) X)}" ; "size" ; 4:3000 matrix_trisolve ; "{/*1.5 matrix triangular solver (M = inv(L) M)}" ; "size" ; 4:3000 cholesky ; "{/*1.5 Cholesky decomposition}" ; "matrix size" ; 4:3000 -lu_decomp ; "{/*1.5 Complete LU decomposition}" ; "matrix size" ; 4:3000 +complete_lu_decomp ; "{/*1.5 Complete LU decomposition}" ; "matrix size" ; 4:3000 partial_lu_decomp ; "{/*1.5 Partial LU decomposition}" ; "matrix size" ; 4:3000 tridiagonalization ; "{/*1.5 Tridiagonalization}" ; "matrix size" ; 4:3000 hessenberg ; "{/*1.5 Hessenberg decomposition}" ; "matrix size" ; 4:3000 diff --git a/bench/btl/data/go_mean b/bench/btl/data/go_mean index 4e4fd295a..fdc8d8c75 100755 --- a/bench/btl/data/go_mean +++ b/bench/btl/data/go_mean @@ -41,7 +41,7 @@ source mk_mean_script.sh ata $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh trisolve $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh matrix_trisolve $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh cholesky $1 11 100 300 1000 $mode $prefix -source mk_mean_script.sh lu_decomp $1 11 100 300 1000 $mode $prefix +source mk_mean_script.sh complete_lu_decomp $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh partial_lu_decomp $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh tridiagonalization $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh hessenberg $1 11 100 300 1000 $mode $prefix diff --git a/bench/btl/libs/eigen2/eigen2_interface.hh b/bench/btl/libs/eigen2/eigen2_interface.hh index a8b5b884f..d8d1a607f 100644 --- a/bench/btl/libs/eigen2/eigen2_interface.hh +++ b/bench/btl/libs/eigen2/eigen2_interface.hh @@ -166,7 +166,7 @@ public : } static EIGEN_DONT_INLINE void rot(gene_vector & A, gene_vector & B, real c, real s, int N){ - ei_apply_rotation_in_the_plane(A, B, c, s); + ei_apply_rotation_in_the_plane(A, B, PlanarRotation<real>(c,s)); } static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){ @@ -207,15 +207,15 @@ public : } static inline void lu_decomp(const gene_matrix & X, gene_matrix & C, int N){ + C = X.fullPivLu().matrixLU(); + } + + static inline void partial_lu_decomp(const gene_matrix & X, gene_matrix & C, int N){ RowVectorXi piv(N); int nb; C = X; ei_partial_lu_inplace(C,piv,nb); - //C = X.lu().matrixLU(); - } - - static inline void partial_lu_decomp(const gene_matrix & X, gene_matrix & C, int N){ - C = X.partialPivLu().matrixLU(); +// C = X.partialPivLu().matrixLU(); } static inline void tridiagonalization(const gene_matrix & X, gene_matrix & C, int N){ |