GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some BTL issues

Browse Source
This commit is contained in:
Gael Guennebaud 2010-02-26 12:51:20 +01:00
parent 3ac2b96a2f
commit c05047d28e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/btl/actions/action_lu_decomp.hh
View File

@ -76,7 +76,7 @@ public :
static inline std::string name( void ) static inline std::string name( void )
{ {
return "lu_decomp_"+Interface::name(); return "complete_lu_decomp_"+Interface::name();
} }
double nb_op_base( void ){ double nb_op_base( void ){

2
bench/btl/data/action_settings.txt
View File

@ -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 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 matrix_trisolve ; "{/*1.5 matrix triangular solver (M = inv(L) M)}" ; "size" ; 4:3000
cholesky ; "{/*1.5 Cholesky decomposition}" ; "matrix 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 partial_lu_decomp ; "{/*1.5 Partial LU decomposition}" ; "matrix size" ; 4:3000
tridiagonalization ; "{/*1.5 Tridiagonalization}" ; "matrix size" ; 4:3000 tridiagonalization ; "{/*1.5 Tridiagonalization}" ; "matrix size" ; 4:3000
hessenberg ; "{/*1.5 Hessenberg decomposition}" ; "matrix size" ; 4:3000 hessenberg ; "{/*1.5 Hessenberg decomposition}" ; "matrix size" ; 4:3000

2
bench/btl/data/go_mean
View File

@ -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 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 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 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 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 tridiagonalization $1 11 100 300 1000 $mode $prefix
source mk_mean_script.sh hessenberg $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh hessenberg $1 11 100 300 1000 $mode $prefix

12
bench/btl/libs/eigen2/eigen2_interface.hh
View File

@ -166,7 +166,7 @@ public :
} }
static EIGEN_DONT_INLINE void rot(gene_vector & A, gene_vector & B, real c, real s, int N){ 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){ 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){ 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); RowVectorXi piv(N);
int nb; int nb;
C = X; C = X;
ei_partial_lu_inplace(C,piv,nb); ei_partial_lu_inplace(C,piv,nb);
//C = X.lu().matrixLU(); // C = X.partialPivLu().matrixLU();
}
static inline void partial_lu_decomp(const gene_matrix & X, gene_matrix & C, int N){
C = X.partialPivLu().matrixLU();
} }
static inline void tridiagonalization(const gene_matrix & X, gene_matrix & C, int N){ static inline void tridiagonalization(const gene_matrix & X, gene_matrix & C, int N){