aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2010-07-06 19:15:02 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2010-07-06 19:15:02 +0200
commite04c3f2cc02d8c4c5378f297ff19cb9251514f94 (patch)
treef0776dcc718f8368892b9513d0d588bd77feadca
parentd6454788d960180e49aa84047ebb3aa75013032d (diff)
reduce code generation and minor speed up
-rw-r--r--Eigen/src/Core/products/GeneralMatrixMatrix.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h
index 5d63aee3d..5150daacd 100644
--- a/Eigen/src/Core/products/GeneralMatrixMatrix.h
+++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h
@@ -80,9 +80,9 @@ static void run(Index rows, Index cols, Index depth,
Index mc = std::min(rows,blocking.mc()); // cache block size along the M direction
//Index nc = blocking.nc(); // cache block size along the N direction
- ei_gemm_pack_lhs<Scalar, Index, Blocking::mr, LhsStorageOrder, ConjugateLhs> pack_lhs;
- ei_gemm_pack_rhs<Scalar, Index, Blocking::nr, RhsStorageOrder, ConjugateRhs> pack_rhs;
- ei_gebp_kernel<Scalar, Index, Blocking::mr, Blocking::nr> gebp;
+ ei_gemm_pack_lhs<Scalar, Index, Blocking::mr, LhsStorageOrder> pack_lhs;
+ ei_gemm_pack_rhs<Scalar, Index, Blocking::nr, RhsStorageOrder> pack_rhs;
+ ei_gebp_kernel<Scalar, Index, Blocking::mr, Blocking::nr, ConjugateLhs, ConjugateRhs> gebp;
#ifdef EIGEN_HAS_OPENMP
if(info)
@@ -234,7 +234,7 @@ struct ei_gemm_functor
{
if(cols==-1)
cols = m_rhs.cols();
-
+
Gemm::run(rows, cols, m_lhs.cols(),
(const Scalar*)&(m_lhs.const_cast_derived().coeffRef(row,0)), m_lhs.outerStride(),
(const Scalar*)&(m_rhs.const_cast_derived().coeffRef(0,col)), m_rhs.outerStride(),