GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 03:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

update aat action to do a syrk operation, and remove (comment) ata action

Browse Source
This commit is contained in:
Gael Guennebaud 2011-03-23 10:02:00 +01:00
parent da3f3586e0
commit 9cca79f5ca
11 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ public :
} }
double nb_op_base( void ){ double nb_op_base( void ){
return 2.0*_size*_size*_size; return double(_size)*double(_size)*double(_size);
} }
inline void initialize( void ){ inline void initialize( void ){

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

@ -6,7 +6,7 @@
#include "action_atv_product.hh" #include "action_atv_product.hh"
#include "action_matrix_matrix_product.hh" #include "action_matrix_matrix_product.hh"
#include "action_ata_product.hh" // #include "action_ata_product.hh"
#include "action_aat_product.hh" #include "action_aat_product.hh"
#include "action_trisolve.hh" #include "action_trisolve.hh"

6
bench/btl/data/go_mean
View File

@ -27,7 +27,7 @@ echo '<ul>'\
'<li>' `cat /proc/cpuinfo | grep "model name" | head -n 1`\ '<li>' `cat /proc/cpuinfo | grep "model name" | head -n 1`\
' (' `uname -m` ')</li>'\ ' (' `uname -m` ')</li>'\
'<li> compiler: ' `cat compiler_version.txt` '</li>'\ '<li> compiler: ' `cat compiler_version.txt` '</li>'\
'<li> eigen2: ' `svn info $EIGENDIR | grep Revision` '</li>'\ '<li> eigen3: ' `hg identify -i $EIGENDIR` '</li>'\
'</ul>' \ '</ul>' \
'</p>' >> $webpagefilename '</p>' >> $webpagefilename
@ -37,11 +37,10 @@ source mk_mean_script.sh matrix_vector $1 11 50 300 1000 $mode $prefix
source mk_mean_script.sh atv $1 11 50 300 1000 $mode $prefix source mk_mean_script.sh atv $1 11 50 300 1000 $mode $prefix
source mk_mean_script.sh matrix_matrix $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh matrix_matrix $1 11 100 300 1000 $mode $prefix
source mk_mean_script.sh aat $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh aat $1 11 100 300 1000 $mode $prefix
source mk_mean_script.sh ata $1 11 100 300 1000 $mode $prefix # source mk_mean_script.sh ata $1 11 100 300 1000 $mode $prefix
source mk_mean_script.sh trisolve_vector $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh trisolve_vector $1 11 100 300 1000 $mode $prefix
source mk_mean_script.sh trisolve_matrix $1 11 100 300 1000 $mode $prefix source mk_mean_script.sh trisolve_matrix $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 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
@ -49,6 +48,7 @@ source mk_mean_script.sh symv $1 11 50 300 1000 $mode $prefix
source mk_mean_script.sh syr2 $1 11 50 300 1000 $mode $prefix source mk_mean_script.sh syr2 $1 11 50 300 1000 $mode $prefix
source mk_mean_script.sh ger $1 11 50 300 1000 $mode $prefix source mk_mean_script.sh ger $1 11 50 300 1000 $mode $prefix
source mk_mean_script.sh rot $1 11 2500 100000 250000 $mode $prefix source mk_mean_script.sh rot $1 11 2500 100000 250000 $mode $prefix
source mk_mean_script.sh complete_lu_decomp $1 11 100 300 1000 $mode $prefix
fi fi

29
bench/btl/libs/C_BLAS/C_BLAS_interface.hh
View File

@ -108,12 +108,13 @@ public :
cblas_dgemm(CblasColMajor,CblasTrans,CblasTrans,N,N,N,1.0,A,N,B,N,0.0,X,N); cblas_dgemm(CblasColMajor,CblasTrans,CblasTrans,N,N,N,1.0,A,N,B,N,0.0,X,N);
} }
static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){ // static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){
cblas_dgemm(CblasColMajor,CblasTrans,CblasNoTrans,N,N,N,1.0,A,N,A,N,0.0,X,N); // cblas_dgemm(CblasColMajor,CblasTrans,CblasNoTrans,N,N,N,1.0,A,N,A,N,0.0,X,N);
} // }
static inline void aat_product(gene_matrix & A, gene_matrix & X, int N){ static inline void aat_product(gene_matrix & A, gene_matrix & X, int N){
cblas_dgemm(CblasColMajor,CblasNoTrans,CblasTrans,N,N,N,1.0,A,N,A,N,0.0,X,N); //cblas_dgemm(CblasColMajor,CblasNoTrans,CblasTrans,N,N,N,1.0,A,N,A,N,0.0,X,N);
cblas_dsyrk(CblasColMajor, CblasLower, CblasTrans, N, N, 1.0, A, N, 0.0, X, N);
} }
static inline void axpy(real coef, const gene_vector & X, gene_vector & Y, int N){ static inline void axpy(real coef, const gene_vector & X, gene_vector & Y, int N){
@ -212,19 +213,21 @@ public :
#endif #endif
} }
static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){ // static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){
#ifdef PUREBLAS // #ifdef PUREBLAS
sgemm_(&trans,&notrans,&N,&N,&N,&fone,A,&N,A,&N,&fzero,X,&N); // sgemm_(&trans,&notrans,&N,&N,&N,&fone,A,&N,A,&N,&fzero,X,&N);
#else // #else
cblas_sgemm(CblasColMajor,CblasTrans,CblasNoTrans,N,N,N,1.0,A,N,A,N,0.0,X,N); // cblas_sgemm(CblasColMajor,CblasTrans,CblasNoTrans,N,N,N,1.0,A,N,A,N,0.0,X,N);
#endif // #endif
} // }
static inline void aat_product(gene_matrix & A, gene_matrix & X, int N){ static inline void aat_product(gene_matrix & A, gene_matrix & X, int N){
#ifdef PUREBLAS #ifdef PUREBLAS
sgemm_(&notrans,&trans,&N,&N,&N,&fone,A,&N,A,&N,&fzero,X,&N); // sgemm_(&notrans,&trans,&N,&N,&N,&fone,A,&N,A,&N,&fzero,X,&N);
ssyrk_(&lower,&notrans,&N,&N,&fone,A,&N,&fzero,X,&N);
#else #else
cblas_sgemm(CblasColMajor,CblasNoTrans,CblasTrans,N,N,N,1.0,A,N,A,N,0.0,X,N); // cblas_sgemm(CblasColMajor,CblasNoTrans,CblasTrans,N,N,N,1.0,A,N,A,N,0.0,X,N);
cblas_ssyrk(CblasColMajor, CblasLower, CblasNoTrans, N, N, 1.0, A, N, 0.0, X, N);
#endif #endif
} }

