[eigen3] 02/06: Refresh patch.
Anton Gladky
gladk at moszumanska.debian.org
Fri Nov 11 06:10:42 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 4188100fd2ea7518a57f9de084b82a2eeaa1b7df
Author: Anton Gladky <gladk at debian.org>
Date: Thu Nov 10 22:59:17 2016 +0100
Refresh patch.
---
debian/patches/02_remove_buildtype_check.patch | 8 ++--
debian/patches/04_remove_piwik.patch | 6 +--
debian/patches/05_remove_html_timestamp.patch | 6 +--
debian/patches/06_remove_doc_matrix.patch | 6 +--
debian/patches/07_remove_compressed_doc.patch | 6 +--
debian/patches/08_fix_path_FindEigen3.patch | 8 ++--
debian/patches/10_vectorization.patch | 25 -----------
debian/patches/12_grammer_tweak.patch | 12 +++---
.../20_fix_FTBFS_in_check_for_aliasing.patch | 50 ----------------------
debian/patches/series | 2 -
10 files changed, 26 insertions(+), 103 deletions(-)
diff --git a/debian/patches/02_remove_buildtype_check.patch b/debian/patches/02_remove_buildtype_check.patch
index e0282b2..e3bf6d8 100644
--- a/debian/patches/02_remove_buildtype_check.patch
+++ b/debian/patches/02_remove_buildtype_check.patch
@@ -1,11 +1,11 @@
Description: Remove build type check in cmake
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: eigen-eigen-69d418c06999/CMakeLists.txt
+Index: eigen-eigen-26667be4f70b/CMakeLists.txt
===================================================================
---- eigen-eigen-69d418c06999.orig/CMakeLists.txt
-+++ eigen-eigen-69d418c06999/CMakeLists.txt
-@@ -15,12 +15,6 @@ if (NOT CMAKE_BUILD_TYPE)
+--- eigen-eigen-26667be4f70b.orig/CMakeLists.txt
++++ eigen-eigen-26667be4f70b/CMakeLists.txt
+@@ -20,12 +20,6 @@ if (NOT CMAKE_BUILD_TYPE)
endif()
string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
diff --git a/debian/patches/04_remove_piwik.patch b/debian/patches/04_remove_piwik.patch
index f73a624..0a29ccb 100644
--- a/debian/patches/04_remove_piwik.patch
+++ b/debian/patches/04_remove_piwik.patch
@@ -1,10 +1,10 @@
Description: remove piwik scripts.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: eigen-eigen-69d418c06999/doc/eigendoxy_footer.html.in
+Index: eigen-eigen-26667be4f70b/doc/eigendoxy_footer.html.in
===================================================================
---- eigen-eigen-69d418c06999.orig/doc/eigendoxy_footer.html.in
-+++ eigen-eigen-69d418c06999/doc/eigendoxy_footer.html.in
+--- eigen-eigen-26667be4f70b.orig/doc/eigendoxy_footer.html.in
++++ eigen-eigen-26667be4f70b/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 54653a7..8802606 100644
--- a/debian/patches/05_remove_html_timestamp.patch
+++ b/debian/patches/05_remove_html_timestamp.patch
@@ -1,10 +1,10 @@
Description: Do not set HTML_TIMESTAMP in documentation
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-17
-Index: eigen-eigen-69d418c06999/doc/Doxyfile.in
+Index: eigen-eigen-26667be4f70b/doc/Doxyfile.in
===================================================================
---- eigen-eigen-69d418c06999.orig/doc/Doxyfile.in
-+++ eigen-eigen-69d418c06999/doc/Doxyfile.in
+--- eigen-eigen-26667be4f70b.orig/doc/Doxyfile.in
++++ eigen-eigen-26667be4f70b/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 14a73a2..e2309d4 100644
--- a/debian/patches/06_remove_doc_matrix.patch
+++ b/debian/patches/06_remove_doc_matrix.patch
@@ -1,10 +1,10 @@
Description: Remove the line, which causes unreproducible builds
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-18
-Index: eigen-eigen-69d418c06999/doc/snippets/Matrix_resize_int_int.cpp
+Index: eigen-eigen-26667be4f70b/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
+--- eigen-eigen-26667be4f70b.orig/doc/snippets/Matrix_resize_int_int.cpp
++++ eigen-eigen-26667be4f70b/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 2233ca1..a3a88f0 100644
--- a/debian/patches/07_remove_compressed_doc.patch
+++ b/debian/patches/07_remove_compressed_doc.patch
@@ -1,10 +1,10 @@
Description: Remove compressed doc
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-19
-Index: eigen-eigen-69d418c06999/doc/CMakeLists.txt
+Index: eigen-eigen-26667be4f70b/doc/CMakeLists.txt
===================================================================
---- eigen-eigen-69d418c06999.orig/doc/CMakeLists.txt
-+++ eigen-eigen-69d418c06999/doc/CMakeLists.txt
+--- eigen-eigen-26667be4f70b.orig/doc/CMakeLists.txt
++++ eigen-eigen-26667be4f70b/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
diff --git a/debian/patches/08_fix_path_FindEigen3.patch b/debian/patches/08_fix_path_FindEigen3.patch
index 2c7163e..a463bc9 100644
--- a/debian/patches/08_fix_path_FindEigen3.patch
+++ b/debian/patches/08_fix_path_FindEigen3.patch
@@ -1,11 +1,11 @@
Description: fix installation path for cmake-files
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-12-18
-Index: eigen-eigen-69d418c06999/CMakeLists.txt
+Index: eigen-eigen-26667be4f70b/CMakeLists.txt
===================================================================
---- eigen-eigen-69d418c06999.orig/CMakeLists.txt
-+++ eigen-eigen-69d418c06999/CMakeLists.txt
-@@ -362,7 +362,7 @@ else()
+--- eigen-eigen-26667be4f70b.orig/CMakeLists.txt
++++ eigen-eigen-26667be4f70b/CMakeLists.txt
+@@ -374,7 +374,7 @@ else()
)
endif()
set(CMAKEPACKAGE_INSTALL_DIR
diff --git a/debian/patches/10_vectorization.patch b/debian/patches/10_vectorization.patch
deleted file mode 100644
index 49757e7..0000000
--- a/debian/patches/10_vectorization.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael at free.fr>
-# Date 1469697667 -7200
-# Node ID e35a38ad89fe4fba936bb39a5f02d667045fe8dd
-# Parent 0b62bc896f8070c48214ffc447bc597c261933bc
-# Vectorize more small product expressions by letting the general assignement logic decides on the sizes that are OK for vectorization.
-
-Index: eigen3/Eigen/src/Core/ProductEvaluators.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/ProductEvaluators.h
-+++ eigen3/Eigen/src/Core/ProductEvaluators.h
-@@ -489,11 +489,8 @@ struct product_evaluator<Product<Lhs, Rh
-
- SameType = is_same<typename LhsNestedCleaned::Scalar,typename RhsNestedCleaned::Scalar>::value,
-
-- CanVectorizeRhs = bool(RhsRowMajor) && (RhsFlags & PacketAccessBit)
-- && (ColsAtCompileTime == Dynamic || ((ColsAtCompileTime % RhsVecPacketSize) == 0) ),
--
-- CanVectorizeLhs = (!LhsRowMajor) && (LhsFlags & PacketAccessBit)
-- && (RowsAtCompileTime == Dynamic || ((RowsAtCompileTime % LhsVecPacketSize) == 0) ),
-+ CanVectorizeRhs = bool(RhsRowMajor) && (RhsFlags & PacketAccessBit),
-+ CanVectorizeLhs = (!LhsRowMajor) && (LhsFlags & PacketAccessBit),
-
- EvalToRowMajor = (MaxRowsAtCompileTime==1&&MaxColsAtCompileTime!=1) ? 1
- : (MaxColsAtCompileTime==1&&MaxRowsAtCompileTime!=1) ? 0
diff --git a/debian/patches/12_grammer_tweak.patch b/debian/patches/12_grammer_tweak.patch
index 54cab31..4121a1d 100644
--- a/debian/patches/12_grammer_tweak.patch
+++ b/debian/patches/12_grammer_tweak.patch
@@ -2,10 +2,10 @@ Description: Correct grammer error found by lintian which can leak into other
.
projects.
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
-Index: eigen3/Eigen/src/Core/DenseBase.h
+Index: eigen-eigen-26667be4f70b/Eigen/src/Core/DenseBase.h
===================================================================
---- eigen3.orig/Eigen/src/Core/DenseBase.h
-+++ eigen3/Eigen/src/Core/DenseBase.h
+--- eigen-eigen-26667be4f70b.orig/Eigen/src/Core/DenseBase.h
++++ eigen-eigen-26667be4f70b/Eigen/src/Core/DenseBase.h
@@ -242,7 +242,7 @@ template<typename Derived> class DenseBa
{
EIGEN_ONLY_USED_FOR_DEBUG(newSize);
@@ -24,10 +24,10 @@ Index: eigen3/Eigen/src/Core/DenseBase.h
}
#ifndef EIGEN_PARSED_BY_DOXYGEN
-Index: eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
+Index: eigen-eigen-26667be4f70b/Eigen/src/SparseCore/SparseSelfAdjointView.h
===================================================================
---- eigen3.orig/Eigen/src/SparseCore/SparseSelfAdjointView.h
-+++ eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
+--- eigen-eigen-26667be4f70b.orig/Eigen/src/SparseCore/SparseSelfAdjointView.h
++++ eigen-eigen-26667be4f70b/Eigen/src/SparseCore/SparseSelfAdjointView.h
@@ -153,7 +153,7 @@ template<typename MatrixType, unsigned i
EIGEN_ONLY_USED_FOR_DEBUG(rows);
EIGEN_ONLY_USED_FOR_DEBUG(cols);
diff --git a/debian/patches/20_fix_FTBFS_in_check_for_aliasing.patch b/debian/patches/20_fix_FTBFS_in_check_for_aliasing.patch
deleted file mode 100644
index 0bceccf..0000000
--- a/debian/patches/20_fix_FTBFS_in_check_for_aliasing.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael at free.fr>
-# Date 1471961950 -7200
-# Node ID a89a95507d613a28da1a4180cb7fb4a77cee4a55
-# Parent 947d8ade3b0f94058f8fc30e609945f7018715d0
-Fix compilation in check_for_aliasing due to ambiguous specializations
-
-Index: eigen3/Eigen/src/Core/util/BlasUtil.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/util/BlasUtil.h
-+++ eigen3/Eigen/src/Core/util/BlasUtil.h
-@@ -315,6 +315,11 @@ struct blas_traits<CwiseBinaryOp<scalar_
- static inline Scalar extractScalarFactor(const XprType& x)
- { return Base::extractScalarFactor(x.lhs()) * x.rhs().functor().m_other; }
- };
-+template<typename Scalar, typename Plain1, typename Plain2>
-+struct blas_traits<CwiseBinaryOp<scalar_product_op<Scalar>, const CwiseNullaryOp<scalar_constant_op<Scalar>,Plain1>,
-+ const CwiseNullaryOp<scalar_constant_op<Scalar>,Plain2> > >
-+ : blas_traits<CwiseNullaryOp<scalar_constant_op<Scalar>,Plain1> >
-+{};
-
- // pop opposite
- template<typename Scalar, typename NestedXpr>
-Index: eigen3/test/adjoint.cpp
-===================================================================
---- eigen3.orig/test/adjoint.cpp
-+++ eigen3/test/adjoint.cpp
-@@ -169,7 +169,7 @@ void test_adjoint()
- // test a large static matrix only once
- CALL_SUBTEST_7( adjoint(Matrix<float, 100, 100>()) );
-
--#ifdef EIGEN_TEST_PART_4
-+#ifdef EIGEN_TEST_PART_13
- {
- MatrixXcf a(10,10), b(10,10);
- VERIFY_RAISES_ASSERT(a = a.transpose());
-@@ -187,6 +187,13 @@ void test_adjoint()
- a.transpose() = a.adjoint();
- a.transpose() += a.adjoint();
- a.transpose() += a.adjoint() + b;
-+
-+ // regression tests for check_for_aliasing
-+ MatrixXd c(10,10);
-+ c = 1.0 * MatrixXd::Ones(10,10) + c;
-+ c = MatrixXd::Ones(10,10) * 1.0 + c;
-+ c = c + MatrixXd::Ones(10,10) .cwiseProduct( MatrixXd::Zero(10,10) );
-+ c = MatrixXd::Ones(10,10) * MatrixXd::Zero(10,10);
- }
- #endif
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6ce9c03..8e95ef3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,4 @@
06_remove_doc_matrix.patch
07_remove_compressed_doc.patch
08_fix_path_FindEigen3.patch
-10_vectorization.patch
12_grammer_tweak.patch
-20_fix_FTBFS_in_check_for_aliasing.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