diff options
author | Gael Guennebaud <g.gael@free.fr> | 2008-08-04 23:12:48 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2008-08-04 23:12:48 +0000 |
commit | a7a05382d1c51964bf3ea0536c6ddd9cc9888b72 (patch) | |
tree | 413a9ecf342bf59ff685495eff70f999ee7803ac /bench/btl/actions | |
parent | c2f8ecf46683adcab0db05199ee2ebe15e6ada4a (diff) |
Add a LU decomposition action in BTL and various cleaning in BTL. For instance
all per plot settings have been moved to a single file, go_mean now takes an
optional second argument "tiny" to generate plots for tiny matrices, and
output of comparison information wrt to previous benchs (if any).
Diffstat (limited to 'bench/btl/actions')
-rw-r--r-- | bench/btl/actions/action_atv_product.hh | 2 | ||||
-rw-r--r-- | bench/btl/actions/action_axpby.hh | 2 | ||||
-rw-r--r-- | bench/btl/actions/action_axpy.hh | 4 | ||||
-rw-r--r-- | bench/btl/actions/action_lu_decomp.hh | 124 | ||||
-rw-r--r-- | bench/btl/actions/action_matrix_matrix_product.hh | 2 | ||||
-rw-r--r-- | bench/btl/actions/action_matrix_vector_product.hh | 2 |
6 files changed, 132 insertions, 4 deletions
diff --git a/bench/btl/actions/action_atv_product.hh b/bench/btl/actions/action_atv_product.hh index b46bb6de8..e148bc86d 100644 --- a/bench/btl/actions/action_atv_product.hh +++ b/bench/btl/actions/action_atv_product.hh @@ -102,7 +102,7 @@ public : if (error>1.e-6){ INFOS("WRONG CALCULATION...residual=" << error); - exit(0); + exit(1); } } diff --git a/bench/btl/actions/action_axpby.hh b/bench/btl/actions/action_axpby.hh index 7a4f158c1..705447a21 100644 --- a/bench/btl/actions/action_axpby.hh +++ b/bench/btl/actions/action_axpby.hh @@ -85,7 +85,9 @@ public : } inline void calculate( void ) { + asm("#mybegin axpby"); Interface::axpby(_alpha,X,_beta,Y,_size); + asm("#myend axpby"); } void check_result( void ){ diff --git a/bench/btl/actions/action_axpy.hh b/bench/btl/actions/action_axpy.hh index 8740e413d..50759f6f6 100644 --- a/bench/btl/actions/action_axpy.hh +++ b/bench/btl/actions/action_axpy.hh @@ -96,7 +96,9 @@ public : } inline void calculate( void ) { - Interface::axpy(_coef,X,Y,_size); + asm("#mybegin axpy"); + Interface::axpy(_coef,X,Y,_size); + asm("#myend axpy"); } void check_result( void ){ diff --git a/bench/btl/actions/action_lu_decomp.hh b/bench/btl/actions/action_lu_decomp.hh new file mode 100644 index 000000000..cf455e87f --- /dev/null +++ b/bench/btl/actions/action_lu_decomp.hh @@ -0,0 +1,124 @@ +//===================================================== +// File : action_lu_decomp.hh +// Copyright (C) 2008 Gael Guennebaud <g.gael@free.fr> +//===================================================== +// +// 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_LU_DECOMP +#define ACTION_LU_DECOMP +#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_lu_decomp { + +public : + + // Ctor + + Action_lu_decomp( int size ):_size(size) + { + MESSAGE("Action_lu_decomp Ctor"); + + // STL vector initialization + init_matrix<pseudo_random>(X_stl,_size); + + init_matrix<null_function>(C_stl,_size); + init_matrix<null_function>(resu_stl,_size); + + // generic matrix and vector initialization + Interface::matrix_from_stl(X_ref,X_stl); + Interface::matrix_from_stl(X,X_stl); + Interface::matrix_from_stl(C,C_stl); + + _cost = 2.0*size*size*size/3.0 + size*size; + } + + // invalidate copy ctor + + Action_lu_decomp( const Action_lu_decomp & ) + { + INFOS("illegal call to Action_lu_decomp Copy Ctor"); + exit(1); + } + + // Dtor + + ~Action_lu_decomp( void ){ + + MESSAGE("Action_lu_decomp Dtor"); + + // deallocation + Interface::free_matrix(X_ref,_size); + Interface::free_matrix(X,_size); + Interface::free_matrix(C,_size); + } + + // action name + + static inline std::string name( void ) + { + return "lu_decomp_"+Interface::name(); + } + + double nb_op_base( void ){ + return _cost; + } + + inline void initialize( void ){ + Interface::copy_matrix(X_ref,X,_size); + } + + inline void calculate( void ) { + Interface::lu_decomp(X,C,_size); + } + + void check_result( void ){ + // calculation check + Interface::matrix_to_stl(C,resu_stl); + +// STL_interface<typename Interface::real_type>::lu_decomp(X_stl,C_stl,_size); +// +// typename Interface::real_type error= +// STL_interface<typename Interface::real_type>::norm_diff(C_stl,resu_stl); +// +// if (error>1.e-6){ +// INFOS("WRONG CALCULATION...residual=" << error); +// exit(0); +// } + + } + +private : + + typename Interface::stl_matrix X_stl; + typename Interface::stl_matrix C_stl; + typename Interface::stl_matrix resu_stl; + + typename Interface::gene_matrix X_ref; + typename Interface::gene_matrix X; + typename Interface::gene_matrix C; + + int _size; + int _cost; +}; + +#endif diff --git a/bench/btl/actions/action_matrix_matrix_product.hh b/bench/btl/actions/action_matrix_matrix_product.hh index 9de677a7f..048594c70 100644 --- a/bench/btl/actions/action_matrix_matrix_product.hh +++ b/bench/btl/actions/action_matrix_matrix_product.hh @@ -120,7 +120,7 @@ public : if (error>1.e-6){ INFOS("WRONG CALCULATION...residual=" << error); - exit(1); +// exit(1); } } diff --git a/bench/btl/actions/action_matrix_vector_product.hh b/bench/btl/actions/action_matrix_vector_product.hh index 202bc1a85..272e9d417 100644 --- a/bench/btl/actions/action_matrix_vector_product.hh +++ b/bench/btl/actions/action_matrix_vector_product.hh @@ -121,7 +121,7 @@ public : if (error>1.e-5){ INFOS("WRONG CALCULATION...residual=" << error); -// exit(0); + exit(0); } } |