2
bench/btl/libs/C_BLAS/main.cpp
View File

@ -48,7 +48,7 @@ int main()
bench<Action_rot<C_BLAS_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT); bench<Action_rot<C_BLAS_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
bench<Action_matrix_matrix_product<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_matrix_matrix_product<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_ata_product<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_ata_product<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_aat_product<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_aat_product<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_trisolve<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_trisolve<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);

33
bench/btl/libs/STL/STL_interface.hh
View File

@ -78,18 +78,18 @@ public :
cible[i][j]=source[i][j]; cible[i][j]=source[i][j];
} }
static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N) // static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N)
{ // {
real somme; // real somme;
for (int j=0;j<N;j++){ // for (int j=0;j<N;j++){
for (int i=0;i<N;i++){ // for (int i=0;i<N;i++){
somme=0.0; // somme=0.0;
for (int k=0;k<N;k++) // for (int k=0;k<N;k++)
somme += A[i][k]*A[j][k]; // somme += A[i][k]*A[j][k];
X[j][i]=somme; // X[j][i]=somme;
} // }
} // }
} // }
static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N) static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N)
{ {
@ -97,10 +97,13 @@ public :
for (int j=0;j<N;j++){ for (int j=0;j<N;j++){
for (int i=0;i<N;i++){ for (int i=0;i<N;i++){
somme=0.0; somme=0.0;
for (int k=0;k<N;k++){ if(i>=j)
somme+=A[k][i]*A[k][j]; {
for (int k=0;k<N;k++){
somme+=A[k][i]*A[k][j];
}
X[j][i]=somme;
} }
X[j][i]=somme;
} }
} }
} }

9
bench/btl/libs/eigen3/eigen3_interface.hh
View File

@ -92,12 +92,13 @@ public :
X.noalias() = A.transpose()*B.transpose(); X.noalias() = A.transpose()*B.transpose();
} }
static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){ // static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){
X.noalias() = A.transpose()*A; // X.noalias() = A.transpose()*A;
} // }
static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){ static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){
X.noalias() = A*A.transpose(); X.template triangularView<Lower>().setZero();
X.template selfadjointView<Lower>().rankUpdate(A);
} }
static inline void matrix_vector_product(const gene_matrix & A, const gene_vector & B, gene_vector & X, int N){ static inline void matrix_vector_product(const gene_matrix & A, const gene_vector & B, gene_vector & X, int N){

2
bench/btl/libs/eigen3/main_matmat.cpp
View File

@ -25,7 +25,7 @@ BTL_MAIN;
int main() int main()
{ {
bench<Action_matrix_matrix_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_matrix_matrix_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_ata_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_ata_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_aat_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_aat_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_trmm<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_trmm<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);

4
bench/btl/libs/gmm/main.cpp
View File

@ -34,8 +34,8 @@ int main()
bench<Action_atv_product<gmm_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT); bench<Action_atv_product<gmm_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
bench<Action_matrix_matrix_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_matrix_matrix_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_ata_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_ata_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_aat_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_aat_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_trisolve<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_trisolve<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
//bench<Action_lu_solve<blitz_LU_solve_interface<REAL_TYPE> > >(MIN_LU,MAX_LU,NB_POINT); //bench<Action_lu_solve<blitz_LU_solve_interface<REAL_TYPE> > >(MIN_LU,MAX_LU,NB_POINT);

6
bench/btl/libs/mtl4/mtl4_interface.hh
View File

@ -92,9 +92,9 @@ public :
X = (trans(A)*trans(B)); X = (trans(A)*trans(B));
} }
static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){ // static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){
X = (trans(A)*A); // X = (trans(A)*A);
} // }
static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){ static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){
X = (A*trans(A)); X = (A*trans(A));

4
bench/btl/libs/ublas/main.cpp
View File

@ -33,8 +33,8 @@ int main()
bench<Action_atv_product<ublas_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT); bench<Action_atv_product<ublas_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
bench<Action_matrix_matrix_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_matrix_matrix_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_ata_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_ata_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_aat_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); // bench<Action_aat_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
bench<Action_trisolve<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT); bench<Action_trisolve<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);