From 25b49b2821fadeb70d4c3bfbc726055a8f7f703a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 24 2013 10:22:04 +0000 Subject: Update to 3.2 --- diff --git a/.gitignore b/.gitignore index bb82d8c..9b3497b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /eigen-3.0.6.tar.bz2 /eigen-3.1.2.tar.bz2 /eigen-3.1.3.tar.bz2 +/eigen-3.2.tar.bz2 diff --git a/eigen3-3.1.3-memalign.patch b/eigen3-3.1.3-memalign.patch deleted file mode 100644 index 5c87abb..0000000 --- a/eigen3-3.1.3-memalign.patch +++ /dev/null @@ -1,41 +0,0 @@ -# HG changeset patch -# User Gael Guennebaud -# Date 1372279754 -7200 -# Node ID 21273ebd6b4d9137d29663c0ece1b683db7d3cc1 -# Parent a72dae9e2650eac6f9b5be1c4e506560f8e2eb17 -Fix bug 554: include unistd.h before checking the presence of posix_memalign. - -diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h ---- a/Eigen/src/Core/util/Memory.h -+++ b/Eigen/src/Core/util/Memory.h -@@ -53,9 +53,16 @@ - #endif - --#if ((defined __QNXNTO__) || (defined _GNU_SOURCE) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))) \ -- && (defined _POSIX_ADVISORY_INFO) && (_POSIX_ADVISORY_INFO > 0) -- #define EIGEN_HAS_POSIX_MEMALIGN 1 --#else -+// See bug 554 (http://eigen.tuxfamily.org/bz/show_bug.cgi?id=554) -+// It seems to be unsafe to check _POSIX_ADVISORY_INFO without including unistd.h first. -+// Currently, let's include it only on unix systems: -+#if defined(__unix__) || defined(__unix) -+ #include -+ #if ((defined __QNXNTO__) || (defined _GNU_SOURCE) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 600))) && (defined _POSIX_ADVISORY_INFO) && (_POSIX_ADVISORY_INFO > 0) -+ #define EIGEN_HAS_POSIX_MEMALIGN 1 -+ #endif -+#endif -+ -+#ifndef EIGEN_HAS_POSIX_MEMALIGN - #define EIGEN_HAS_POSIX_MEMALIGN 0 - #endif - -@@ -209,7 +216,7 @@ - if(posix_memalign(&result, 16, size)) result = 0; - #elif EIGEN_HAS_MM_MALLOC - result = _mm_malloc(size, 16); --#elif defined(_MSC_VER) && (!defined(_WIN32_WCE)) -+ #elif defined(_MSC_VER) && (!defined(_WIN32_WCE)) - result = _aligned_malloc(size, 16); - #else - result = handmade_aligned_malloc(size); - diff --git a/eigen3.spec b/eigen3.spec index 5e119d7..065d59f 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -1,6 +1,6 @@ Name: eigen3 -Version: 3.1.3 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: A lightweight C++ template library for vector and matrix math Group: Development/Libraries @@ -9,11 +9,6 @@ URL: http://eigen.tuxfamily.org/index.php?title=Main_Page # Source file is at: http://bitbucket.org/eigen/eigen/get/3.1.3.tar.bz2 # Renamed source file so it's not just a version number Source0: eigen-%{version}.tar.bz2 -Patch0: eigen3_unused-typedefs.patch -# Fix for Upstream bug 554: http://eigen.tuxfamily.org/bz/show_bug.cgi?id=554 -# Derived from hg changeset https://bitbucket.org/eigen/eigen/commits/21273ebd6b4d/ -# Should fix rhbz 978971 -Patch1: eigen3-3.1.3-memalign.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,9 +40,7 @@ Provides: %{name}-static = %{version}-%{release} %{summary} %prep -%setup -q -n eigen-eigen-2249f9c22fe8 -%patch0 -p1 -%patch1 -p1 +%setup -q -n eigen-eigen-ffa86ffb5570 %build mkdir %{_target_platform} @@ -75,6 +68,9 @@ rm -rf %{buildroot} %{_datadir}/pkgconfig/* %changelog +* Wed Jul 24 2013 Sandro Mani - 3.2-1 +- Update to release 3.2 + * Sat Jun 29 2013 Rich Mattes - 3.1.3-2 - Add upstream patch to fix malloc/free bugs (rhbz#978971) diff --git a/eigen3_unused-typedefs.patch b/eigen3_unused-typedefs.patch deleted file mode 100644 index 48ec28f..0000000 --- a/eigen3_unused-typedefs.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -rupN eigen-eigen-2249f9c22fe8/Eigen/src/Core/products/SelfadjointMatrixVector.h eigen-eigen-2249f9c22fe8-new/Eigen/src/Core/products/SelfadjointMatrixVector.h ---- eigen-eigen-2249f9c22fe8/Eigen/src/Core/products/SelfadjointMatrixVector.h 2013-04-16 09:38:40.000000000 +0200 -+++ eigen-eigen-2249f9c22fe8-new/Eigen/src/Core/products/SelfadjointMatrixVector.h 2013-04-19 14:31:27.620526893 +0200 -@@ -35,7 +35,7 @@ static EIGEN_DONT_INLINE void run( - Scalar alpha) - { - typedef typename packet_traits::type Packet; -- typedef typename NumTraits::Real RealScalar; -+ // typedef typename NumTraits::Real RealScalar; - const Index PacketSize = sizeof(Packet)/sizeof(Scalar); - - enum { -diff -rupN eigen-eigen-2249f9c22fe8/Eigen/src/Core/util/Memory.h eigen-eigen-2249f9c22fe8-new/Eigen/src/Core/util/Memory.h ---- eigen-eigen-2249f9c22fe8/Eigen/src/Core/util/Memory.h 2013-04-16 09:38:40.000000000 +0200 -+++ eigen-eigen-2249f9c22fe8-new/Eigen/src/Core/util/Memory.h 2013-04-19 14:32:07.188032232 +0200 -@@ -451,7 +451,7 @@ template inline - template - static inline Index first_aligned(const Scalar* array, Index size) - { -- typedef typename packet_traits::type Packet; -+ // typedef typename packet_traits::type Packet; - enum { PacketSize = packet_traits::size, - PacketAlignedMask = PacketSize-1 - }; -diff -rupN eigen-eigen-2249f9c22fe8/Eigen/src/Eigenvalues/ComplexSchur.h eigen-eigen-2249f9c22fe8-new/Eigen/src/Eigenvalues/ComplexSchur.h ---- eigen-eigen-2249f9c22fe8/Eigen/src/Eigenvalues/ComplexSchur.h 2013-04-16 09:38:40.000000000 +0200 -+++ eigen-eigen-2249f9c22fe8-new/Eigen/src/Eigenvalues/ComplexSchur.h 2013-04-19 14:33:01.652351334 +0200 -@@ -309,7 +309,7 @@ struct complex_schur_reduce_to_hessenber - static void run(ComplexSchur& _this, const MatrixType& matrix, bool computeU) - { - typedef typename ComplexSchur::ComplexScalar ComplexScalar; -- typedef typename ComplexSchur::ComplexMatrixType ComplexMatrixType; -+ // typedef typename ComplexSchur::ComplexMatrixType ComplexMatrixType; - - // Note: m_hess is over RealScalar; m_matT and m_matU is over ComplexScalar - _this.m_hess.compute(matrix); -diff -rupN eigen-eigen-2249f9c22fe8/Eigen/src/Eigenvalues/Tridiagonalization.h eigen-eigen-2249f9c22fe8-new/Eigen/src/Eigenvalues/Tridiagonalization.h ---- eigen-eigen-2249f9c22fe8/Eigen/src/Eigenvalues/Tridiagonalization.h 2013-04-16 09:38:40.000000000 +0200 -+++ eigen-eigen-2249f9c22fe8-new/Eigen/src/Eigenvalues/Tridiagonalization.h 2013-04-19 14:33:30.100995677 +0200 -@@ -425,7 +425,7 @@ struct tridiagonalization_inplace_select - template - void tridiagonalization_inplace(MatrixType& mat, DiagonalType& diag, SubDiagonalType& subdiag, bool extractQ) - { -- typedef typename MatrixType::Index Index; -+ // typedef typename MatrixType::Index Index; - //Index n = mat.rows(); - eigen_assert(mat.cols()==mat.rows() && diag.size()==mat.rows() && subdiag.size()==mat.rows()-1); - tridiagonalization_inplace_selector::run(mat, diag, subdiag, extractQ); -diff -rupN eigen-eigen-2249f9c22fe8/Eigen/src/QR/HouseholderQR.h eigen-eigen-2249f9c22fe8-new/Eigen/src/QR/HouseholderQR.h ---- eigen-eigen-2249f9c22fe8/Eigen/src/QR/HouseholderQR.h 2013-04-16 09:38:40.000000000 +0200 -+++ eigen-eigen-2249f9c22fe8-new/Eigen/src/QR/HouseholderQR.h 2013-04-19 14:33:56.147670049 +0200 -@@ -232,7 +232,7 @@ void householder_qr_inplace_blocked(Matr - { - typedef typename MatrixQR::Index Index; - typedef typename MatrixQR::Scalar Scalar; -- typedef typename MatrixQR::RealScalar RealScalar; -+ // typedef typename MatrixQR::RealScalar RealScalar; - typedef Block BlockType; - - Index rows = mat.rows(); diff --git a/sources b/sources index 1428d33..b8485fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43eee0e9252a77149d6b65e93e73b79d eigen-3.1.3.tar.bz2 +894381be5be65bb7099c6fd91d61b357 eigen-3.2.tar.bz2