aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/src/KroneckerProduct
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2014-02-14 14:46:01 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2014-02-14 14:46:01 +0100
commit3283d98d1378ccd3a8c89eec1d88108ddd517d95 (patch)
tree42193cf1b6b7fc3c2051df808aeb03d817e393ea /unsupported/Eigen/src/KroneckerProduct
parent0d3f496233ceb0e96da0a39e360e5bdd5c89c0e3 (diff)
optimize sparse-sparse Kronecker product
Diffstat (limited to 'unsupported/Eigen/src/KroneckerProduct')
-rw-r--r--unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h b/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h
index a4516056d..b8f2cba17 100644
--- a/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h
+++ b/unsupported/Eigen/src/KroneckerProduct/KroneckerTensorProduct.h
@@ -153,7 +153,22 @@ void KroneckerProductSparse<Lhs,Rhs>::evalTo(Dest& dst) const
Bc = m_B.cols();
dst.resize(this->rows(), this->cols());
dst.resizeNonZeros(0);
- dst.reserve(m_A.nonZeros() * m_B.nonZeros());
+
+ // compute number of non-zeros per innervectors of dst
+ {
+ VectorXi nnzA = VectorXi::Zero(Dest::IsRowMajor ? m_A.rows() : m_A.cols());
+ for (Index kA=0; kA < m_A.outerSize(); ++kA)
+ for (typename Lhs::InnerIterator itA(m_A,kA); itA; ++itA)
+ nnzA(Dest::IsRowMajor ? itA.row() : itA.col())++;
+
+ VectorXi nnzB = VectorXi::Zero(Dest::IsRowMajor ? m_B.rows() : m_B.cols());
+ for (Index kB=0; kB < m_B.outerSize(); ++kB)
+ for (typename Rhs::InnerIterator itB(m_B,kB); itB; ++itB)
+ nnzB(Dest::IsRowMajor ? itB.row() : itB.col())++;
+
+ Matrix<int,Dynamic,Dynamic,ColMajor> nnzAB = nnzB * nnzA.transpose();
+ dst.reserve(VectorXi::Map(nnzAB.data(), nnzAB.size()));
+ }
for (Index kA=0; kA < m_A.outerSize(); ++kA)
{