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

improve sparse permutations

Browse Source
This commit is contained in:
Charles Schlosser
2023-01-15 03:21:25 +00:00
parent 2e61c0c6b4
commit fa0bd2c34e
3 changed files with 181 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/sparse_permutations.cpp
View File

@@ -17,6 +17,15 @@ static long int nb_transposed_copies;
VERIFY( (#XPR) && nb_transposed_copies==N ); \
}
static long int nb_temporaries;
#define EIGEN_SPARSE_CREATE_TEMPORARY_PLUGIN {nb_temporaries++;}
#define VERIFY_TEMPORARY_COUNT(XPR,N) {\
nb_temporaries = 0; \
XPR; \
if(nb_temporaries!=N) std::cerr << "nb_temporaries == " << nb_temporaries << "\n"; \
VERIFY( (#XPR) && nb_temporaries==N ); \
}
#include "sparse.h"
template<typename T>
@@ -79,28 +88,52 @@ template<int OtherStorage, typename SparseMatrixType> void sparse_permutations(c
VERIFY( is_sorted( ::eval(mat*p) ));
VERIFY( is_sorted( res = mat*p ));
VERIFY_TRANSPOSITION_COUNT( ::eval(mat*p), 0);
//VERIFY_TRANSPOSITION_COUNT( res = mat*p, IsRowMajor ? 1 : 0 );
VERIFY_TEMPORARY_COUNT( ::eval(mat*p), 1)
res_d = mat_d*p;
VERIFY(res.isApprox(res_d) && "mat*p");
VERIFY( is_sorted( ::eval(p*mat) ));
VERIFY( is_sorted( res = p*mat ));
VERIFY_TRANSPOSITION_COUNT( ::eval(p*mat), 0);
VERIFY_TEMPORARY_COUNT( ::eval(p*mat), 1);
res_d = p*mat_d;
VERIFY(res.isApprox(res_d) && "p*mat");
VERIFY( is_sorted( (mat*p).eval() ));
VERIFY( is_sorted( res = mat*p.inverse() ));
VERIFY_TRANSPOSITION_COUNT( ::eval(mat*p.inverse()), 0);
VERIFY_TEMPORARY_COUNT( ::eval(mat*p.inverse()), 1);
res_d = mat*p.inverse();
VERIFY(res.isApprox(res_d) && "mat*inv(p)");
VERIFY( is_sorted( (p*mat+p*mat).eval() ));
VERIFY( is_sorted( res = p.inverse()*mat ));
VERIFY_TRANSPOSITION_COUNT( ::eval(p.inverse()*mat), 0);
VERIFY_TEMPORARY_COUNT( ::eval(p.inverse()*mat), 1);
res_d = p.inverse()*mat_d;
VERIFY(res.isApprox(res_d) && "inv(p)*mat");
// test non-plaintype expressions that require additional temporary
const Scalar alpha(2.34);
res_d = p * (alpha * mat_d);
VERIFY_TEMPORARY_COUNT( res = p * (alpha * mat), 2);
VERIFY( res.isApprox(res_d) && "p*(alpha*mat)" );
res_d = (alpha * mat_d) * p;
VERIFY_TEMPORARY_COUNT( res = (alpha * mat) * p, 2);
VERIFY( res.isApprox(res_d) && "(alpha*mat)*p" );
res_d = p.inverse() * (alpha * mat_d);
VERIFY_TEMPORARY_COUNT( res = p.inverse() * (alpha * mat), 2);
VERIFY( res.isApprox(res_d) && "inv(p)*(alpha*mat)" );
res_d = (alpha * mat_d) * p.inverse();
VERIFY_TEMPORARY_COUNT( res = (alpha * mat) * p.inverse(), 2);
VERIFY( res.isApprox(res_d) && "(alpha*mat)*inv(p)" );
//
VERIFY( is_sorted( (p * mat * p.inverse()).eval() ));
VERIFY( is_sorted( res = mat.twistedBy(p) ));
VERIFY_TRANSPOSITION_COUNT( ::eval(p * mat * p.inverse()), 0);