commit b22fc6cdc316a11a5bc15870f05472e9b0613298
author Gael Guennebaud <g.gael@free.fr> Thu Jun 24 17:51:25 2010 +0200
committer Gael Guennebaud <g.gael@free.fr> Thu Jun 24 17:51:25 2010 +0200
tree bea4ccbf0ffb94cd4c773ba2c16e0802d6c1a3c8
parent 7e836ccb4c973269905c0e819b6930b89bd5a662

bug fix in gemv:
solution always use a temporary in dst.innerStride != 1
even though this is not needed when packet_size == 1....

Eigen/src/Core/Product.h

diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h
index 7e68a57..18aaba3 100644
--- a/Eigen/src/Core/Product.h
+++ b/Eigen/src/Core/Product.h
@@ -330,9 +330,10 @@
                                * RhsBlasTraits::extractScalarFactor(prod.rhs());
 
     enum {
-      EvalToDest = (ei_packet_traits<Scalar>::size==1)
-                 ||((Dest::Flags&ActualPacketAccessBit) && (!(Dest::Flags & RowMajorBit)))
+      // FIXME find a way to allow an inner stride on the result if ei_packet_traits<Scalar>::size==1
+      EvalToDest = (Dest::Flags&ActualPacketAccessBit) && (Dest::InnerStrideAtCompileTime==1)
     };
+
     Scalar* EIGEN_RESTRICT actualDest;
     if (EvalToDest)
       actualDest = &dest.coeffRef(0);

test/product.h

diff --git a/test/product.h b/test/product.h
index 5365a7d..804ce13 100644
--- a/test/product.h
+++ b/test/product.h
@@ -45,7 +45,7 @@
   typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime> RowSquareMatrixType;
   typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, MatrixType::ColsAtCompileTime> ColSquareMatrixType;
   typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime,
-                         MatrixType::Flags&RowMajorBit> OtherMajorMatrixType;
+                         MatrixType::Flags&RowMajorBit?ColMajor:RowMajor> OtherMajorMatrixType;
 
   Index rows = m.rows();
   Index cols = m.cols();
@@ -152,6 +152,9 @@
     VERIFY(areNotApprox(res2,square2 + m2.transpose() * m1));
   }
 
+  VERIFY_IS_APPROX(res.col(r).noalias() = square.adjoint() * square.col(r), (square.adjoint() * square.col(r)).eval());
+  VERIFY_IS_APPROX(res.col(r).noalias() = square * square.col(r), (square * square.col(r)).eval());
+
   // inner product
   Scalar x = square2.row(c) * square2.col(c2);
   VERIFY_IS_APPROX(x, square2.row(c).transpose().cwiseProduct(square2.col(c2)).sum());

test/product_large.cpp

diff --git a/test/product_large.cpp b/test/product_large.cpp
index e5f6e12..2d36c5a 100644
--- a/test/product_large.cpp
+++ b/test/product_large.cpp
@@ -30,7 +30,7 @@
     CALL_SUBTEST_1( product(MatrixXf(ei_random<int>(1,320), ei_random<int>(1,320))) );
     CALL_SUBTEST_2( product(MatrixXd(ei_random<int>(1,320), ei_random<int>(1,320))) );
     CALL_SUBTEST_3( product(MatrixXi(ei_random<int>(1,320), ei_random<int>(1,320))) );
-    CALL_SUBTEST_4( product(MatrixXcf(ei_random<int>(1,50), ei_random<int>(1,50))) );
+    CALL_SUBTEST_4( product(MatrixXcf(ei_random<int>(1,150), ei_random<int>(1,150))) );
     CALL_SUBTEST_5( product(Matrix<float,Dynamic,Dynamic,RowMajor>(ei_random<int>(1,320), ei_random<int>(1,320))) );
   }