various update of of BTL

3 files changed, 44 insertions, 25 deletions

diff --git a/bench/btl/data/action_settings.txt b/bench/btl/data/action_settings.txt
index 26557279b..5e88cee99 100644
--- a/bench/btl/data/action_settings.txt
+++ b/bench/btl/data/action_settings.txt
@@ -1,12 +1,14 @@
-aat ; "{/*1.5 A x A^T}" ; "matrix size" ; 4:1024
-ata ; "{/*1.5 A^T x A}" ; "matrix size" ; 4:1024
-atv ; "{/*1.5 matrix^T x vector}" ; "matrix size" ; 4:1024
-axpby ; "{/*1.5 Y = alpha * X + beta * Y}" ; "vector size" ; 5:1000000
-axpy ; "{/*1.5 Y += alpha * X}" ; "vector size" ; 5:1000000
-matrix_matrix ; "{/*1.5 matrix matrix product}" ; "matrix size" ; 4:1024
-matrix_vector ; "{/*1.5 matrix vector product}" ; "matrix size" ; 4:1024
-trisolve ; "{/*1.5 triangular solver (X = inv(L) * X)}" ; "size" ; 4:1024
-cholesky ; "{/*1.5 Cholesky decomposition}" ; "matrix size" ; 4:1024
-lu_decomp ; "{/*1.5 LU decomposition}" ; "matrix size" ; 4:1024
-tridiagonalization ; "{/*1.5 Tridiagonalization}" ; "matrix size" ; 4:1024
-hessenberg ; "{/*1.5 Hessenberg decomposition}" ; "matrix size" ; 4:1024 
\ No newline at end of file
+aat ; "{/*1.5 A x A^T}" ; "matrix size" ; 4:2048
+ata ; "{/*1.5 A^T x A}" ; "matrix size" ; 4:2048
+atv ; "{/*1.5 matrix^T x vector}" ; "matrix size" ; 4:2048
+axpby ; "{/*1.5 Y = alpha X + beta Y}" ; "vector size" ; 5:1000000
+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
+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
diff --git a/bench/btl/data/go_mean b/bench/btl/data/go_mean
index f8edf43db..71cca6126 100755
--- a/bench/btl/data/go_mean
+++ b/bench/btl/data/go_mean
@@ -1,7 +1,20 @@
 #! /bin/bash
+
+if [ $# < 1 ]; then
+  echo "Usage: $0 working_directory [tiny|large [prefix]]"
+else
+
 mkdir -p $1
 ##cp ../libs/*/*.dat $1
 
+mode=large
+if [ $# > 2 ]; then
+  mode=$2
+fi
+if [ $# > 3 ]; then
+  prefix=$3
+fi
+
 EIGENDIR=`cat eigen_root_dir.txt`
 
 webpagefilename=$1/index.html
@@ -18,19 +31,22 @@ echo '<ul>'\
   '</ul>' \
   '</p>'  >> $webpagefilename
 
-source mk_mean_script.sh axpy $1 11 2500 100000 250000  $2
-source mk_mean_script.sh axpby $1 11 2500 100000 250000 $2
-source mk_mean_script.sh matrix_vector $1 11 50 300 1000 $2
-source mk_mean_script.sh atv $1 11 50 300 1000 $2
-source mk_mean_script.sh matrix_matrix $1 11 100 300 1000 $2
-source mk_mean_script.sh aat $1 11 100 300 1000 $2
-source mk_mean_script.sh ata $1 11 100 300 1000 $2
-source mk_mean_script.sh trisolve $1 11 100 300 1000 $2
-source mk_mean_script.sh cholesky $1 11 100 300 1000 $2
-source mk_mean_script.sh lu_decomp $1 11 100 300 1000 $2
-source mk_mean_script.sh tridiagonalization $1 11 100 300 1000 $2
-source mk_mean_script.sh hessenberg $1 11 100 300 1000 $2
+source mk_mean_script.sh axpy $1 11 2500 100000 250000  $mode $prefix
+source mk_mean_script.sh axpby $1 11 2500 100000 250000 $mode $prefix
+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 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 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
+source mk_mean_script.sh hessenberg $1 11 100 300 1000 $mode $prefix
+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
 
+fi
 
 ## compile the web page ##
 
diff --git a/bench/btl/data/mk_mean_script.sh b/bench/btl/data/mk_mean_script.sh
index baa0fd9df..43bab559a 100644
--- a/bench/btl/data/mk_mean_script.sh
+++ b/bench/btl/data/mk_mean_script.sh
@@ -5,6 +5,7 @@ MINIC=$3
 MAXIC=$4
 MINOC=$5
 MAXOC=$6
+prefix=$8
 
 meanstatsfilename=$2/mean.html
 
@@ -37,7 +38,7 @@ echo '<br/>' >> $meanstatsfilename
 
 webpagefilename=$2/index.html
 # echo '<h3>'${WHAT}'</h3>'  >> $webpagefilename
-echo '<hr/><a href="/btl/'$1'.pdf"><img src="/btl/'$1'.png" alt="'${WHAT}'" /></a><br/>'  >> $webpagefilename
+echo '<hr/><a href="'$prefix$1'.pdf"><img src="'$prefix$1'.png" alt="'${WHAT}'" /></a><br/>'  >> $webpagefilename