various BTL updates (disable Cholesky for MTL, add new plot settings,

etc)

6 files changed, 26 insertions, 21 deletions

diff --git a/bench/btl/actions/action_trisolve_matrix.hh b/bench/btl/actions/action_trisolve_matrix.hh
index 0fc2bb9ef..92d9b9f89 100644
--- a/bench/btl/actions/action_trisolve_matrix.hh
+++ b/bench/btl/actions/action_trisolve_matrix.hh
@@ -101,7 +101,7 @@ public :
 
   static inline std::string name( void )
   {
-    return "trisolve_matrix_"+Interface::name();
+    return "matrix_trisolve_"+Interface::name();
   }
 
   double nb_op_base( void ){
diff --git a/bench/btl/data/action_settings.txt b/bench/btl/data/action_settings.txt
index 5e88cee99..ac27a482c 100644
--- a/bench/btl/data/action_settings.txt
+++ b/bench/btl/data/action_settings.txt
@@ -6,9 +6,10 @@ axpy ; "{/*1.5 Y += alpha X}" ; "vector size" ; 5:1000000
 matrix_matrix ; "{/*1.5 matrix matrix product}" ; "matrix size" ; 4:2048
 matrix_vector ; "{/*1.5 matrix vector product}" ; "matrix size" ; 4:2048
 trisolve ; "{/*1.5 triangular solver (X = inv(L) X)}" ; "size" ; 4:2048
+matrix_trisolve ; "{/*1.5 matrix triangular solver (M = inv(L) M)}" ; "size" ; 4:2048
 cholesky ; "{/*1.5 Cholesky decomposition}" ; "matrix size" ; 4:2048
 lu_decomp ; "{/*1.5 LU decomposition}" ; "matrix size" ; 4:2048
 tridiagonalization ; "{/*1.5 Tridiagonalization}" ; "matrix size" ; 4:2048
-hessenberg ; "{/*1.5 Hessenberg decomposition}" ; "matrix size" ; 4:2048 
-symv ; "{/*1.5 symmetric matrix vector product}" ; "matrix size" ; 4:2048 
-syr2 ; "{/*1.5 symmetric rank-2 update (A += u^T v + u v^T)}" ; "matrix size" ; 4:2048 
\ No newline at end of file
+hessenberg ; "{/*1.5 Hessenberg decomposition}" ; "matrix size" ; 4:2048
+symv ; "{/*1.5 symmetric matrix vector product}" ; "matrix size" ; 4:2048
+syr2 ; "{/*1.5 symmetric rank-2 update (A += u^T v + u v^T)}" ; "matrix size" ; 4:2048
\ No newline at end of file
diff --git a/bench/btl/data/go_mean b/bench/btl/data/go_mean
index 71cca6126..5e0529b8a 100755
--- a/bench/btl/data/go_mean
+++ b/bench/btl/data/go_mean
@@ -39,6 +39,7 @@ 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 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 tridiagonalization $1 11 100 300 1000 $mode $prefix
diff --git a/bench/btl/data/perlib_plot_settings.txt b/bench/btl/data/perlib_plot_settings.txt
index 497914be1..d45f4ff98 100644
--- a/bench/btl/data/perlib_plot_settings.txt
+++ b/bench/btl/data/perlib_plot_settings.txt
@@ -1,11 +1,13 @@
-eigen2 ;        with lines lw 4 lt 1 lc rgbcolor "black"
-eigen2_novec ;  with lines lw 3 lt 1 lc rgbcolor "#999999"
-INTEL_MKL ;     with lines lw 3 lt 2 lc rgbcolor "#00b7ff"
-ATLAS ;         with lines lw 3 lt 1 lc rgbcolor "#52e657"
-gmm ;           with lines lw 3 lt 1 lc rgbcolor "#0000ff"
-ublas ;         with lines lw 3 lt 1 lc rgbcolor "#ff0000"
-mtl4 ;          with lines lw 3 lt 1 lc rgbcolor "#d18847"
-blitz ;         with lines lw 3 lt 1 lc rgbcolor "#ff00ff"
-F77 ;           with lines lw 3 lt 3 lc rgbcolor "#e6e64c"
-GOTO ;          with lines lw 3 lt 3 lc rgbcolor "#e6bd96"
-C ;             with lines lw 3 lt 3 lc rgbcolor "#e6bd96"
+eigen2 ;          with lines lw 4 lt 1 lc rgbcolor "black"
+eigen2_novec ;    with lines lw 2 lt 1 lc rgbcolor "#999999"
+eigen2_nogccvec ; with lines lw 2 lt 2 lc rgbcolor "#991010"
+INTEL_MKL ;       with lines lw 3 lt 2 lc rgbcolor "#00b7ff"
+ATLAS ;           with lines lw 3 lt 1 lc rgbcolor "#52e657"
+gmm ;             with lines lw 3 lt 1 lc rgbcolor "#0000ff"
+ublas ;           with lines lw 3 lt 1 lc rgbcolor "#ff0000"
+mtl4 ;            with lines lw 3 lt 1 lc rgbcolor "#d18847"
+blitz ;           with lines lw 3 lt 1 lc rgbcolor "#ff00ff"
+F77 ;             with lines lw 3 lt 3 lc rgbcolor "#e6e64c"
+GOTO ;            with lines lw 3 lt 3 lc rgbcolor "#e6bd96"
+C ;               with lines lw 3 lt 3 lc rgbcolor "#e6bd96"
+ACML ;            with lines lw 2 lt 3 lc rgbcolor "#e6e64c"
diff --git a/bench/btl/libs/mtl4/main.cpp b/bench/btl/libs/mtl4/main.cpp
index d671e7ee9..7c442f998 100644
--- a/bench/btl/libs/mtl4/main.cpp
+++ b/bench/btl/libs/mtl4/main.cpp
@@ -37,7 +37,7 @@ int main()
 //   bench<Action_aat_product<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
   bench<Action_trisolve<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-  bench<Action_cholesky<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+//   bench<Action_cholesky<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 //   bench<Action_lu_decomp<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
   return 0;
diff --git a/bench/btl/libs/mtl4/mtl4_interface.hh b/bench/btl/libs/mtl4/mtl4_interface.hh
index c08b35645..4692dc5c9 100644
--- a/bench/btl/libs/mtl4/mtl4_interface.hh
+++ b/bench/btl/libs/mtl4/mtl4_interface.hh
@@ -19,7 +19,8 @@
 #define MTL4_INTERFACE_HH
 
 #include <boost/numeric/mtl/mtl.hpp>
-#include <boost/numeric/mtl/operation/cholesky.hpp>
+#include <boost/numeric/mtl/utility/range_generator.hpp>
+// #include <boost/numeric/mtl/operation/cholesky.hpp>
 #include <vector>
 
 using namespace mtl;
@@ -115,10 +116,10 @@ public :
     Y = a*X + b*Y;
   }
 
-  static inline void cholesky(const gene_matrix & X, gene_matrix & C, int N){
-    C = X;
-    recursive_cholesky(C);
-  }
+//   static inline void cholesky(const gene_matrix & X, gene_matrix & C, int N){
+//     C = X;
+//     recursive_cholesky(C);
+//   }
 
 //   static inline void lu_decomp(const gene_matrix & X, gene_matrix & R, int N){
 //     R = X;