GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-20 08:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve counting of sparse temporaries

Browse Source
This commit is contained in:
Gael Guennebaud 2015-10-06 11:32:02 +02:00
parent 1879917d35
commit 6100d1ae64
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -665,8 +665,15 @@ class SparseMatrix
YOU_MIXED_DIFFERENT_NUMERIC_TYPES__YOU_NEED_TO_USE_THE_CAST_METHOD_OF_MATRIXBASE_TO_CAST_NUMERIC_TYPES_EXPLICITLY) YOU_MIXED_DIFFERENT_NUMERIC_TYPES__YOU_NEED_TO_USE_THE_CAST_METHOD_OF_MATRIXBASE_TO_CAST_NUMERIC_TYPES_EXPLICITLY)
check_template_parameters(); check_template_parameters();
const bool needToTranspose = (Flags & RowMajorBit) != (internal::evaluator<OtherDerived>::Flags & RowMajorBit); const bool needToTranspose = (Flags & RowMajorBit) != (internal::evaluator<OtherDerived>::Flags & RowMajorBit);
if (needToTranspose) *this = other.derived(); if (needToTranspose)
else internal::call_assignment_no_alias(*this, other.derived()); *this = other.derived();
else
{
#ifdef EIGEN_SPARSE_CREATE_TEMPORARY_PLUGIN
EIGEN_SPARSE_CREATE_TEMPORARY_PLUGIN
#endif
internal::call_assignment_no_alias(*this, other.derived());
}
} }
/** Constructs a sparse matrix from the sparse selfadjoint view \a other */ /** Constructs a sparse matrix from the sparse selfadjoint view \a other */

5
test/sparse_ref.cpp
View File

@ -64,6 +64,7 @@ void call_ref()
const SparseMatrix<float>& Ac(A); const SparseMatrix<float>& Ac(A);
Block<SparseMatrix<float> > Ab(A,0,1, 3,3); Block<SparseMatrix<float> > Ab(A,0,1, 3,3);
const Block<SparseMatrix<float> > Abc(A,0,1,3,3); const Block<SparseMatrix<float> > Abc(A,0,1,3,3);
SparseMatrix<float> AA = A*A;
VERIFY_EVALUATION_COUNT( call_ref_1(A, A), 0); VERIFY_EVALUATION_COUNT( call_ref_1(A, A), 0);
@ -80,8 +81,8 @@ void call_ref()
VERIFY_EVALUATION_COUNT( call_ref_3(B, B), 1); VERIFY_EVALUATION_COUNT( call_ref_3(B, B), 1);
VERIFY_EVALUATION_COUNT( call_ref_2(B.transpose(), B.transpose()), 0); VERIFY_EVALUATION_COUNT( call_ref_2(B.transpose(), B.transpose()), 0);
VERIFY_EVALUATION_COUNT( call_ref_3(B.transpose(), B.transpose()), 0); VERIFY_EVALUATION_COUNT( call_ref_3(B.transpose(), B.transpose()), 0);
VERIFY_EVALUATION_COUNT( call_ref_2(A*A, A*A), 1); VERIFY_EVALUATION_COUNT( call_ref_2(A*A, AA), 1);
VERIFY_EVALUATION_COUNT( call_ref_3(A*A, A*A), 1); VERIFY_EVALUATION_COUNT( call_ref_3(A*A, AA), 1);
VERIFY(!C.isCompressed()); VERIFY(!C.isCompressed());
VERIFY_EVALUATION_COUNT( call_ref_3(C, C), 1); VERIFY_EVALUATION_COUNT( call_ref_3(C, C), 1);