diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-06-20 16:30:34 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-06-20 16:30:34 +0200 |
| commit | ec0a8b2e6dab9af4b4fc6c91d2ab7b01e47ea5ce (patch) | |
| tree | a157e4da4b8d3514b798b053cf6cc62193ade7f8 /test/vectorization_logic.cpp | |
| parent | 7fa87a8b12fbc6a3e8af91fc773ba054e59a5ae5 (diff) | |
rm conflict
Diffstat (limited to 'test/vectorization_logic.cpp')
| -rw-r--r-- | test/vectorization_logic.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/vectorization_logic.cpp b/test/vectorization_logic.cpp index 1fb079c48..5c6e8042d 100644 --- a/test/vectorization_logic.cpp +++ b/test/vectorization_logic.cpp @@ -232,12 +232,8 @@ template<typename Scalar, bool Enable = internal::packet_traits<Scalar>::Vectori Matrix<Scalar,EIGEN_PLAIN_ENUM_MAX(2,PacketSize),EIGEN_PLAIN_ENUM_MAX(2,PacketSize)> >(DefaultTraversal,CompleteUnrolling))); -<<<<<<< local - VERIFY((test_assign(Matrix11(), Matrix11().lazyProduct(Matrix11()), InnerVectorizedTraversal, CompleteUnrolling))); -======= VERIFY((test_assign(Matrix11(), Matrix<Scalar,PacketSize,EIGEN_PLAIN_ENUM_MIN(2,PacketSize)>()*Matrix<Scalar,EIGEN_PLAIN_ENUM_MIN(2,PacketSize),PacketSize>(), PacketSize>=EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD?DefaultTraversal:InnerVectorizedTraversal, CompleteUnrolling))); ->>>>>>> other #endif VERIFY(test_assign(MatrixXX(10,10),MatrixXX(20,20).block(10,10,2,3), |