[eigen3] 02/05: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Aug 1 16:03:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository eigen3.
commit 61f2b27d564f3cef925362e39d890156010cd620
Author: Anton Gladky <gladk at debian.org>
Date: Mon Aug 1 17:45:34 2016 +0200
Refresh patches.
---
debian/patches/02_remove_buildtype_check.patch | 6 +-
debian/patches/04_remove_piwik.patch | 6 +-
debian/patches/05_remove_html_timestamp.patch | 8 +-
debian/patches/06_remove_doc_matrix.patch | 6 +-
debian/patches/07_remove_compressed_doc.patch | 8 +-
debian/patches/08_fix_path_FindEigen3.patch | 8 +-
debian/patches/09_fix_1144.patch | 299 -------------------------
debian/patches/series | 1 -
8 files changed, 21 insertions(+), 321 deletions(-)
diff --git a/debian/patches/02_remove_buildtype_check.patch b/debian/patches/02_remove_buildtype_check.patch
index 7a4e73e..cd8992d 100644
--- a/debian/patches/02_remove_buildtype_check.patch
+++ b/debian/patches/02_remove_buildtype_check.patch
@@ -2,10 +2,10 @@ Description: Remove build type check in cmake
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: eigen3/CMakeLists.txt
+Index: eigen-eigen-69d418c06999/CMakeLists.txt
===================================================================
---- eigen3.orig/CMakeLists.txt
-+++ eigen3/CMakeLists.txt
+--- eigen-eigen-69d418c06999.orig/CMakeLists.txt
++++ eigen-eigen-69d418c06999/CMakeLists.txt
@@ -15,12 +15,6 @@ if (NOT CMAKE_BUILD_TYPE)
endif()
diff --git a/debian/patches/04_remove_piwik.patch b/debian/patches/04_remove_piwik.patch
index 53c1e45..5e0ee42 100644
--- a/debian/patches/04_remove_piwik.patch
+++ b/debian/patches/04_remove_piwik.patch
@@ -2,10 +2,10 @@ Description: remove piwik scripts.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: eigen3/doc/eigendoxy_footer.html.in
+Index: eigen-eigen-69d418c06999/doc/eigendoxy_footer.html.in
===================================================================
---- eigen3.orig/doc/eigendoxy_footer.html.in
-+++ eigen3/doc/eigendoxy_footer.html.in
+--- eigen-eigen-69d418c06999.orig/doc/eigendoxy_footer.html.in
++++ eigen-eigen-69d418c06999/doc/eigendoxy_footer.html.in
@@ -17,19 +17,6 @@ $generatedby <a href="http://www.d
</small></address>
<!--END !GENERATE_TREEVIEW-->
diff --git a/debian/patches/05_remove_html_timestamp.patch b/debian/patches/05_remove_html_timestamp.patch
index 37d8cc7..40db1fd 100644
--- a/debian/patches/05_remove_html_timestamp.patch
+++ b/debian/patches/05_remove_html_timestamp.patch
@@ -2,11 +2,11 @@ Description: Do not set HTML_TIMESTAMP in documentation
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-17
-Index: eigen3/doc/Doxyfile.in
+Index: eigen-eigen-69d418c06999/doc/Doxyfile.in
===================================================================
---- eigen3.orig/doc/Doxyfile.in
-+++ eigen3/doc/Doxyfile.in
-@@ -1008,7 +1008,7 @@ HTML_COLORSTYLE_GAMMA = 80
+--- eigen-eigen-69d418c06999.orig/doc/Doxyfile.in
++++ eigen-eigen-69d418c06999/doc/Doxyfile.in
+@@ -1013,7 +1013,7 @@ HTML_COLORSTYLE_GAMMA = 80
# page will contain the date and time when the page was generated. Setting
# this to NO can help when comparing the output of multiple runs.
diff --git a/debian/patches/06_remove_doc_matrix.patch b/debian/patches/06_remove_doc_matrix.patch
index 179963d..5a16c75 100644
--- a/debian/patches/06_remove_doc_matrix.patch
+++ b/debian/patches/06_remove_doc_matrix.patch
@@ -2,10 +2,10 @@ Description: Remove the line, which causes unreproducible builds
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-18
-Index: eigen3/doc/snippets/Matrix_resize_int_int.cpp
+Index: eigen-eigen-69d418c06999/doc/snippets/Matrix_resize_int_int.cpp
===================================================================
---- eigen3.orig/doc/snippets/Matrix_resize_int_int.cpp
-+++ eigen3/doc/snippets/Matrix_resize_int_int.cpp
+--- eigen-eigen-69d418c06999.orig/doc/snippets/Matrix_resize_int_int.cpp
++++ eigen-eigen-69d418c06999/doc/snippets/Matrix_resize_int_int.cpp
@@ -6,4 +6,4 @@ m.resize(3,2);
cout << "here's the 3x2 matrix m:" << endl << m << endl;
cout << "now let's resize m to size 2x2. This is NOT a conservative resizing, so it becomes uninitialized:" << endl;
diff --git a/debian/patches/07_remove_compressed_doc.patch b/debian/patches/07_remove_compressed_doc.patch
index 2aef50f..ce6b9d5 100644
--- a/debian/patches/07_remove_compressed_doc.patch
+++ b/debian/patches/07_remove_compressed_doc.patch
@@ -2,11 +2,11 @@ Description: Remove compressed doc
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-19
-Index: eigen3/doc/CMakeLists.txt
+Index: eigen-eigen-69d418c06999/doc/CMakeLists.txt
===================================================================
---- eigen3.orig/doc/CMakeLists.txt
-+++ eigen3/doc/CMakeLists.txt
-@@ -100,8 +100,6 @@ add_custom_target(doc ALL
+--- eigen-eigen-69d418c06999.orig/doc/CMakeLists.txt
++++ eigen-eigen-69d418c06999/doc/CMakeLists.txt
+@@ -104,8 +104,6 @@ add_custom_target(doc ALL
COMMAND ${CMAKE_COMMAND} -E copy ${Eigen_BINARY_DIR}/doc/html/group__TopicUnalignedArrayAssert.html ${Eigen_BINARY_DIR}/doc/html/TopicUnalignedArrayAssert.html
COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc
COMMAND ${CMAKE_COMMAND} -E remove eigen-doc/eigen-doc.tgz
diff --git a/debian/patches/08_fix_path_FindEigen3.patch b/debian/patches/08_fix_path_FindEigen3.patch
index 2c214d1..ee6a8b4 100644
--- a/debian/patches/08_fix_path_FindEigen3.patch
+++ b/debian/patches/08_fix_path_FindEigen3.patch
@@ -2,11 +2,11 @@ Description: fix installation path for cmake-files
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-12-18
-Index: eigen/CMakeLists.txt
+Index: eigen-eigen-69d418c06999/CMakeLists.txt
===================================================================
---- eigen.orig/CMakeLists.txt
-+++ eigen/CMakeLists.txt
-@@ -347,7 +347,7 @@ else()
+--- eigen-eigen-69d418c06999.orig/CMakeLists.txt
++++ eigen-eigen-69d418c06999/CMakeLists.txt
+@@ -362,7 +362,7 @@ else()
)
endif()
set(CMAKEPACKAGE_INSTALL_DIR
diff --git a/debian/patches/09_fix_1144.patch b/debian/patches/09_fix_1144.patch
deleted file mode 100644
index ac3bb67..0000000
--- a/debian/patches/09_fix_1144.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael at free.fr>
-# Date 1452324638 -3600
-# Node ID 0db197c797c3891768bd8d74fcf85279680942a5
-# Parent dd88c44d411c37a833ecbc0f3e82f58eb801107a
-Bug 1144: fix regression in x=y+A*x (aliasing), and move evaluator_traits::AssumeAliasing to evaluator_assume_aliasing.
-
-Index: eigen3/Eigen/src/Core/AssignEvaluator.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/AssignEvaluator.h
-+++ eigen3/Eigen/src/Core/AssignEvaluator.h
-@@ -682,9 +682,9 @@ template< typename DstXprType, typename
- struct Assignment;
-
-
--// The only purpose of this call_assignment() function is to deal with noalias() / AssumeAliasing and automatic transposition.
--// Indeed, I (Gael) think that this concept of AssumeAliasing was a mistake, and it makes thing quite complicated.
--// So this intermediate function removes everything related to AssumeAliasing such that Assignment
-+// The only purpose of this call_assignment() function is to deal with noalias() / "assume-aliasing" and automatic transposition.
-+// Indeed, I (Gael) think that this concept of "assume-aliasing" was a mistake, and it makes thing quite complicated.
-+// So this intermediate function removes everything related to "assume-aliasing" such that Assignment
- // does not has to bother about these annoying details.
-
- template<typename Dst, typename Src>
-@@ -698,21 +698,21 @@ EIGEN_DEVICE_FUNC void call_assignment(c
- call_assignment(dst, src, internal::assign_op<typename Dst::Scalar>());
- }
-
--// Deal with AssumeAliasing
-+// Deal with "assume-aliasing"
- template<typename Dst, typename Src, typename Func>
--EIGEN_DEVICE_FUNC void call_assignment(Dst& dst, const Src& src, const Func& func, typename enable_if<evaluator_traits<Src>::AssumeAliasing==1, void*>::type = 0)
-+EIGEN_DEVICE_FUNC void call_assignment(Dst& dst, const Src& src, const Func& func, typename enable_if< evaluator_assume_aliasing<Src>::value, void*>::type = 0)
- {
- typename plain_matrix_type<Src>::type tmp(src);
- call_assignment_no_alias(dst, tmp, func);
- }
-
- template<typename Dst, typename Src, typename Func>
--EIGEN_DEVICE_FUNC void call_assignment(Dst& dst, const Src& src, const Func& func, typename enable_if<evaluator_traits<Src>::AssumeAliasing==0, void*>::type = 0)
-+EIGEN_DEVICE_FUNC void call_assignment(Dst& dst, const Src& src, const Func& func, typename enable_if<!evaluator_assume_aliasing<Src>::value, void*>::type = 0)
- {
- call_assignment_no_alias(dst, src, func);
- }
-
--// by-pass AssumeAliasing
-+// by-pass "assume-aliasing"
- // When there is no aliasing, we require that 'dst' has been properly resized
- template<typename Dst, template <typename> class StorageBase, typename Src, typename Func>
- EIGEN_DEVICE_FUNC void call_assignment(NoAlias<Dst,StorageBase>& dst, const Src& src, const Func& func)
-Index: eigen3/Eigen/src/Core/CoreEvaluators.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/CoreEvaluators.h
-+++ eigen3/Eigen/src/Core/CoreEvaluators.h
-@@ -63,10 +63,6 @@ struct evaluator_traits_base
- // by default, get evaluator kind and shape from storage
- typedef typename storage_kind_to_evaluator_kind<typename traits<T>::StorageKind>::Kind Kind;
- typedef typename storage_kind_to_shape<typename traits<T>::StorageKind>::Shape Shape;
--
-- // 1 if assignment A = B assumes aliasing when B is of type T and thus B needs to be evaluated into a
-- // temporary; 0 if not.
-- static const int AssumeAliasing = 0;
- };
-
- // Default evaluator traits
-@@ -75,6 +71,10 @@ struct evaluator_traits : public evaluat
- {
- };
-
-+template<typename T, typename Shape = typename evaluator_traits<T>::Shape >
-+struct evaluator_assume_aliasing {
-+ static const bool value = false;
-+};
-
- // By default, we assume a unary expression:
- template<typename T>
-Index: eigen3/Eigen/src/Core/ProductEvaluators.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/ProductEvaluators.h
-+++ eigen3/Eigen/src/Core/ProductEvaluators.h
-@@ -38,10 +38,9 @@ struct evaluator<Product<Lhs, Rhs, Optio
- // Catch scalar * ( A * B ) and transform it to (A*scalar) * B
- // TODO we should apply that rule only if that's really helpful
- template<typename Lhs, typename Rhs, typename Scalar>
--struct evaluator_traits<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const Product<Lhs, Rhs, DefaultProduct> > >
-- : evaluator_traits_base<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const Product<Lhs, Rhs, DefaultProduct> > >
-+struct evaluator_assume_aliasing<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const Product<Lhs, Rhs, DefaultProduct> > >
- {
-- enum { AssumeAliasing = 1 };
-+ static const bool value = true;
- };
- template<typename Lhs, typename Rhs, typename Scalar>
- struct evaluator<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const Product<Lhs, Rhs, DefaultProduct> > >
-@@ -81,17 +80,8 @@ template< typename Lhs, typename Rhs,
- struct generic_product_impl;
-
- template<typename Lhs, typename Rhs>
--struct evaluator_traits<Product<Lhs, Rhs, DefaultProduct> >
-- : evaluator_traits_base<Product<Lhs, Rhs, DefaultProduct> >
--{
-- enum { AssumeAliasing = 1 };
--};
--
--template<typename Lhs, typename Rhs>
--struct evaluator_traits<Product<Lhs, Rhs, AliasFreeProduct> >
-- : evaluator_traits_base<Product<Lhs, Rhs, AliasFreeProduct> >
--{
-- enum { AssumeAliasing = 0 };
-+struct evaluator_assume_aliasing<Product<Lhs, Rhs, DefaultProduct> > {
-+ static const bool value = true;
- };
-
- // This is the default evaluator implementation for products:
-@@ -189,6 +179,13 @@ struct Assignment<DstXprType, CwiseUnary
- //----------------------------------------
- // Catch "Dense ?= xpr + Product<>" expression to save one temporary
- // FIXME we could probably enable these rules for any product, i.e., not only Dense and DefaultProduct
-+// TODO enable it for "Dense ?= xpr - Product<>" as well.
-+
-+template<typename OtherXpr, typename Lhs, typename Rhs>
-+struct evaluator_assume_aliasing<CwiseBinaryOp<internal::scalar_sum_op<typename OtherXpr::Scalar>, const OtherXpr,
-+ const Product<Lhs,Rhs,DefaultProduct> >, DenseShape > {
-+ static const bool value = true;
-+};
-
- template<typename DstXprType, typename OtherXpr, typename ProductType, typename Scalar, typename Func1, typename Func2>
- struct assignment_from_xpr_plus_product
-Index: eigen3/Eigen/src/Core/SelfAdjointView.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/SelfAdjointView.h
-+++ eigen3/Eigen/src/Core/SelfAdjointView.h
-@@ -203,8 +203,6 @@ struct evaluator_traits<SelfAdjointView<
- {
- typedef typename storage_kind_to_evaluator_kind<typename MatrixType::StorageKind>::Kind Kind;
- typedef SelfAdjointShape Shape;
--
-- static const int AssumeAliasing = 0;
- };
-
- template<int UpLo, int SetOpposite, typename DstEvaluatorTypeT, typename SrcEvaluatorTypeT, typename Functor, int Version>
-Index: eigen3/Eigen/src/Core/TriangularMatrix.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/TriangularMatrix.h
-+++ eigen3/Eigen/src/Core/TriangularMatrix.h
-@@ -711,10 +711,6 @@ struct evaluator_traits<TriangularView<M
- {
- typedef typename storage_kind_to_evaluator_kind<typename MatrixType::StorageKind>::Kind Kind;
- typedef typename glue_shapes<typename evaluator_traits<MatrixType>::Shape, TriangularShape>::type Shape;
--
-- // 1 if assignment A = B assumes aliasing when B is of type T and thus B needs to be evaluated into a
-- // temporary; 0 if not.
-- static const int AssumeAliasing = 0;
- };
-
- template<typename MatrixType, unsigned int Mode>
-Index: eigen3/Eigen/src/Geometry/Homogeneous.h
-===================================================================
---- eigen3.orig/Eigen/src/Geometry/Homogeneous.h
-+++ eigen3/Eigen/src/Geometry/Homogeneous.h
-@@ -304,7 +304,6 @@ struct evaluator_traits<Homogeneous<ArgT
- {
- typedef typename storage_kind_to_evaluator_kind<typename ArgType::StorageKind>::Kind Kind;
- typedef HomogeneousShape Shape;
-- static const int AssumeAliasing = 0;
- };
-
- template<> struct AssignmentKind<DenseShape,HomogeneousShape> { typedef Dense2Dense Kind; };
-Index: eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
-===================================================================
---- eigen3.orig/Eigen/src/SparseCore/SparseSelfAdjointView.h
-+++ eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
-@@ -211,8 +211,6 @@ struct evaluator_traits<SparseSelfAdjoin
- {
- typedef typename storage_kind_to_evaluator_kind<typename MatrixType::StorageKind>::Kind Kind;
- typedef SparseSelfAdjointShape Shape;
--
-- static const int AssumeAliasing = 0;
- };
-
- struct SparseSelfAdjoint2Sparse {};
-Index: eigen3/Eigen/src/SparseQR/SparseQR.h
-===================================================================
---- eigen3.orig/Eigen/src/SparseQR/SparseQR.h
-+++ eigen3/Eigen/src/SparseQR/SparseQR.h
-@@ -691,7 +691,6 @@ struct evaluator_traits<SparseQRMatrixQR
- typedef typename SparseQRType::MatrixType MatrixType;
- typedef typename storage_kind_to_evaluator_kind<typename MatrixType::StorageKind>::Kind Kind;
- typedef SparseShape Shape;
-- static const int AssumeAliasing = 0;
- };
-
- template< typename DstXprType, typename SparseQRType>
-Index: eigen3/test/product.h
-===================================================================
---- eigen3.orig/test/product.h
-+++ eigen3/test/product.h
-@@ -145,14 +145,31 @@ template<typename MatrixType> void produ
- 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());
--
-+ {
-+ Scalar x = square2.row(c) * square2.col(c2);
-+ VERIFY_IS_APPROX(x, square2.row(c).transpose().cwiseProduct(square2.col(c2)).sum());
-+ }
-+
- // outer product
-- VERIFY_IS_APPROX(m1.col(c) * m1.row(r), m1.block(0,c,rows,1) * m1.block(r,0,1,cols));
-- VERIFY_IS_APPROX(m1.row(r).transpose() * m1.col(c).transpose(), m1.block(r,0,1,cols).transpose() * m1.block(0,c,rows,1).transpose());
-- VERIFY_IS_APPROX(m1.block(0,c,rows,1) * m1.row(r), m1.block(0,c,rows,1) * m1.block(r,0,1,cols));
-- VERIFY_IS_APPROX(m1.col(c) * m1.block(r,0,1,cols), m1.block(0,c,rows,1) * m1.block(r,0,1,cols));
-- VERIFY_IS_APPROX(m1.leftCols(1) * m1.row(r), m1.block(0,0,rows,1) * m1.block(r,0,1,cols));
-- VERIFY_IS_APPROX(m1.col(c) * m1.topRows(1), m1.block(0,c,rows,1) * m1.block(0,0,1,cols));
-+ {
-+ VERIFY_IS_APPROX(m1.col(c) * m1.row(r), m1.block(0,c,rows,1) * m1.block(r,0,1,cols));
-+ VERIFY_IS_APPROX(m1.row(r).transpose() * m1.col(c).transpose(), m1.block(r,0,1,cols).transpose() * m1.block(0,c,rows,1).transpose());
-+ VERIFY_IS_APPROX(m1.block(0,c,rows,1) * m1.row(r), m1.block(0,c,rows,1) * m1.block(r,0,1,cols));
-+ VERIFY_IS_APPROX(m1.col(c) * m1.block(r,0,1,cols), m1.block(0,c,rows,1) * m1.block(r,0,1,cols));
-+ VERIFY_IS_APPROX(m1.leftCols(1) * m1.row(r), m1.block(0,0,rows,1) * m1.block(r,0,1,cols));
-+ VERIFY_IS_APPROX(m1.col(c) * m1.topRows(1), m1.block(0,c,rows,1) * m1.block(0,0,1,cols));
-+ }
-+
-+ // Aliasing
-+ {
-+ ColVectorType x(cols); x.setRandom();
-+ ColVectorType z(x);
-+ ColVectorType y(cols); y.setZero();
-+ ColSquareMatrixType A(cols,cols); A.setRandom();
-+ // CwiseBinaryOp
-+ VERIFY_IS_APPROX(x = y + A*x, A*z);
-+ x = z;
-+ // CwiseUnaryOp
-+ VERIFY_IS_APPROX(x = Scalar(1.)*(A*x), A*z);
-+ }
- }
-Index: eigen3/test/product_large.cpp
-===================================================================
---- eigen3.orig/test/product_large.cpp
-+++ eigen3/test/product_large.cpp
-@@ -9,6 +9,27 @@
-
- #include "product.h"
-
-+template<typename T>
-+void test_aliasing()
-+{
-+ int rows = internal::random<int>(1,12);
-+ int cols = internal::random<int>(1,12);
-+ typedef Matrix<T,Dynamic,Dynamic> MatrixType;
-+ typedef Matrix<T,Dynamic,1> VectorType;
-+ VectorType x(cols); x.setRandom();
-+ VectorType z(x);
-+ VectorType y(rows); y.setZero();
-+ MatrixType A(rows,cols); A.setRandom();
-+ // CwiseBinaryOp
-+ VERIFY_IS_APPROX(x = y + A*x, A*z); // OK because "y + A*x" is marked as "assume-aliasing"
-+ x = z;
-+ // CwiseUnaryOp
-+ VERIFY_IS_APPROX(x = T(1.)*(A*x), A*z); // OK because 1*(A*x) is replaced by (1*A*x) which is a Product<> expression
-+ x = z;
-+ // VERIFY_IS_APPROX(x = y-A*x, -A*z); // Not OK in 3.3 because x is resized before A*x gets evaluated
-+ x = z;
-+}
-+
- void test_product_large()
- {
- for(int i = 0; i < g_repeat; i++) {
-@@ -17,6 +38,8 @@ void test_product_large()
- CALL_SUBTEST_3( product(MatrixXi(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
- CALL_SUBTEST_4( product(MatrixXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2), internal::random<int>(1,EIGEN_TEST_MAX_SIZE/2))) );
- CALL_SUBTEST_5( product(Matrix<float,Dynamic,Dynamic,RowMajor>(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
-+
-+ CALL_SUBTEST_1( test_aliasing<float>() );
- }
-
- #if defined EIGEN_TEST_PART_6
-Index: eigen3/test/product_notemporary.cpp
-===================================================================
---- eigen3.orig/test/product_notemporary.cpp
-+++ eigen3/test/product_notemporary.cpp
-@@ -43,10 +43,16 @@ template<typename MatrixType> void produ
- r1 = internal::random<Index>(8,rows-r0);
-
- VERIFY_EVALUATION_COUNT( m3 = (m1 * m2.adjoint()), 1);
-+ VERIFY_EVALUATION_COUNT( m3 = (m1 * m2.adjoint()).transpose(), 1);
- VERIFY_EVALUATION_COUNT( m3.noalias() = m1 * m2.adjoint(), 0);
-
-+ VERIFY_EVALUATION_COUNT( m3 = s1 * (m1 * m2.transpose()), 1);
-+// VERIFY_EVALUATION_COUNT( m3 = m3 + s1 * (m1 * m2.transpose()), 1);
- VERIFY_EVALUATION_COUNT( m3.noalias() = s1 * (m1 * m2.transpose()), 0);
-
-+ VERIFY_EVALUATION_COUNT( m3 = m3 + (m1 * m2.adjoint()), 1);
-+
-+ VERIFY_EVALUATION_COUNT( m3 = m3 + (m1 * m2.adjoint()).transpose(), 1);
- VERIFY_EVALUATION_COUNT( m3.noalias() = m3 + m1 * m2.transpose(), 0);
- VERIFY_EVALUATION_COUNT( m3.noalias() += m3 + m1 * m2.transpose(), 0);
- VERIFY_EVALUATION_COUNT( m3.noalias() -= m3 + m1 * m2.transpose(), 0);
diff --git a/debian/patches/series b/debian/patches/series
index 5ba5222..14ae892 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
06_remove_doc_matrix.patch
07_remove_compressed_doc.patch
08_fix_path_FindEigen3.patch
-09_fix_1144.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git
More information about the debian-science-commits
mailing list