devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

sparse module:

Browse Source 
- remove some useless stuff => let's focus on a single sparse matrix format
 - finalize the new RandomSetter
This commit is contained in:
Gael Guennebaud
2008-10-21 13:35:04 +00:00
parent 9e02e42ff6
commit cf0f82ecbe
12 changed files with 316 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bench/sparse_cholesky.cpp
View File

@@ -1,5 +1,5 @@
#define EIGEN_TAUCS_SUPPORT
#define EIGEN_CHOLMOD_SUPPORT
// #define EIGEN_TAUCS_SUPPORT
// #define EIGEN_CHOLMOD_SUPPORT
#include <Eigen/Sparse>
// 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[])

101
bench/sparse_randomsetter.cpp
View File

@@ -37,6 +37,31 @@
X \
} timer.stop(); }
static double rtime;
static double nentries;
template<typename SetterType>
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<nentries; ++k)
(*set1)(ei_random<int>(0,rows-1),ei_random<int>(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<n; ++k)
for (int k=0; k<nentries; ++k)
dummy = ei_random<int>(0,rows-1) + ei_random<int>(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<EigenSparseMatrix,StdMapTraits,Bits> set1(sm1);
t.reset(); t.start();
for (int k=0; k<n; ++k)
set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
t.stop();
std::cout << "std::map => \t" << t.value()-rtime
<< " nnz=" << set1.nonZeros() << "\n";getchar();
}
{
RandomSetter<EigenSparseMatrix,GnuHashMapTraits,Bits> set1(sm1);
t.reset(); t.start();
for (int k=0; k<n; ++k)
set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
t.stop();
std::cout << "gnu::hash_map => \t" << t.value()-rtime
<< " nnz=" << set1.nonZeros() << "\n";getchar();
}
{
RandomSetter<EigenSparseMatrix,GoogleDenseHashMapTraits,Bits> set1(sm1);
t.reset(); t.start();
for (int k=0; k<n; ++k)
set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
t.stop();
std::cout << "google::dense => \t" << t.value()-rtime
<< " nnz=" << set1.nonZeros() << "\n";getchar();
}
{
RandomSetter<EigenSparseMatrix,GoogleSparseHashMapTraits,Bits> set1(sm1);
t.reset(); t.start();
for (int k=0; k<n; ++k)
set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
t.stop();
std::cout << "google::sparse => \t" << t.value()-rtime
<< " nnz=" << set1.nonZeros() << "\n";getchar();
}
dostuff<RandomSetter<EigenSparseMatrix,StdMapTraits,Bits> >("std::map ", sm1);
dostuff<RandomSetter<EigenSparseMatrix,GnuHashMapTraits,Bits> >("gnu::hash_map", sm1);
dostuff<RandomSetter<EigenSparseMatrix,GoogleDenseHashMapTraits,Bits> >("google::dense", sm1);
dostuff<RandomSetter<EigenSparseMatrix,GoogleSparseHashMapTraits,Bits> >("google::sparse", sm1);
// {
// RandomSetter<EigenSparseMatrix,GnuHashMapTraits,Bits> set1(sm1);
// t.reset(); t.start();
// for (int k=0; k<n; ++k)
// set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
// t.stop();
// std::cout << "gnu::hash_map => \t" << t.value()-rtime
// << " nnz=" << set1.nonZeros() << "\n";getchar();
// }
// {
// RandomSetter<EigenSparseMatrix,GoogleDenseHashMapTraits,Bits> set1(sm1);
// t.reset(); t.start();
// for (int k=0; k<n; ++k)
// set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
// t.stop();
// std::cout << "google::dense => \t" << t.value()-rtime
// << " nnz=" << set1.nonZeros() << "\n";getchar();
// }
// {
// RandomSetter<EigenSparseMatrix,GoogleSparseHashMapTraits,Bits> set1(sm1);
// t.reset(); t.start();
// for (int k=0; k<n; ++k)
// set1(ei_random<int>(0,rows-1),ei_random<int>(0,cols-1)) += 1;
// t.stop();
// std::cout << "google::sparse => \t" << t.value()-rtime
// << " nnz=" << set1.nonZeros() << "\n";getchar();
// }
std::cout << "\n\n";
}