diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-01-31 10:54:21 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-01-31 10:54:21 +0100 |
| commit | 476cb4c65ce188ad43a8d76411e6eb4aeccffd47 (patch) | |
| tree | 97f128dd2ad1a9bd42893e6df292ac4d6363d9aa /bench/btl | |
| parent | 9a73bfeb85fa842d962cfd342df85601a5b0e7fa (diff) | |
fix name collision
Diffstat (limited to 'bench/btl')
| -rw-r--r-- | bench/btl/actions/action_trisolve.hh | 2 | ||||
| -rw-r--r-- | bench/btl/actions/action_trisolve_matrix.hh | 2 | ||||
| -rw-r--r-- | bench/btl/data/action_settings.txt | 4 | ||||
| -rw-r--r-- | bench/btl/data/perlib_plot_settings.txt | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/bench/btl/actions/action_trisolve.hh b/bench/btl/actions/action_trisolve.hh index 52ef17e60..d6f0b477e 100644 --- a/bench/btl/actions/action_trisolve.hh +++ b/bench/btl/actions/action_trisolve.hh @@ -87,7 +87,7 @@ public : static inline std::string name( void ) { - return "trisolve_"+Interface::name(); + return "trisolve_vector_"+Interface::name(); } double nb_op_base( void ){ diff --git a/bench/btl/actions/action_trisolve_matrix.hh b/bench/btl/actions/action_trisolve_matrix.hh index 92d9b9f89..0fc2bb9ef 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 "matrix_trisolve_"+Interface::name(); + return "trisolve_matrix_"+Interface::name(); } double nb_op_base( void ){ diff --git a/bench/btl/data/action_settings.txt b/bench/btl/data/action_settings.txt index b7382ec43..da80f56a0 100644 --- a/bench/btl/data/action_settings.txt +++ b/bench/btl/data/action_settings.txt @@ -5,8 +5,8 @@ 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:3000 matrix_vector ; "{/*1.5 matrix vector product}" ; "matrix 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 +trisolve_vector ; "{/*1.5 triangular solver - vector (X = inv(L) X)}" ; "size" ; 4:3000 +trisolve_matrix ; "{/*1.5 triangular solver - matrix (M = inv(L) M)}" ; "size" ; 4:3000 cholesky ; "{/*1.5 Cholesky 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 diff --git a/bench/btl/data/perlib_plot_settings.txt b/bench/btl/data/perlib_plot_settings.txt index 4c253f450..82b09ce26 100644 --- a/bench/btl/data/perlib_plot_settings.txt +++ b/bench/btl/data/perlib_plot_settings.txt @@ -8,6 +8,7 @@ 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" +GOTO ; with lines lw 3 lt 3 lc rgbcolor "#C05600" +GOTO2 ; with lines lw 3 lt 1 lc rgbcolor "#C05600" C ; with lines lw 3 lt 3 lc rgbcolor "#e6bd96" ACML ; with lines lw 2 lt 3 lc rgbcolor "#e6e64c" |