From 01553c419ebab54baa15a0921879dee8cff2d234 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 25 Jun 2010 11:44:55 +0200 Subject: [PATCH] fox blcok size computation for fixed size objects --- Eigen/src/Core/products/GeneralMatrixMatrix.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h index e8dceeb74..fd2ce003e 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h @@ -257,7 +257,7 @@ class ei_level3_blocking { typedef _LhsScalar LhsScalar; typedef _RhsScalar RhsScalar; - + protected: LhsScalar* m_blockA; RhsScalar* m_blockB; @@ -297,8 +297,8 @@ class ei_gemm_blocking_space::ret RhsScalar; typedef ei_product_blocking_traits Blocking; enum { - SizeA = ActualCols * MaxDepth, - SizeB = ActualRows * MaxDepth, + SizeA = ActualRows * MaxDepth, + SizeB = ActualCols * MaxDepth, SizeW = MaxDepth * Blocking::nr * ei_packet_traits::size }; @@ -308,7 +308,7 @@ class ei_gemm_blocking_spacem_mc = ActualRows; this->m_nc = ActualCols; @@ -416,7 +416,7 @@ class GeneralProduct typedef ei_gemm_blocking_space<(Dest::Flags&RowMajorBit) ? RowMajor : ColMajor,Scalar,Scalar, Dest::MaxRowsAtCompileTime,Dest::MaxColsAtCompileTime,MaxDepthAtCompileTime> BlockingType; - + typedef ei_gemm_functor< Scalar, Index, ei_general_matrix_matrix_product< @@ -425,7 +425,7 @@ class GeneralProduct (_ActualRhsType::Flags&RowMajorBit) ? RowMajor : ColMajor, bool(RhsBlasTraits::NeedToConjugate), (Dest::Flags&RowMajorBit) ? RowMajor : ColMajor>, _ActualLhsType, _ActualRhsType, Dest, BlockingType> GemmFunctor; - + BlockingType blocking(dst.rows(), dst.cols(), lhs.cols()); ei_parallelize_gemm<(Dest::MaxRowsAtCompileTime>32 || Dest::MaxRowsAtCompileTime==Dynamic)>(GemmFunctor(lhs, rhs, dst, actualAlpha, blocking), this->rows(), this->cols());