From cf0f82ecbe1b92ec44e8fe34f65d6183059c9491 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 21 Oct 2008 13:35:04 +0000 Subject: sparse module: - remove some useless stuff => let's focus on a single sparse matrix format - finalize the new RandomSetter --- bench/sparse_cholesky.cpp | 6 +-- bench/sparse_randomsetter.cpp | 101 +++++++++++++++++++++++++----------------- 2 files changed, 64 insertions(+), 43 deletions(-) (limited to 'bench') diff --git a/bench/sparse_cholesky.cpp b/bench/sparse_cholesky.cpp index d1d29c152..0a17848a0 100644 --- a/bench/sparse_cholesky.cpp +++ b/bench/sparse_cholesky.cpp @@ -1,5 +1,5 @@ -#define EIGEN_TAUCS_SUPPORT -#define EIGEN_CHOLMOD_SUPPORT +// #define EIGEN_TAUCS_SUPPORT +// #define EIGEN_CHOLMOD_SUPPORT #include // g++ -DSIZE=10000 -DDENSITY=0.001 sparse_cholesky.cpp -I.. -DDENSEMATRI -O3 -g0 -DNDEBUG -DNBTRIES=1 -I /home/gael/Coding/LinearAlgebra/taucs_full/src/ -I/home/gael/Coding/LinearAlgebra/taucs_full/build/linux/ -L/home/gael/Coding/LinearAlgebra/taucs_full/lib/linux/ -ltaucs /home/gael/Coding/LinearAlgebra/GotoBLAS/libgoto.a -lpthread -I /home/gael/Coding/LinearAlgebra/SuiteSparse/CHOLMOD/Include/ $CHOLLIB -I /home/gael/Coding/LinearAlgebra/SuiteSparse/UFconfig/ /home/gael/Coding/LinearAlgebra/SuiteSparse/CCOLAMD/Lib/libccolamd.a /home/gael/Coding/LinearAlgebra/SuiteSparse/CHOLMOD/Lib/libcholmod.a -lmetis /home/gael/Coding/LinearAlgebra/SuiteSparse/AMD/Lib/libamd.a /home/gael/Coding/LinearAlgebra/SuiteSparse/CAMD/Lib/libcamd.a /home/gael/Coding/LinearAlgebra/SuiteSparse/CCOLAMD/Lib/libccolamd.a /home/gael/Coding/LinearAlgebra/SuiteSparse/COLAMD/Lib/libcolamd.a -llapack && ./a.out @@ -70,7 +70,7 @@ void doEigen(const char* name, const EigenSparseSelfAdjointMatrix& sm1, int flag std::cout << ":\t" << timer.value() << endl; std::cout << " nnz: " << sm1.nonZeros() << " => " << chol.matrixL().nonZeros() << "\n"; - //std::cout << "sparse\n" << chol.matrixL() << "%\n"; + std::cout << "sparse\n" << chol.matrixL() << "%\n"; } int main(int argc, char *argv[]) diff --git a/bench/sparse_randomsetter.cpp b/bench/sparse_randomsetter.cpp index 7868e177a..61753d8c2 100644 --- a/bench/sparse_randomsetter.cpp +++ b/bench/sparse_randomsetter.cpp @@ -37,6 +37,31 @@ X \ } timer.stop(); } + +static double rtime; +static double nentries; + +template +void dostuff(const char* name, EigenSparseMatrix& sm1) +{ + int rows = sm1.rows(); + int cols = sm1.cols(); + sm1.setZero(); + BenchTimer t; + SetterType* set1 = new SetterType(sm1); + t.reset(); t.start(); + for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; + t.stop(); + std::cout << "std::map => \t" << t.value()-rtime + << " nnz=" << set1->nonZeros() << std::flush; + + // getchar(); + + t.reset(); t.start(); delete set1; t.stop(); + std::cout << " back: \t" << t.value() << "\n"; +} + int main(int argc, char *argv[]) { int rows = SIZE; @@ -46,56 +71,52 @@ int main(int argc, char *argv[]) EigenSparseMatrix sm1(rows,cols), sm2(rows,cols); - int n = rows*cols*density; - std::cout << "n = " << n << "\n"; + nentries = rows*cols*density; + std::cout << "n = " << nentries << "\n"; int dummy; BenchTimer t; t.reset(); t.start(); - for (int k=0; k(0,rows-1) + ei_random(0,cols-1); t.stop(); - double rtime = t.value(); + rtime = t.value(); std::cout << "rtime = " << rtime << " (" << dummy << ")\n\n"; const int Bits = 6; for (;;) { - { - RandomSetter set1(sm1); - t.reset(); t.start(); - for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; - t.stop(); - std::cout << "std::map => \t" << t.value()-rtime - << " nnz=" << set1.nonZeros() << "\n";getchar(); - } - { - RandomSetter set1(sm1); - t.reset(); t.start(); - for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; - t.stop(); - std::cout << "gnu::hash_map => \t" << t.value()-rtime - << " nnz=" << set1.nonZeros() << "\n";getchar(); - } - { - RandomSetter set1(sm1); - t.reset(); t.start(); - for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; - t.stop(); - std::cout << "google::dense => \t" << t.value()-rtime - << " nnz=" << set1.nonZeros() << "\n";getchar(); - } - { - RandomSetter set1(sm1); - t.reset(); t.start(); - for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; - t.stop(); - std::cout << "google::sparse => \t" << t.value()-rtime - << " nnz=" << set1.nonZeros() << "\n";getchar(); - } + dostuff >("std::map ", sm1); + dostuff >("gnu::hash_map", sm1); + dostuff >("google::dense", sm1); + dostuff >("google::sparse", sm1); + +// { +// RandomSetter set1(sm1); +// t.reset(); t.start(); +// for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; +// t.stop(); +// std::cout << "gnu::hash_map => \t" << t.value()-rtime +// << " nnz=" << set1.nonZeros() << "\n";getchar(); +// } +// { +// RandomSetter set1(sm1); +// t.reset(); t.start(); +// for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; +// t.stop(); +// std::cout << "google::dense => \t" << t.value()-rtime +// << " nnz=" << set1.nonZeros() << "\n";getchar(); +// } +// { +// RandomSetter set1(sm1); +// t.reset(); t.start(); +// for (int k=0; k(0,rows-1),ei_random(0,cols-1)) += 1; +// t.stop(); +// std::cout << "google::sparse => \t" << t.value()-rtime +// << " nnz=" << set1.nonZeros() << "\n";getchar(); +// } std::cout << "\n\n"; } -- cgit v1.2.3