btl: add a trmm action and update eigen interface

6 files changed, 187 insertions, 7 deletions

diff --git a/bench/btl/actions/action_trmm.hh b/bench/btl/actions/action_trmm.hh
new file mode 100644
index 000000000..8f7813818
--- /dev/null
+++ b/bench/btl/actions/action_trmm.hh
@@ -0,0 +1,165 @@
+//=====================================================
+// File   :  action_matrix_matrix_product.hh
+// Author :  L. Plagne <laurent.plagne@edf.fr)>
+// Copyright (C) EDF R&D,  lun sep 30 14:23:19 CEST 2002
+//=====================================================
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+#ifndef ACTION_TRMM
+#define ACTION_TRMM
+#include "utilities.h"
+#include "STL_interface.hh"
+#include <string>
+#include "init/init_function.hh"
+#include "init/init_vector.hh"
+#include "init/init_matrix.hh"
+
+using namespace std;
+
+template<class Interface>
+class Action_trmm {
+
+public :
+
+  // Ctor
+
+  Action_trmm( int size ):_size(size)
+  {
+    MESSAGE("Action_trmm Ctor");
+
+    // STL matrix and vector initialization
+
+    init_matrix<pseudo_random>(A_stl,_size);
+    init_matrix<pseudo_random>(B_stl,_size);
+    init_matrix<null_function>(X_stl,_size);
+    init_matrix<null_function>(resu_stl,_size);
+
+    for (int j=0; j<_size; ++j)
+    {
+      for (int i=0; i<j; ++i)
+        A_stl[j][i] = 0;
+      A_stl[j][j] += 3;
+    }
+
+    // generic matrix and vector initialization
+
+    Interface::matrix_from_stl(A_ref,A_stl);
+    Interface::matrix_from_stl(B_ref,B_stl);
+    Interface::matrix_from_stl(X_ref,X_stl);
+
+    Interface::matrix_from_stl(A,A_stl);
+    Interface::matrix_from_stl(B,B_stl);
+    Interface::matrix_from_stl(X,X_stl);
+
+    _cost = 0;
+    for (int j=0; j<_size; ++j)
+    {
+      _cost += 2*j + 1;
+    }
+    _cost *= _size;
+  }
+
+  // invalidate copy ctor
+
+  Action_trmm( const  Action_trmm & )
+  {
+    INFOS("illegal call to Action_trmm Copy Ctor");
+    exit(0);
+  }
+
+  // Dtor
+
+  ~Action_trmm( void ){
+
+    MESSAGE("Action_trmm Dtor");
+
+    // deallocation
+
+    Interface::free_matrix(A,_size);
+    Interface::free_matrix(B,_size);
+    Interface::free_matrix(X,_size);
+
+    Interface::free_matrix(A_ref,_size);
+    Interface::free_matrix(B_ref,_size);
+    Interface::free_matrix(X_ref,_size);
+
+  }
+
+  // action name
+
+  static inline std::string name( void )
+  {
+    return "trmm_"+Interface::name();
+  }
+
+  double nb_op_base( void ){
+    return _cost;
+  }
+
+  inline void initialize( void ){
+
+    Interface::copy_matrix(A_ref,A,_size);
+    Interface::copy_matrix(B_ref,B,_size);
+    Interface::copy_matrix(X_ref,X,_size);
+
+  }
+
+  inline void calculate( void ) {
+      Interface::trmm(A,B,X,_size);
+  }
+
+  void check_result( void ){
+
+    // calculation check
+
+//     Interface::matrix_to_stl(X,resu_stl);
+//
+//     STL_interface<typename Interface::real_type>::matrix_matrix_product(A_stl,B_stl,X_stl,_size);
+//
+//     typename Interface::real_type error=
+//       STL_interface<typename Interface::real_type>::norm_diff(X_stl,resu_stl);
+//
+//     if (error>1.e-6){
+//       INFOS("WRONG CALCULATION...residual=" << error);
+// //       exit(1);
+//     }
+
+  }
+
+private :
+
+  typename Interface::stl_matrix A_stl;
+  typename Interface::stl_matrix B_stl;
+  typename Interface::stl_matrix X_stl;
+  typename Interface::stl_matrix resu_stl;
+
+  typename Interface::gene_matrix A_ref;
+  typename Interface::gene_matrix B_ref;
+  typename Interface::gene_matrix X_ref;
+
+  typename Interface::gene_matrix A;
+  typename Interface::gene_matrix B;
+  typename Interface::gene_matrix X;
+
+  int _size;
+  double _cost;
+
+};
+
+
+#endif
+
+
+
diff --git a/bench/btl/actions/basic_actions.hh b/bench/btl/actions/basic_actions.hh
index beaeea8c3..62442f01f 100644
--- a/bench/btl/actions/basic_actions.hh
+++ b/bench/btl/actions/basic_actions.hh
@@ -10,7 +10,7 @@
 #include "action_aat_product.hh"
 
 #include "action_trisolve.hh"
-
+#include "action_trmm.hh"
 #include "action_symv.hh"
 // #include "action_symm.hh"
 #include "action_syr2.hh"
diff --git a/bench/btl/libs/C_BLAS/C_BLAS_interface.hh b/bench/btl/libs/C_BLAS/C_BLAS_interface.hh
index f07df1033..aeb4e4380 100644
--- a/bench/btl/libs/C_BLAS/C_BLAS_interface.hh
+++ b/bench/btl/libs/C_BLAS/C_BLAS_interface.hh
@@ -134,6 +134,7 @@ static char trans = 'T';
 static char nonunit = 'N';
 static char lower = 'L';
 static char right = 'R';
+static char left = 'L';
 static int intone = 1;
 
 template<>
@@ -186,7 +187,7 @@ public :
     cblas_srot(N,A,1,B,1,c,s);
     #endif
   }
-  
+
   static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
     #ifdef PUREBLAS
     sgemv_(&trans,&N,&N,&fone,A,&N,B,&intone,&fzero,X,&intone);
@@ -274,7 +275,7 @@ public :
     sgetc2_(&N, C, &N, ipiv, jpiv, &info);
   }
 
-  
+
 
   static inline void hessenberg(const gene_matrix & X, gene_matrix & C, int N){
 #ifdef PUREBLAS
@@ -338,6 +339,14 @@ public :
     #endif
   }
 
+  static inline void trmm(gene_matrix & A, gene_matrix & B, gene_matrix & X, int N){
+    #ifdef PUREBLAS
+    strmm_(&left, &lower, &notrans,&nonunit, &N,&N,&fone,A,&N,B,&N);
+    #else
+    cblas_strmm(CblasColMajor, CblasLeft, CblasLower, CblasNoTrans,CblasNonUnit, N,N,1,A,N,B,N);
+    #endif
+  }
+
 };
 
 
diff --git a/bench/btl/libs/C_BLAS/main.cpp b/bench/btl/libs/C_BLAS/main.cpp
index fdffdc979..99f512f9b 100644
--- a/bench/btl/libs/C_BLAS/main.cpp
+++ b/bench/btl/libs/C_BLAS/main.cpp
@@ -54,6 +54,8 @@ int main()
   bench<Action_trisolve<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_trisolve_matrix<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
+  bench<Action_trmm<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+
   bench<Action_cholesky<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_partial_lu<C_BLAS_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
diff --git a/bench/btl/libs/eigen2/eigen2_interface.hh b/bench/btl/libs/eigen2/eigen2_interface.hh
index d8d1a607f..e9d15ce8d 100644
--- a/bench/btl/libs/eigen2/eigen2_interface.hh
+++ b/bench/btl/libs/eigen2/eigen2_interface.hh
@@ -197,6 +197,10 @@ public :
     X = L.template triangularView<Lower>().solve(B);
   }
 
+  static inline void trmm(const gene_matrix & L, const gene_matrix& B, gene_matrix& X, int N){
+    X = L.template triangularView<Lower>() * B;
+  }
+
   static inline void cholesky(const gene_matrix & X, gene_matrix & C, int N){
     C = X;
     ei_llt_inplace<Lower>::blocked(C);
@@ -211,8 +215,8 @@ public :
   }
 
   static inline void partial_lu_decomp(const gene_matrix & X, gene_matrix & C, int N){
-    RowVectorXi piv(N);
-    int nb;
+    Matrix<DenseIndex,1,Dynamic> piv(N);
+    DenseIndex nb;
     C = X;
     ei_partial_lu_inplace(C,piv,nb);
 //     C = X.partialPivLu().matrixLU();
@@ -221,8 +225,7 @@ public :
   static inline void tridiagonalization(const gene_matrix & X, gene_matrix & C, int N){
     typename Tridiagonalization<gene_matrix>::CoeffVectorType aux(N-1);
     C = X;
-    Tridiagonalization<gene_matrix>::_compute(C, aux);
-//     C = Tridiagonalization<gene_matrix>(X).packedMatrix();
+    ei_tridiagonalization_inplace(C, aux);
   }
 
   static inline void hessenberg(const gene_matrix & X, gene_matrix & C, int N){
diff --git a/bench/btl/libs/eigen2/main_matmat.cpp b/bench/btl/libs/eigen2/main_matmat.cpp
index bdebc0832..aae261c29 100644
--- a/bench/btl/libs/eigen2/main_matmat.cpp
+++ b/bench/btl/libs/eigen2/main_matmat.cpp
@@ -27,6 +27,7 @@ int main()
   bench<Action_matrix_matrix_product<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_ata_product<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_aat_product<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+  bench<Action_trmm<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
   return 0;
 }