* [gentoo-commits] proj/auto-numerical-bench:master commit in: btl/libs/gmm/, btl/libs/ublas/, /, btl/libs/blitz/, btl/libs/mtl4/, ...
@ 2011-06-15 19:52 Andrea Arteaga
0 siblings, 0 replies; only message in thread
From: Andrea Arteaga @ 2011-06-15 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 7739d32aa7d0616e54884bd6e72cbe2b18120e7e
Author: spiros <andyspiros <AT> gmail <DOT> com>
AuthorDate: Wed Jun 15 19:52:20 2011 +0000
Commit: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Wed Jun 15 19:52:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=7739d32a
Removed useless btl/libs/subdirectories.
---
.gitignore | 2 +
btl/libs/blitz/CMakeLists.txt | 17 ---
btl/libs/blitz/blitz_LU_solve_interface.hh | 192 ----------------------------
btl/libs/blitz/blitz_interface.hh | 147 ---------------------
btl/libs/blitz/btl_blitz.cpp | 51 --------
btl/libs/blitz/btl_tiny_blitz.cpp | 38 ------
btl/libs/blitz/tiny_blitz_interface.hh | 106 ---------------
btl/libs/eigen2/CMakeLists.txt | 19 ---
btl/libs/eigen2/btl_tiny_eigen2.cpp | 46 -------
btl/libs/eigen2/eigen2_interface.hh | 168 ------------------------
btl/libs/eigen2/main_adv.cpp | 44 -------
btl/libs/eigen2/main_linear.cpp | 34 -----
btl/libs/eigen2/main_matmat.cpp | 35 -----
btl/libs/eigen2/main_vecmat.cpp | 36 -----
btl/libs/gmm/CMakeLists.txt | 6 -
btl/libs/gmm/gmm_LU_solve_interface.hh | 192 ----------------------------
btl/libs/gmm/gmm_interface.hh | 144 ---------------------
btl/libs/gmm/main.cpp | 51 --------
btl/libs/mtl4/.kdbgrc.main | 12 --
btl/libs/mtl4/CMakeLists.txt | 6 -
btl/libs/mtl4/main.cpp | 46 -------
btl/libs/mtl4/mtl4_LU_solve_interface.hh | 192 ----------------------------
btl/libs/mtl4/mtl4_interface.hh | 144 ---------------------
btl/libs/tvmet/CMakeLists.txt | 6 -
btl/libs/tvmet/main.cpp | 40 ------
btl/libs/tvmet/tvmet_interface.hh | 104 ---------------
btl/libs/ublas/CMakeLists.txt | 7 -
btl/libs/ublas/main.cpp | 44 -------
btl/libs/ublas/ublas_interface.hh | 141 --------------------
29 files changed, 2 insertions(+), 2068 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a2bf2de
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.project
+/.pydevproject
diff --git a/btl/libs/blitz/CMakeLists.txt b/btl/libs/blitz/CMakeLists.txt
deleted file mode 100644
index 880ab73..0000000
--- a/btl/libs/blitz/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-find_package(Blitz)
-
-if (BLITZ_FOUND)
- include_directories(${BLITZ_INCLUDES})
-
- btl_add_bench(btl_blitz btl_blitz.cpp)
- if (BUILD_btl_blitz)
- target_link_libraries(btl_blitz ${BLITZ_LIBRARIES})
- endif (BUILD_btl_blitz)
-
- btl_add_bench(btl_tiny_blitz btl_tiny_blitz.cpp OFF)
- if (BUILD_btl_tiny_blitz)
- target_link_libraries(btl_tiny_blitz ${BLITZ_LIBRARIES})
- endif (BUILD_btl_tiny_blitz)
-
-endif (BLITZ_FOUND)
diff --git a/btl/libs/blitz/blitz_LU_solve_interface.hh b/btl/libs/blitz/blitz_LU_solve_interface.hh
deleted file mode 100644
index dcb9f56..0000000
--- a/btl/libs/blitz/blitz_LU_solve_interface.hh
+++ /dev/null
@@ -1,192 +0,0 @@
-//=====================================================
-// File : blitz_LU_solve_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:31 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 BLITZ_LU_SOLVE_INTERFACE_HH
-#define BLITZ_LU_SOLVE_INTERFACE_HH
-
-#include "blitz/array.h"
-#include <vector>
-
-BZ_USING_NAMESPACE(blitz)
-
-template<class real>
-class blitz_LU_solve_interface : public blitz_interface<real>
-{
-
-public :
-
- typedef typename blitz_interface<real>::gene_matrix gene_matrix;
- typedef typename blitz_interface<real>::gene_vector gene_vector;
-
- typedef blitz::Array<int,1> Pivot_Vector;
-
- inline static void new_Pivot_Vector(Pivot_Vector & pivot,int N)
- {
-
- pivot.resize(N);
-
- }
-
- inline static void free_Pivot_Vector(Pivot_Vector & pivot)
- {
-
- return;
-
- }
-
-
- static inline real matrix_vector_product_sliced(const gene_matrix & A, gene_vector B, int row, int col_start, int col_end)
- {
-
- real somme=0.;
-
- for (int j=col_start ; j<col_end+1 ; j++){
-
- somme+=A(row,j)*B(j);
-
- }
-
- return somme;
-
- }
-
-
-
-
- static inline real matrix_matrix_product_sliced(gene_matrix & A, int row, int col_start, int col_end, gene_matrix & B, int row_shift, int col )
- {
-
- real somme=0.;
-
- for (int j=col_start ; j<col_end+1 ; j++){
-
- somme+=A(row,j)*B(j+row_shift,col);
-
- }
-
- return somme;
-
- }
-
- inline static void LU_factor(gene_matrix & LU, Pivot_Vector & pivot, int N)
- {
-
- ASSERT( LU.rows()==LU.cols() ) ;
- int index_max = 0 ;
- real big = 0. ;
- real theSum = 0. ;
- real dum = 0. ;
- // Get the implicit scaling information :
- gene_vector ImplicitScaling( N ) ;
- for( int i=0; i<N; i++ ) {
- big = 0. ;
- for( int j=0; j<N; j++ ) {
- if( abs( LU( i, j ) )>=big ) big = abs( LU( i, j ) ) ;
- }
- if( big==0. ) {
- INFOS( "blitz_LU_factor::Singular matrix" ) ;
- exit( 0 ) ;
- }
- ImplicitScaling( i ) = 1./big ;
- }
- // Loop over columns of Crout's method :
- for( int j=0; j<N; j++ ) {
- for( int i=0; i<j; i++ ) {
- theSum = LU( i, j ) ;
- theSum -= matrix_matrix_product_sliced(LU, i, 0, i-1, LU, 0, j) ;
- // theSum -= sum( LU( i, Range( fromStart, i-1 ) )*LU( Range( fromStart, i-1 ), j ) ) ;
- LU( i, j ) = theSum ;
- }
-
- // Search for the largest pivot element :
- big = 0. ;
- for( int i=j; i<N; i++ ) {
- theSum = LU( i, j ) ;
- theSum -= matrix_matrix_product_sliced(LU, i, 0, j-1, LU, 0, j) ;
- // theSum -= sum( LU( i, Range( fromStart, j-1 ) )*LU( Range( fromStart, j-1 ), j ) ) ;
- LU( i, j ) = theSum ;
- if( (ImplicitScaling( i )*abs( theSum ))>=big ) {
- dum = ImplicitScaling( i )*abs( theSum ) ;
- big = dum ;
- index_max = i ;
- }
- }
- // Interchanging rows and the scale factor :
- if( j!=index_max ) {
- for( int k=0; k<N; k++ ) {
- dum = LU( index_max, k ) ;
- LU( index_max, k ) = LU( j, k ) ;
- LU( j, k ) = dum ;
- }
- ImplicitScaling( index_max ) = ImplicitScaling( j ) ;
- }
- pivot( j ) = index_max ;
- if ( LU( j, j )==0. ) LU( j, j ) = 1.e-20 ;
- // Divide by the pivot element :
- if( j<N ) {
- dum = 1./LU( j, j ) ;
- for( int i=j+1; i<N; i++ ) LU( i, j ) *= dum ;
- }
- }
-
- }
-
- inline static void LU_solve(const gene_matrix & LU, const Pivot_Vector pivot, gene_vector &B, gene_vector X, int N)
- {
-
- // Pour conserver le meme header, on travaille sur X, copie du second-membre B
- X = B.copy() ;
- ASSERT( LU.rows()==LU.cols() ) ;
- firstIndex indI ;
- // Forward substitution :
- int ii = 0 ;
- real theSum = 0. ;
- for( int i=0; i<N; i++ ) {
- int ip = pivot( i ) ;
- theSum = X( ip ) ;
- // theSum = B( ip ) ;
- X( ip ) = X( i ) ;
- // B( ip ) = B( i ) ;
- if( ii ) {
- theSum -= matrix_vector_product_sliced(LU, X, i, ii-1, i-1) ;
- // theSum -= sum( LU( i, Range( ii-1, i-1 ) )*X( Range( ii-1, i-1 ) ) ) ;
- // theSum -= sum( LU( i, Range( ii-1, i-1 ) )*B( Range( ii-1, i-1 ) ) ) ;
- } else if( theSum ) {
- ii = i+1 ;
- }
- X( i ) = theSum ;
- // B( i ) = theSum ;
- }
- // Backsubstitution :
- for( int i=N-1; i>=0; i-- ) {
- theSum = X( i ) ;
- // theSum = B( i ) ;
- theSum -= matrix_vector_product_sliced(LU, X, i, i+1, N) ;
- // theSum -= sum( LU( i, Range( i+1, toEnd ) )*X( Range( i+1, toEnd ) ) ) ;
- // theSum -= sum( LU( i, Range( i+1, toEnd ) )*B( Range( i+1, toEnd ) ) ) ;
- // Store a component of the solution vector :
- X( i ) = theSum/LU( i, i ) ;
- // B( i ) = theSum/LU( i, i ) ;
- }
-
- }
-
-};
-
-#endif
diff --git a/btl/libs/blitz/blitz_interface.hh b/btl/libs/blitz/blitz_interface.hh
deleted file mode 100644
index a67c47c..0000000
--- a/btl/libs/blitz/blitz_interface.hh
+++ /dev/null
@@ -1,147 +0,0 @@
-//=====================================================
-// File : blitz_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:30 CEST 2002
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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 BLITZ_INTERFACE_HH
-#define BLITZ_INTERFACE_HH
-
-#include <blitz/blitz.h>
-#include <blitz/array.h>
-#include <blitz/vector-et.h>
-#include <blitz/vecwhere.h>
-#include <blitz/matrix.h>
-#include <vector>
-
-BZ_USING_NAMESPACE(blitz)
-
-template<class real>
-class blitz_interface{
-
-public :
-
- typedef real real_type ;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector > stl_matrix;
-
- typedef blitz::Array<real, 2> gene_matrix;
- typedef blitz::Array<real, 1> gene_vector;
-// typedef blitz::Matrix<real, blitz::ColumnMajor> gene_matrix;
-// typedef blitz::Vector<real> gene_vector;
-
- static inline std::string name() { return "blitz"; }
-
- static void free_matrix(gene_matrix & A, int N){}
-
- static void free_vector(gene_vector & B){}
-
- static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- A.resize(A_stl[0].size(),A_stl.size());
- for (int j=0; j<A_stl.size() ; j++){
- for (int i=0; i<A_stl[j].size() ; i++){
- A(i,j)=A_stl[j][i];
- }
- }
- }
-
- static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- B.resize(B_stl.size());
- for (int i=0; i<B_stl.size() ; i++){
- B(i)=B_stl[i];
- }
- }
-
- static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++){
- B_stl[i]=B(i);
- }
- }
-
- static inline void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N=A_stl.size();
- for (int j=0;j<N;j++){
- A_stl[j].resize(N);
- for (int i=0;i<N;i++)
- A_stl[j][i] = A(i,j);
- }
- }
-
- static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N)
- {
- firstIndex i;
- secondIndex j;
- thirdIndex k;
- X = sum(A(i,k) * B(k,j), k);
- }
-
- static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N)
- {
- firstIndex i;
- secondIndex j;
- thirdIndex k;
- X = sum(A(k,i) * A(k,j), k);
- }
-
- static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N)
- {
- firstIndex i;
- secondIndex j;
- thirdIndex k;
- X = sum(A(i,k) * A(j,k), k);
- }
-
- static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N)
- {
- firstIndex i;
- secondIndex j;
- X = sum(A(i,j)*B(j),j);
- }
-
- static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N)
- {
- firstIndex i;
- secondIndex j;
- X = sum(A(j,i) * B(j),j);
- }
-
- static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N)
- {
- firstIndex i;
- Y = Y(i) + coef * X(i);
- //Y += coef * X;
- }
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- cible = source;
- //cible.template operator=<gene_matrix>(source);
-// for (int i=0;i<N;i++){
-// for (int j=0;j<N;j++){
-// cible(i,j)=source(i,j);
-// }
-// }
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- //cible.template operator=<gene_vector>(source);
- cible = source;
- }
-
-};
-
-#endif
diff --git a/btl/libs/blitz/btl_blitz.cpp b/btl/libs/blitz/btl_blitz.cpp
deleted file mode 100644
index 16d2b59..0000000
--- a/btl/libs/blitz/btl_blitz.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//=====================================================
-// File : main.cpp
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:30 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.
-//
-#include "utilities.h"
-#include "blitz_interface.hh"
-#include "blitz_LU_solve_interface.hh"
-#include "bench.hh"
-#include "action_matrix_vector_product.hh"
-#include "action_matrix_matrix_product.hh"
-#include "action_axpy.hh"
-#include "action_lu_solve.hh"
-#include "action_ata_product.hh"
-#include "action_aat_product.hh"
-#include "action_atv_product.hh"
-
-BTL_MAIN;
-
-int main()
-{
-
- bench<Action_matrix_vector_product<blitz_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
- bench<Action_atv_product<blitz_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-
- bench<Action_matrix_matrix_product<blitz_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_ata_product<blitz_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_aat_product<blitz_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- bench<Action_axpy<blitz_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
-
- //bench<Action_lu_solve<blitz_LU_solve_interface<REAL_TYPE> > >(MIN_LU,MAX_LU,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/blitz/btl_tiny_blitz.cpp b/btl/libs/blitz/btl_tiny_blitz.cpp
deleted file mode 100644
index 9fddde7..0000000
--- a/btl/libs/blitz/btl_tiny_blitz.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-//=====================================================
-// File : main.cpp
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:30 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.
-//
-#include "utilities.h"
-#include "tiny_blitz_interface.hh"
-#include "static/bench_static.hh"
-#include "action_matrix_vector_product.hh"
-#include "action_matrix_matrix_product.hh"
-#include "action_axpy.hh"
-
-BTL_MAIN;
-
-int main()
-{
- bench_static<Action_axpy,tiny_blitz_interface>();
- bench_static<Action_matrix_matrix_product,tiny_blitz_interface>();
- bench_static<Action_matrix_vector_product,tiny_blitz_interface>();
-
- return 0;
-}
-
-
diff --git a/btl/libs/blitz/tiny_blitz_interface.hh b/btl/libs/blitz/tiny_blitz_interface.hh
deleted file mode 100644
index 6b26db7..0000000
--- a/btl/libs/blitz/tiny_blitz_interface.hh
+++ /dev/null
@@ -1,106 +0,0 @@
-//=====================================================
-// File : tiny_blitz_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:30 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 TINY_BLITZ_INTERFACE_HH
-#define TINY_BLITZ_INTERFACE_HH
-
-#include "blitz/array.h"
-#include "blitz/tiny.h"
-#include "blitz/tinymat.h"
-#include "blitz/tinyvec.h"
-#include <blitz/tinyvec-et.h>
-
-#include <vector>
-
-BZ_USING_NAMESPACE(blitz)
-
-template<class real, int SIZE>
-class tiny_blitz_interface
-{
-
-public :
-
- typedef real real_type ;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector > stl_matrix;
-
- typedef TinyVector<real,SIZE> gene_vector;
- typedef TinyMatrix<real,SIZE,SIZE> gene_matrix;
-
- static inline std::string name() { return "tiny_blitz"; }
-
- static void free_matrix(gene_matrix & A, int N){}
-
- static void free_vector(gene_vector & B){}
-
- static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- for (int j=0; j<A_stl.size() ; j++)
- for (int i=0; i<A_stl[j].size() ; i++)
- A(i,j)=A_stl[j][i];
- }
-
- static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++)
- B(i) = B_stl[i];
- }
-
- static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++)
- B_stl[i] = B(i);
- }
-
- static inline void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N = A_stl.size();
- for (int j=0;j<N;j++)
- {
- A_stl[j].resize(N);
- for (int i=0;i<N;i++)
- A_stl[j][i] = A(i,j);
- }
- }
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- for (int j=0;j<N;j++)
- for (int i=0;i<N;i++)
- cible(i,j) = source(i,j);
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- for (int i=0;i<N;i++){
- cible(i) = source(i);
- }
- }
-
- static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- X = product(A,B);
- }
-
- static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = product(A,B);
- }
-
- static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
- Y += coef * X;
- }
-
-};
-
-
-#endif
diff --git a/btl/libs/eigen2/CMakeLists.txt b/btl/libs/eigen2/CMakeLists.txt
deleted file mode 100644
index a2e8fc6..0000000
--- a/btl/libs/eigen2/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-find_package(Eigen2)
-
-if(EIGEN2_FOUND)
-
- include_directories(BEFORE ${EIGEN2_INCLUDE_DIR})
- btl_add_bench(btl_eigen2_linear main_linear.cpp)
- btl_add_bench(btl_eigen2_vecmat main_vecmat.cpp)
- btl_add_bench(btl_eigen2_matmat main_matmat.cpp)
- btl_add_bench(btl_eigen2_adv main_adv.cpp )
-
- btl_add_target_property(btl_eigen2_linear COMPILE_FLAGS "-fno-exceptions -DBTL_PREFIX=eigen2")
- btl_add_target_property(btl_eigen2_vecmat COMPILE_FLAGS "-fno-exceptions -DBTL_PREFIX=eigen2")
- btl_add_target_property(btl_eigen2_matmat COMPILE_FLAGS "-fno-exceptions -DBTL_PREFIX=eigen2")
- btl_add_target_property(btl_eigen2_adv COMPILE_FLAGS "-fno-exceptions -DBTL_PREFIX=eigen2")
-
- btl_add_bench(btl_tiny_eigen2 btl_tiny_eigen2.cpp OFF)
-
-endif() # EIGEN2_FOUND
diff --git a/btl/libs/eigen2/btl_tiny_eigen2.cpp b/btl/libs/eigen2/btl_tiny_eigen2.cpp
deleted file mode 100644
index d1515be..0000000
--- a/btl/libs/eigen2/btl_tiny_eigen2.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "eigen3_interface.hh"
-#include "static/bench_static.hh"
-#include "action_matrix_vector_product.hh"
-#include "action_matrix_matrix_product.hh"
-#include "action_axpy.hh"
-#include "action_lu_solve.hh"
-#include "action_ata_product.hh"
-#include "action_aat_product.hh"
-#include "action_atv_product.hh"
-#include "action_cholesky.hh"
-#include "action_trisolve.hh"
-
-BTL_MAIN;
-
-int main()
-{
-
- bench_static<Action_axpy,eigen2_interface>();
- bench_static<Action_matrix_matrix_product,eigen2_interface>();
- bench_static<Action_matrix_vector_product,eigen2_interface>();
- bench_static<Action_atv_product,eigen2_interface>();
- bench_static<Action_cholesky,eigen2_interface>();
- bench_static<Action_trisolve,eigen2_interface>();
-
- return 0;
-}
-
-
diff --git a/btl/libs/eigen2/eigen2_interface.hh b/btl/libs/eigen2/eigen2_interface.hh
deleted file mode 100644
index 47fe581..0000000
--- a/btl/libs/eigen2/eigen2_interface.hh
+++ /dev/null
@@ -1,168 +0,0 @@
-//=====================================================
-// 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 EIGEN2_INTERFACE_HH
-#define EIGEN2_INTERFACE_HH
-// #include <cblas.h>
-#include <Eigen/Core>
-#include <Eigen/Cholesky>
-#include <Eigen/LU>
-#include <Eigen/QR>
-#include <vector>
-#include "btl.hh"
-
-using namespace Eigen;
-
-template<class real, int SIZE=Dynamic>
-class eigen2_interface
-{
-
-public :
-
- enum {IsFixedSize = (SIZE!=Dynamic)};
-
- typedef real real_type;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector> stl_matrix;
-
- typedef Eigen::Matrix<real,SIZE,SIZE> gene_matrix;
- typedef Eigen::Matrix<real,SIZE,1> gene_vector;
-
- static inline std::string name( void )
- {
- #if defined(EIGEN_VECTORIZE_SSE)
- if (SIZE==Dynamic) return "eigen2"; else return "tiny_eigen2";
- #elif defined(EIGEN_VECTORIZE_ALTIVEC)
- if (SIZE==Dynamic) return "eigen2"; else return "tiny_eigen2";
- #else
- if (SIZE==Dynamic) return "eigen2_novec"; else return "tiny_eigen2_novec";
- #endif
- }
-
- static void free_matrix(gene_matrix & A, int N) {}
-
- static void free_vector(gene_vector & B) {}
-
- static BTL_DONT_INLINE void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- A.resize(A_stl[0].size(), A_stl.size());
-
- for (int j=0; j<A_stl.size() ; j++){
- for (int i=0; i<A_stl[j].size() ; i++){
- A.coeffRef(i,j) = A_stl[j][i];
- }
- }
- }
-
- static BTL_DONT_INLINE void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- B.resize(B_stl.size(),1);
-
- for (int i=0; i<B_stl.size() ; i++){
- B.coeffRef(i) = B_stl[i];
- }
- }
-
- static BTL_DONT_INLINE void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++){
- B_stl[i] = B.coeff(i);
- }
- }
-
- static BTL_DONT_INLINE void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N=A_stl.size();
-
- for (int j=0;j<N;j++){
- A_stl[j].resize(N);
- for (int i=0;i<N;i++){
- A_stl[j][i] = A.coeff(i,j);
- }
- }
- }
-
- static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- X = (A*B).lazy();
- }
-
- static inline void transposed_matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- X = (A.transpose()*B.transpose()).lazy();
- }
-
- static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){
- X = (A.transpose()*A).lazy();
- }
-
- static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){
- X = (A*A.transpose()).lazy();
- }
-
- static inline void matrix_vector_product(const gene_matrix & A, const gene_vector & B, gene_vector & X, int N){
- X = (A*B)/*.lazy()*/;
- }
-
- static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = (A.transpose()*B)/*.lazy()*/;
- }
-
- static inline void axpy(real coef, const gene_vector & X, gene_vector & Y, int N){
- Y += coef * X;
- }
-
- static inline void axpby(real a, const gene_vector & X, real b, gene_vector & Y, int N){
- Y = a*X + b*Y;
- }
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- cible = source;
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- cible = source;
- }
-
- static inline void trisolve_lower(const gene_matrix & L, const gene_vector& B, gene_vector& X, int N){
- X = L.template marked<LowerTriangular>().solveTriangular(B);
- }
-
- static inline void trisolve_lower_matrix(const gene_matrix & L, const gene_matrix& B, gene_matrix& X, int N){
- X = L.template marked<LowerTriangular>().solveTriangular(B);
- }
-
- static inline void cholesky(const gene_matrix & X, gene_matrix & C, int N){
- C = X.llt().matrixL();
-// C = X;
-// Cholesky<gene_matrix>::computeInPlace(C);
-// Cholesky<gene_matrix>::computeInPlaceBlock(C);
- }
-
- static inline void lu_decomp(const gene_matrix & X, gene_matrix & C, int N){
- C = X.lu().matrixLU();
-// C = X.inverse();
- }
-
- static inline void tridiagonalization(const gene_matrix & X, gene_matrix & C, int N){
- C = Tridiagonalization<gene_matrix>(X).packedMatrix();
- }
-
- static inline void hessenberg(const gene_matrix & X, gene_matrix & C, int N){
- C = HessenbergDecomposition<gene_matrix>(X).packedMatrix();
- }
-
-
-
-};
-
-#endif
diff --git a/btl/libs/eigen2/main_adv.cpp b/btl/libs/eigen2/main_adv.cpp
deleted file mode 100644
index fe33689..0000000
--- a/btl/libs/eigen2/main_adv.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "eigen2_interface.hh"
-#include "bench.hh"
-#include "action_trisolve.hh"
-#include "action_trisolve_matrix.hh"
-#include "action_cholesky.hh"
-#include "action_hessenberg.hh"
-#include "action_lu_decomp.hh"
-// #include "action_partial_lu.hh"
-
-BTL_MAIN;
-
-int main()
-{
- bench<Action_trisolve<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_trisolve_matrix<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_cholesky<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_lu_decomp<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// bench<Action_partial_lu<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- bench<Action_hessenberg<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_tridiagonalization<eigen2_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/eigen2/main_linear.cpp b/btl/libs/eigen2/main_linear.cpp
deleted file mode 100644
index c17d16c..0000000
--- a/btl/libs/eigen2/main_linear.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "eigen2_interface.hh"
-#include "bench.hh"
-#include "basic_actions.hh"
-
-BTL_MAIN;
-
-int main()
-{
-
- bench<Action_axpy<eigen2_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
- bench<Action_axpby<eigen2_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/eigen2/main_matmat.cpp b/btl/libs/eigen2/main_matmat.cpp
deleted file mode 100644
index cd9dc9c..0000000
--- a/btl/libs/eigen2/main_matmat.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "eigen2_interface.hh"
-#include "bench.hh"
-#include "basic_actions.hh"
-
-BTL_MAIN;
-
-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;
-}
-
-
diff --git a/btl/libs/eigen2/main_vecmat.cpp b/btl/libs/eigen2/main_vecmat.cpp
deleted file mode 100644
index 8b66cd2..0000000
--- a/btl/libs/eigen2/main_vecmat.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "eigen2_interface.hh"
-#include "bench.hh"
-#include "basic_actions.hh"
-
-BTL_MAIN;
-
-int main()
-{
- bench<Action_matrix_vector_product<eigen2_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
- bench<Action_atv_product<eigen2_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-// bench<Action_symv<eigen2_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-// bench<Action_syr2<eigen2_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-// bench<Action_ger<eigen2_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/gmm/CMakeLists.txt b/btl/libs/gmm/CMakeLists.txt
deleted file mode 100644
index bc25862..0000000
--- a/btl/libs/gmm/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-find_package(GMM)
-if (GMM_FOUND)
- include_directories(${GMM_INCLUDES})
- btl_add_bench(btl_gmm main.cpp)
-endif (GMM_FOUND)
diff --git a/btl/libs/gmm/gmm_LU_solve_interface.hh b/btl/libs/gmm/gmm_LU_solve_interface.hh
deleted file mode 100644
index dcb9f56..0000000
--- a/btl/libs/gmm/gmm_LU_solve_interface.hh
+++ /dev/null
@@ -1,192 +0,0 @@
-//=====================================================
-// File : blitz_LU_solve_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:31 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 BLITZ_LU_SOLVE_INTERFACE_HH
-#define BLITZ_LU_SOLVE_INTERFACE_HH
-
-#include "blitz/array.h"
-#include <vector>
-
-BZ_USING_NAMESPACE(blitz)
-
-template<class real>
-class blitz_LU_solve_interface : public blitz_interface<real>
-{
-
-public :
-
- typedef typename blitz_interface<real>::gene_matrix gene_matrix;
- typedef typename blitz_interface<real>::gene_vector gene_vector;
-
- typedef blitz::Array<int,1> Pivot_Vector;
-
- inline static void new_Pivot_Vector(Pivot_Vector & pivot,int N)
- {
-
- pivot.resize(N);
-
- }
-
- inline static void free_Pivot_Vector(Pivot_Vector & pivot)
- {
-
- return;
-
- }
-
-
- static inline real matrix_vector_product_sliced(const gene_matrix & A, gene_vector B, int row, int col_start, int col_end)
- {
-
- real somme=0.;
-
- for (int j=col_start ; j<col_end+1 ; j++){
-
- somme+=A(row,j)*B(j);
-
- }
-
- return somme;
-
- }
-
-
-
-
- static inline real matrix_matrix_product_sliced(gene_matrix & A, int row, int col_start, int col_end, gene_matrix & B, int row_shift, int col )
- {
-
- real somme=0.;
-
- for (int j=col_start ; j<col_end+1 ; j++){
-
- somme+=A(row,j)*B(j+row_shift,col);
-
- }
-
- return somme;
-
- }
-
- inline static void LU_factor(gene_matrix & LU, Pivot_Vector & pivot, int N)
- {
-
- ASSERT( LU.rows()==LU.cols() ) ;
- int index_max = 0 ;
- real big = 0. ;
- real theSum = 0. ;
- real dum = 0. ;
- // Get the implicit scaling information :
- gene_vector ImplicitScaling( N ) ;
- for( int i=0; i<N; i++ ) {
- big = 0. ;
- for( int j=0; j<N; j++ ) {
- if( abs( LU( i, j ) )>=big ) big = abs( LU( i, j ) ) ;
- }
- if( big==0. ) {
- INFOS( "blitz_LU_factor::Singular matrix" ) ;
- exit( 0 ) ;
- }
- ImplicitScaling( i ) = 1./big ;
- }
- // Loop over columns of Crout's method :
- for( int j=0; j<N; j++ ) {
- for( int i=0; i<j; i++ ) {
- theSum = LU( i, j ) ;
- theSum -= matrix_matrix_product_sliced(LU, i, 0, i-1, LU, 0, j) ;
- // theSum -= sum( LU( i, Range( fromStart, i-1 ) )*LU( Range( fromStart, i-1 ), j ) ) ;
- LU( i, j ) = theSum ;
- }
-
- // Search for the largest pivot element :
- big = 0. ;
- for( int i=j; i<N; i++ ) {
- theSum = LU( i, j ) ;
- theSum -= matrix_matrix_product_sliced(LU, i, 0, j-1, LU, 0, j) ;
- // theSum -= sum( LU( i, Range( fromStart, j-1 ) )*LU( Range( fromStart, j-1 ), j ) ) ;
- LU( i, j ) = theSum ;
- if( (ImplicitScaling( i )*abs( theSum ))>=big ) {
- dum = ImplicitScaling( i )*abs( theSum ) ;
- big = dum ;
- index_max = i ;
- }
- }
- // Interchanging rows and the scale factor :
- if( j!=index_max ) {
- for( int k=0; k<N; k++ ) {
- dum = LU( index_max, k ) ;
- LU( index_max, k ) = LU( j, k ) ;
- LU( j, k ) = dum ;
- }
- ImplicitScaling( index_max ) = ImplicitScaling( j ) ;
- }
- pivot( j ) = index_max ;
- if ( LU( j, j )==0. ) LU( j, j ) = 1.e-20 ;
- // Divide by the pivot element :
- if( j<N ) {
- dum = 1./LU( j, j ) ;
- for( int i=j+1; i<N; i++ ) LU( i, j ) *= dum ;
- }
- }
-
- }
-
- inline static void LU_solve(const gene_matrix & LU, const Pivot_Vector pivot, gene_vector &B, gene_vector X, int N)
- {
-
- // Pour conserver le meme header, on travaille sur X, copie du second-membre B
- X = B.copy() ;
- ASSERT( LU.rows()==LU.cols() ) ;
- firstIndex indI ;
- // Forward substitution :
- int ii = 0 ;
- real theSum = 0. ;
- for( int i=0; i<N; i++ ) {
- int ip = pivot( i ) ;
- theSum = X( ip ) ;
- // theSum = B( ip ) ;
- X( ip ) = X( i ) ;
- // B( ip ) = B( i ) ;
- if( ii ) {
- theSum -= matrix_vector_product_sliced(LU, X, i, ii-1, i-1) ;
- // theSum -= sum( LU( i, Range( ii-1, i-1 ) )*X( Range( ii-1, i-1 ) ) ) ;
- // theSum -= sum( LU( i, Range( ii-1, i-1 ) )*B( Range( ii-1, i-1 ) ) ) ;
- } else if( theSum ) {
- ii = i+1 ;
- }
- X( i ) = theSum ;
- // B( i ) = theSum ;
- }
- // Backsubstitution :
- for( int i=N-1; i>=0; i-- ) {
- theSum = X( i ) ;
- // theSum = B( i ) ;
- theSum -= matrix_vector_product_sliced(LU, X, i, i+1, N) ;
- // theSum -= sum( LU( i, Range( i+1, toEnd ) )*X( Range( i+1, toEnd ) ) ) ;
- // theSum -= sum( LU( i, Range( i+1, toEnd ) )*B( Range( i+1, toEnd ) ) ) ;
- // Store a component of the solution vector :
- X( i ) = theSum/LU( i, i ) ;
- // B( i ) = theSum/LU( i, i ) ;
- }
-
- }
-
-};
-
-#endif
diff --git a/btl/libs/gmm/gmm_interface.hh b/btl/libs/gmm/gmm_interface.hh
deleted file mode 100644
index 3ea303c..0000000
--- a/btl/libs/gmm/gmm_interface.hh
+++ /dev/null
@@ -1,144 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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 GMM_INTERFACE_HH
-#define GMM_INTERFACE_HH
-
-#include <gmm/gmm.h>
-#include <vector>
-
-using namespace gmm;
-
-template<class real>
-class gmm_interface {
-
-public :
-
- typedef real real_type ;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector > stl_matrix;
-
- typedef gmm::dense_matrix<real> gene_matrix;
- typedef stl_vector gene_vector;
-
- static inline std::string name( void )
- {
- return "gmm";
- }
-
- static void free_matrix(gene_matrix & A, int N){
- return ;
- }
-
- static void free_vector(gene_vector & B){
- return ;
- }
-
- static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- A.resize(A_stl[0].size(),A_stl.size());
-
- for (int j=0; j<A_stl.size() ; j++){
- for (int i=0; i<A_stl[j].size() ; i++){
- A(i,j) = A_stl[j][i];
- }
- }
- }
-
- static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- B = B_stl;
- }
-
- static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- B_stl = B;
- }
-
- static inline void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N=A_stl.size();
-
- for (int j=0;j<N;j++){
- A_stl[j].resize(N);
- for (int i=0;i<N;i++){
- A_stl[j][i] = A(i,j);
- }
- }
- }
-
- static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- gmm::mult(A,B, X);
- }
-
- static inline void transposed_matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- gmm::mult(gmm::transposed(A),gmm::transposed(B), X);
- }
-
- static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){
- gmm::mult(gmm::transposed(A),A, X);
- }
-
- static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){
- gmm::mult(A,gmm::transposed(A), X);
- }
-
- static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- gmm::mult(A,B,X);
- }
-
- static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- gmm::mult(gmm::transposed(A),B,X);
- }
-
- static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
- gmm::add(gmm::scaled(X,coef), Y);
- }
-
- static inline void axpby(real a, const gene_vector & X, real b, gene_vector & Y, int N){
- gmm::add(gmm::scaled(X,a), gmm::scaled(Y,b), Y);
- }
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- gmm::copy(source,cible);
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- gmm::copy(source,cible);
- }
-
- static inline void trisolve_lower(const gene_matrix & L, const gene_vector& B, gene_vector & X, int N){
- gmm::copy(B,X);
- gmm::lower_tri_solve(L, X, false);
- }
-
- static inline void partial_lu_decomp(const gene_matrix & X, gene_matrix & R, int N){
- gmm::copy(X,R);
- std::vector<int> ipvt(N);
- gmm::lu_factor(R, ipvt);
- }
-
- static inline void hessenberg(const gene_matrix & X, gene_matrix & R, int N){
- gmm::copy(X,R);
- gmm::Hessenberg_reduction(R,X,false);
- }
-
- static inline void tridiagonalization(const gene_matrix & X, gene_matrix & R, int N){
- gmm::copy(X,R);
- gmm::Householder_tridiagonalization(R,X,false);
- }
-
-};
-
-#endif
diff --git a/btl/libs/gmm/main.cpp b/btl/libs/gmm/main.cpp
deleted file mode 100644
index 1f0c051..0000000
--- a/btl/libs/gmm/main.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "gmm_interface.hh"
-#include "bench.hh"
-#include "basic_actions.hh"
-#include "action_hessenberg.hh"
-#include "action_partial_lu.hh"
-
-BTL_MAIN;
-
-int main()
-{
-
- bench<Action_axpy<gmm_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
- bench<Action_axpby<gmm_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
-
- bench<Action_matrix_vector_product<gmm_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
- bench<Action_atv_product<gmm_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-
- bench<Action_matrix_matrix_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// bench<Action_ata_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// bench<Action_aat_product<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- bench<Action_trisolve<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- //bench<Action_lu_solve<blitz_LU_solve_interface<REAL_TYPE> > >(MIN_LU,MAX_LU,NB_POINT);
-
- bench<Action_partial_lu<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- bench<Action_hessenberg<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
- bench<Action_tridiagonalization<gmm_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/mtl4/.kdbgrc.main b/btl/libs/mtl4/.kdbgrc.main
deleted file mode 100644
index fed082f..0000000
--- a/btl/libs/mtl4/.kdbgrc.main
+++ /dev/null
@@ -1,12 +0,0 @@
-[General]
-DebuggerCmdStr=
-DriverName=GDB
-FileVersion=1
-OptionsSelected=
-ProgramArgs=
-TTYLevel=7
-WorkingDirectory=
-
-[Memory]
-ColumnWidths=80,0
-NumExprs=0
diff --git a/btl/libs/mtl4/CMakeLists.txt b/btl/libs/mtl4/CMakeLists.txt
deleted file mode 100644
index 14b47a8..0000000
--- a/btl/libs/mtl4/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-find_package(MTL4)
-if (MTL4_FOUND)
- include_directories(${MTL4_INCLUDE_DIR})
- btl_add_bench(btl_mtl4 main.cpp)
-endif (MTL4_FOUND)
diff --git a/btl/libs/mtl4/main.cpp b/btl/libs/mtl4/main.cpp
deleted file mode 100644
index 96fcfb9..0000000
--- a/btl/libs/mtl4/main.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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.
-//
-#include "utilities.h"
-#include "mtl4_interface.hh"
-#include "bench.hh"
-#include "basic_actions.hh"
-#include "action_cholesky.hh"
-// #include "action_lu_decomp.hh"
-
-BTL_MAIN;
-
-int main()
-{
-
- bench<Action_axpy<mtl4_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
- bench<Action_axpby<mtl4_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
-
- bench<Action_matrix_vector_product<mtl4_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
- bench<Action_atv_product<mtl4_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
- bench<Action_matrix_matrix_product<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// bench<Action_ata_product<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// 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_lu_decomp<mtl4_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/mtl4/mtl4_LU_solve_interface.hh b/btl/libs/mtl4/mtl4_LU_solve_interface.hh
deleted file mode 100644
index dcb9f56..0000000
--- a/btl/libs/mtl4/mtl4_LU_solve_interface.hh
+++ /dev/null
@@ -1,192 +0,0 @@
-//=====================================================
-// File : blitz_LU_solve_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:31 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 BLITZ_LU_SOLVE_INTERFACE_HH
-#define BLITZ_LU_SOLVE_INTERFACE_HH
-
-#include "blitz/array.h"
-#include <vector>
-
-BZ_USING_NAMESPACE(blitz)
-
-template<class real>
-class blitz_LU_solve_interface : public blitz_interface<real>
-{
-
-public :
-
- typedef typename blitz_interface<real>::gene_matrix gene_matrix;
- typedef typename blitz_interface<real>::gene_vector gene_vector;
-
- typedef blitz::Array<int,1> Pivot_Vector;
-
- inline static void new_Pivot_Vector(Pivot_Vector & pivot,int N)
- {
-
- pivot.resize(N);
-
- }
-
- inline static void free_Pivot_Vector(Pivot_Vector & pivot)
- {
-
- return;
-
- }
-
-
- static inline real matrix_vector_product_sliced(const gene_matrix & A, gene_vector B, int row, int col_start, int col_end)
- {
-
- real somme=0.;
-
- for (int j=col_start ; j<col_end+1 ; j++){
-
- somme+=A(row,j)*B(j);
-
- }
-
- return somme;
-
- }
-
-
-
-
- static inline real matrix_matrix_product_sliced(gene_matrix & A, int row, int col_start, int col_end, gene_matrix & B, int row_shift, int col )
- {
-
- real somme=0.;
-
- for (int j=col_start ; j<col_end+1 ; j++){
-
- somme+=A(row,j)*B(j+row_shift,col);
-
- }
-
- return somme;
-
- }
-
- inline static void LU_factor(gene_matrix & LU, Pivot_Vector & pivot, int N)
- {
-
- ASSERT( LU.rows()==LU.cols() ) ;
- int index_max = 0 ;
- real big = 0. ;
- real theSum = 0. ;
- real dum = 0. ;
- // Get the implicit scaling information :
- gene_vector ImplicitScaling( N ) ;
- for( int i=0; i<N; i++ ) {
- big = 0. ;
- for( int j=0; j<N; j++ ) {
- if( abs( LU( i, j ) )>=big ) big = abs( LU( i, j ) ) ;
- }
- if( big==0. ) {
- INFOS( "blitz_LU_factor::Singular matrix" ) ;
- exit( 0 ) ;
- }
- ImplicitScaling( i ) = 1./big ;
- }
- // Loop over columns of Crout's method :
- for( int j=0; j<N; j++ ) {
- for( int i=0; i<j; i++ ) {
- theSum = LU( i, j ) ;
- theSum -= matrix_matrix_product_sliced(LU, i, 0, i-1, LU, 0, j) ;
- // theSum -= sum( LU( i, Range( fromStart, i-1 ) )*LU( Range( fromStart, i-1 ), j ) ) ;
- LU( i, j ) = theSum ;
- }
-
- // Search for the largest pivot element :
- big = 0. ;
- for( int i=j; i<N; i++ ) {
- theSum = LU( i, j ) ;
- theSum -= matrix_matrix_product_sliced(LU, i, 0, j-1, LU, 0, j) ;
- // theSum -= sum( LU( i, Range( fromStart, j-1 ) )*LU( Range( fromStart, j-1 ), j ) ) ;
- LU( i, j ) = theSum ;
- if( (ImplicitScaling( i )*abs( theSum ))>=big ) {
- dum = ImplicitScaling( i )*abs( theSum ) ;
- big = dum ;
- index_max = i ;
- }
- }
- // Interchanging rows and the scale factor :
- if( j!=index_max ) {
- for( int k=0; k<N; k++ ) {
- dum = LU( index_max, k ) ;
- LU( index_max, k ) = LU( j, k ) ;
- LU( j, k ) = dum ;
- }
- ImplicitScaling( index_max ) = ImplicitScaling( j ) ;
- }
- pivot( j ) = index_max ;
- if ( LU( j, j )==0. ) LU( j, j ) = 1.e-20 ;
- // Divide by the pivot element :
- if( j<N ) {
- dum = 1./LU( j, j ) ;
- for( int i=j+1; i<N; i++ ) LU( i, j ) *= dum ;
- }
- }
-
- }
-
- inline static void LU_solve(const gene_matrix & LU, const Pivot_Vector pivot, gene_vector &B, gene_vector X, int N)
- {
-
- // Pour conserver le meme header, on travaille sur X, copie du second-membre B
- X = B.copy() ;
- ASSERT( LU.rows()==LU.cols() ) ;
- firstIndex indI ;
- // Forward substitution :
- int ii = 0 ;
- real theSum = 0. ;
- for( int i=0; i<N; i++ ) {
- int ip = pivot( i ) ;
- theSum = X( ip ) ;
- // theSum = B( ip ) ;
- X( ip ) = X( i ) ;
- // B( ip ) = B( i ) ;
- if( ii ) {
- theSum -= matrix_vector_product_sliced(LU, X, i, ii-1, i-1) ;
- // theSum -= sum( LU( i, Range( ii-1, i-1 ) )*X( Range( ii-1, i-1 ) ) ) ;
- // theSum -= sum( LU( i, Range( ii-1, i-1 ) )*B( Range( ii-1, i-1 ) ) ) ;
- } else if( theSum ) {
- ii = i+1 ;
- }
- X( i ) = theSum ;
- // B( i ) = theSum ;
- }
- // Backsubstitution :
- for( int i=N-1; i>=0; i-- ) {
- theSum = X( i ) ;
- // theSum = B( i ) ;
- theSum -= matrix_vector_product_sliced(LU, X, i, i+1, N) ;
- // theSum -= sum( LU( i, Range( i+1, toEnd ) )*X( Range( i+1, toEnd ) ) ) ;
- // theSum -= sum( LU( i, Range( i+1, toEnd ) )*B( Range( i+1, toEnd ) ) ) ;
- // Store a component of the solution vector :
- X( i ) = theSum/LU( i, i ) ;
- // B( i ) = theSum/LU( i, i ) ;
- }
-
- }
-
-};
-
-#endif
diff --git a/btl/libs/mtl4/mtl4_interface.hh b/btl/libs/mtl4/mtl4_interface.hh
deleted file mode 100644
index 3795ac6..0000000
--- a/btl/libs/mtl4/mtl4_interface.hh
+++ /dev/null
@@ -1,144 +0,0 @@
-//=====================================================
-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.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 MTL4_INTERFACE_HH
-#define MTL4_INTERFACE_HH
-
-#include <boost/numeric/mtl/mtl.hpp>
-#include <boost/numeric/mtl/utility/range_generator.hpp>
-// #include <boost/numeric/mtl/operation/cholesky.hpp>
-#include <vector>
-
-using namespace mtl;
-
-template<class real>
-class mtl4_interface {
-
-public :
-
- typedef real real_type ;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector > stl_matrix;
-
- typedef mtl::dense2D<real, mtl::matrix::parameters<mtl::tag::col_major> > gene_matrix;
- typedef mtl::dense_vector<real> gene_vector;
-
- static inline std::string name() { return "mtl4"; }
-
- static void free_matrix(gene_matrix & A, int N){
- return ;
- }
-
- static void free_vector(gene_vector & B){
- return ;
- }
-
- static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- A.change_dim(A_stl[0].size(), A_stl.size());
-
- for (int j=0; j<A_stl.size() ; j++){
- for (int i=0; i<A_stl[j].size() ; i++){
- A(i,j) = A_stl[j][i];
- }
- }
- }
-
- static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- B.change_dim(B_stl.size());
- for (int i=0; i<B_stl.size() ; i++){
- B[i] = B_stl[i];
- }
- }
-
- static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++){
- B_stl[i] = B[i];
- }
- }
-
- static inline void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N=A_stl.size();
- for (int j=0;j<N;j++){
- A_stl[j].resize(N);
- for (int i=0;i<N;i++){
- A_stl[j][i] = A(i,j);
- }
- }
- }
-
- static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- X = (A*B);
-// morton_dense<double, doppled_64_row_mask> C(N,N);
-// C = B;
-// X = (A*C);
- }
-
- static inline void transposed_matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- X = (trans(A)*trans(B));
- }
-
-// static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){
-// X = (trans(A)*A);
-// }
-
- static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){
- X = (A*trans(A));
- }
-
- static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = (A*B);
- }
-
- static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = (trans(A)*B);
- }
-
- static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
- Y += coef * X;
- }
-
- static inline void axpby(real a, const gene_vector & X, real b, gene_vector & Y, int N){
- 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 lu_decomp(const gene_matrix & X, gene_matrix & R, int N){
-// R = X;
-// std::vector<int> ipvt(N);
-// lu_factor(R, ipvt);
-// }
-
- static inline void trisolve_lower(const gene_matrix & L, const gene_vector& B, gene_vector & X, int N){
- X = lower_trisolve(L, B);
- }
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- cible = source;
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- cible = source;
- }
-
-};
-
-#endif
diff --git a/btl/libs/tvmet/CMakeLists.txt b/btl/libs/tvmet/CMakeLists.txt
deleted file mode 100644
index 25b565b..0000000
--- a/btl/libs/tvmet/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-find_package(Tvmet)
-if (TVMET_FOUND)
- include_directories(${TVMET_INCLUDE_DIR})
- btl_add_bench(btl_tvmet main.cpp OFF)
-endif (TVMET_FOUND)
diff --git a/btl/libs/tvmet/main.cpp b/btl/libs/tvmet/main.cpp
deleted file mode 100644
index 633215c..0000000
--- a/btl/libs/tvmet/main.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//=====================================================
-// File : main.cpp
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:30 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.
-//
-#include "utilities.h"
-#include "tvmet_interface.hh"
-#include "static/bench_static.hh"
-#include "action_matrix_vector_product.hh"
-#include "action_matrix_matrix_product.hh"
-#include "action_atv_product.hh"
-#include "action_axpy.hh"
-
-BTL_MAIN;
-
-int main()
-{
- bench_static<Action_axpy,tvmet_interface>();
- bench_static<Action_matrix_matrix_product,tvmet_interface>();
- bench_static<Action_matrix_vector_product,tvmet_interface>();
- bench_static<Action_atv_product,tvmet_interface>();
-
- return 0;
-}
-
-
diff --git a/btl/libs/tvmet/tvmet_interface.hh b/btl/libs/tvmet/tvmet_interface.hh
deleted file mode 100644
index b441ada..0000000
--- a/btl/libs/tvmet/tvmet_interface.hh
+++ /dev/null
@@ -1,104 +0,0 @@
-//=====================================================
-// File : tvmet_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:30 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 TVMET_INTERFACE_HH
-#define TVMET_INTERFACE_HH
-
-#include <tvmet/tvmet.h>
-#include <tvmet/Vector.h>
-#include <tvmet/Matrix.h>
-
-#include <vector>
-
-using namespace tvmet;
-
-template<class real, int SIZE>
-class tvmet_interface{
-
-public :
-
- typedef real real_type ;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector > stl_matrix;
-
- typedef Vector<real,SIZE> gene_vector;
- typedef Matrix<real,SIZE,SIZE> gene_matrix;
-
- static inline std::string name() { return "tiny_tvmet"; }
-
- static void free_matrix(gene_matrix & A, int N){}
-
- static void free_vector(gene_vector & B){}
-
- static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- for (int j=0; j<A_stl.size() ; j++)
- for (int i=0; i<A_stl[j].size() ; i++)
- A(i,j) = A_stl[j][i];
- }
-
- static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++)
- B[i]=B_stl[i];
- }
-
- static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++){
- B_stl[i]=B[i];
- }
- }
-
- static inline void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N = A_stl.size();
- for (int j=0;j<N;j++){
- A_stl[j].resize(N);
- for (int i=0;i<N;i++)
- A_stl[j][i] = A(i,j);
- }
- }
-
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- cible = source;
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- cible = source;
- }
-
- static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
- X = prod(A,B);
- }
-
- static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = prod(A,B);
- }
-
- static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = prod(trans(A),B);
- }
-
- static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
- Y+=coef*X;
- }
-
-};
-
-
-#endif
diff --git a/btl/libs/ublas/CMakeLists.txt b/btl/libs/ublas/CMakeLists.txt
deleted file mode 100644
index bdb58be..0000000
--- a/btl/libs/ublas/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
-find_package(Boost)
-if (Boost_FOUND)
- include_directories(${Boost_INCLUDE_DIRS})
- include_directories(${Boost_INCLUDES})
- btl_add_bench(btl_ublas main.cpp)
-endif (Boost_FOUND)
diff --git a/btl/libs/ublas/main.cpp b/btl/libs/ublas/main.cpp
deleted file mode 100644
index e2e77ee..0000000
--- a/btl/libs/ublas/main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//=====================================================
-// File : main.cpp
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:27 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.
-//
-#include "utilities.h"
-#include "ublas_interface.hh"
-#include "bench.hh"
-#include "basic_actions.hh"
-
-BTL_MAIN;
-
-int main()
-{
- bench<Action_axpy<ublas_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
- bench<Action_axpby<ublas_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
-
- bench<Action_matrix_vector_product<ublas_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
- bench<Action_atv_product<ublas_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-
- bench<Action_matrix_matrix_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// bench<Action_ata_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-// bench<Action_aat_product<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- bench<Action_trisolve<ublas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-
- return 0;
-}
-
-
diff --git a/btl/libs/ublas/ublas_interface.hh b/btl/libs/ublas/ublas_interface.hh
deleted file mode 100644
index 95cad51..0000000
--- a/btl/libs/ublas/ublas_interface.hh
+++ /dev/null
@@ -1,141 +0,0 @@
-//=====================================================
-// File : ublas_interface.hh
-// Author : L. Plagne <laurent.plagne@edf.fr)>
-// Copyright (C) EDF R&D, lun sep 30 14:23:27 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 UBLAS_INTERFACE_HH
-#define UBLAS_INTERFACE_HH
-
-#include <boost/numeric/ublas/vector.hpp>
-#include <boost/numeric/ublas/matrix.hpp>
-#include <boost/numeric/ublas/io.hpp>
-#include <boost/numeric/ublas/triangular.hpp>
-
-using namespace boost::numeric;
-
-template <class real>
-class ublas_interface{
-
-public :
-
- typedef real real_type ;
-
- typedef std::vector<real> stl_vector;
- typedef std::vector<stl_vector> stl_matrix;
-
- typedef typename boost::numeric::ublas::matrix<real,boost::numeric::ublas::column_major> gene_matrix;
- typedef typename boost::numeric::ublas::vector<real> gene_vector;
-
- static inline std::string name( void ) { return "ublas"; }
-
- static void free_matrix(gene_matrix & A, int N) {}
-
- static void free_vector(gene_vector & B) {}
-
- static inline void matrix_from_stl(gene_matrix & A, stl_matrix & A_stl){
- A.resize(A_stl.size(),A_stl[0].size());
- for (int j=0; j<A_stl.size() ; j++)
- for (int i=0; i<A_stl[j].size() ; i++)
- A(i,j)=A_stl[j][i];
- }
-
- static inline void vector_from_stl(gene_vector & B, stl_vector & B_stl){
- B.resize(B_stl.size());
- for (int i=0; i<B_stl.size() ; i++)
- B(i)=B_stl[i];
- }
-
- static inline void vector_to_stl(gene_vector & B, stl_vector & B_stl){
- for (int i=0; i<B_stl.size() ; i++)
- B_stl[i]=B(i);
- }
-
- static inline void matrix_to_stl(gene_matrix & A, stl_matrix & A_stl){
- int N=A_stl.size();
- for (int j=0;j<N;j++)
- {
- A_stl[j].resize(N);
- for (int i=0;i<N;i++)
- A_stl[j][i]=A(i,j);
- }
- }
-
- static inline void copy_vector(const gene_vector & source, gene_vector & cible, int N){
- for (int i=0;i<N;i++){
- cible(i) = source(i);
- }
- }
-
- static inline void copy_matrix(const gene_matrix & source, gene_matrix & cible, int N){
- for (int i=0;i<N;i++){
- for (int j=0;j<N;j++){
- cible(i,j) = source(i,j);
- }
- }
- }
-
- static inline void matrix_vector_product_slow(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X = prod(A,B);
- }
-
- static inline void matrix_matrix_product_slow(gene_matrix & A, gene_matrix & B, gene_matrix & X, int N){
- X = prod(A,B);
- }
-
- static inline void axpy_slow(const real coef, const gene_vector & X, gene_vector & Y, int N){
- Y+=coef*X;
- }
-
- // alias free assignements
-
- static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X.assign(prod(A,B));
- }
-
- static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
- X.assign(prod(trans(A),B));
- }
-
- static inline void matrix_matrix_product(gene_matrix & A, gene_matrix & B, gene_matrix & X, int N){
- X.assign(prod(A,B));
- }
-
- static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
- Y.plus_assign(coef*X);
- }
-
- static inline void axpby(real a, const gene_vector & X, real b, gene_vector & Y, int N){
- Y = a*X + b*Y;
- }
-
- static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){
- // X = prod(trans(A),A);
- X.assign(prod(trans(A),A));
- }
-
- static inline void aat_product(gene_matrix & A, gene_matrix & X, int N){
- // X = prod(A,trans(A));
- X.assign(prod(A,trans(A)));
- }
-
- static inline void trisolve_lower(const gene_matrix & L, const gene_vector& B, gene_vector & X, int N){
- X = solve(L, B, ublas::lower_tag ());
- }
-
-};
-
-#endif
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-15 19:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15 19:52 [gentoo-commits] proj/auto-numerical-bench:master commit in: btl/libs/gmm/, btl/libs/ublas/, /, btl/libs/blitz/, btl/libs/mtl4/, Andrea Arteaga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox