diff --git a/0001-Recompute-the-taylors-for-eq_plus_prod-and-eq_min_pr.patch b/0001-Recompute-the-taylors-for-eq_plus_prod-and-eq_min_pr.patch deleted file mode 100644 index 59cb078..0000000 --- a/0001-Recompute-the-taylors-for-eq_plus_prod-and-eq_min_pr.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dcbe760e6c38394cd29fef04f8b9b3c1db581c3d Mon Sep 17 00:00:00 2001 -From: kulshres -Date: Tue, 29 Jul 2014 08:59:42 +0000 -Subject: [PATCH] Recompute the taylors for eq_plus_prod and eq_min_prod - correctly - -The original logic only worked on the first taylors, so was -correct only for _HOS_ and _HOV_ modes, but not for _HOS_OV_ - -Signed-off-by: Kshitij Kulshreshtha - -git-svn-id: https://projects.coin-or.org/svn/ADOL-C/trunk@535 94ac48a7-3327-4b6a-8511-9a4036a20e83 ---- - ADOL-C/src/ho_rev.c | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/ADOL-C/src/ho_rev.c b/ADOL-C/src/ho_rev.c -index 1f5d6a0..1b5477a 100644 ---- a/ADOL-C/src/ho_rev.c -+++ b/ADOL-C/src/ho_rev.c -@@ -1066,9 +1066,14 @@ int hov_ti_reverse( - - /* RECOMPUTATION */ - ASSIGN_T( Tres, rpp_T[res]) -+#if !defined(_HOS_OV_) - deconv1(k,Targ1,Targ2,Tres); -+#endif - -- FOR_0_LE_l_LT_p -+ FOR_0_LE_l_LT_p { -+#if _HOS_OV_ -+ deconv1(k,Targ1,Targ2,Tres); -+#endif - if (0 == ARES) { - HOV_INC(Aarg1, k1) - HOV_INC(Aarg2, k1) -@@ -1089,7 +1094,9 @@ int hov_ti_reverse( - HOV_INC(Aarg2, k) - HOS_OV_INC(Targ1, k) - HOS_OV_INC(Targ2, k) -+ HOS_OV_INC(Tres, k) - } -+ } - break; - - /*--------------------------------------------------------------------------*/ -@@ -1109,9 +1116,14 @@ int hov_ti_reverse( - - /* RECOMPUTATION */ - ASSIGN_T( Tres, rpp_T[res]) -+#if !defined(_HOS_OV_) - inconv1(k,Targ1,Targ2,Tres); -+#endif - -- FOR_0_LE_l_LT_p -+ FOR_0_LE_l_LT_p { -+#if _HOS_OV_ -+ inconv1(k,Targ1,Targ2,Tres); -+#endif - if (0 == ARES) { - HOV_INC(Aarg1, k1) - HOV_INC(Aarg2, k1) -@@ -1132,7 +1144,9 @@ int hov_ti_reverse( - HOV_INC(Aarg2, k) - HOS_OV_INC(Targ1, k) - HOS_OV_INC(Targ2, k) -+ HOS_OV_INC(Tres, k) - } -+ } - break; - - /*--------------------------------------------------------------------------*/ --- -2.0.1 - diff --git a/0001-The-ABI-seems-to-have-been-broken-change-library-ver.patch b/0001-The-ABI-seems-to-have-been-broken-change-library-ver.patch deleted file mode 100644 index fa5f7b5..0000000 --- a/0001-The-ABI-seems-to-have-been-broken-change-library-ver.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 688b6c45faa0b7890e8b1d9d709a82b98a47f94f Mon Sep 17 00:00:00 2001 -From: Kshitij Kulshreshtha -Date: Fri, 15 Aug 2014 12:25:20 +0200 -Subject: [PATCH] The ABI seems to have been broken, change library version - -The old library libadolc.so.1.1.1 seems to have conflicts -with the new library version libadolc.so.1.2.0 So increase -the major version. After this the new library will be -libadolc.so.2.1.0 - -Signed-off-by: Kshitij Kulshreshtha ---- - ADOL-C/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ADOL-C/Makefile.am b/ADOL-C/Makefile.am -index d8fb591..622f6e4 100644 ---- a/ADOL-C/Makefile.am -+++ b/ADOL-C/Makefile.am -@@ -31,7 +31,7 @@ SUBDIRS += include - MAINTAINERCLEANFILES = Makefile.in - - lib_LTLIBRARIES = lib@adolclib@.la --lib@adolclib@_la_LDFLAGS = -version-info 3:0:2 -no-undefined -+lib@adolclib@_la_LDFLAGS = -version-info 3:0:1 -no-undefined - lib@adolclib@_la_SOURCES = dummy.cpp - - lib@adolclib@_la_LIBADD = src/libadolcsrc.la --- -2.0.1 - diff --git a/0001-make-the-macro-check-clearer.patch b/0001-make-the-macro-check-clearer.patch deleted file mode 100644 index 808c204..0000000 --- a/0001-make-the-macro-check-clearer.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ed92d0ff0fd4b604083079af2dd3d2ce01794036 Mon Sep 17 00:00:00 2001 -From: kulshres -Date: Mon, 4 Aug 2014 11:49:18 +0000 -Subject: [PATCH] make the macro check clearer. - -Signed-off-by: Kshitij Kulshreshtha - -git-svn-id: https://projects.coin-or.org/svn/ADOL-C/trunk@536 94ac48a7-3327-4b6a-8511-9a4036a20e83 ---- - ADOL-C/src/ho_rev.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ADOL-C/src/ho_rev.c b/ADOL-C/src/ho_rev.c -index 1b5477a..c309501 100644 ---- a/ADOL-C/src/ho_rev.c -+++ b/ADOL-C/src/ho_rev.c -@@ -1071,7 +1071,7 @@ int hov_ti_reverse( - #endif - - FOR_0_LE_l_LT_p { --#if _HOS_OV_ -+#if defined(_HOS_OV_) - deconv1(k,Targ1,Targ2,Tres); - #endif - if (0 == ARES) { -@@ -1121,7 +1121,7 @@ int hov_ti_reverse( - #endif - - FOR_0_LE_l_LT_p { --#if _HOS_OV_ -+#if defined(_HOS_OV_) - inconv1(k,Targ1,Targ2,Tres); - #endif - if (0 == ARES) { --- -2.0.1 - diff --git a/adolc-2.5.1.tar.xz b/adolc-2.5.1.tar.xz deleted file mode 100644 index 5ceac6e..0000000 --- a/adolc-2.5.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13d49f6d5707814d9460a314d63d63cff87af09605ddfd5b29d6999318c13039 -size 1738472 diff --git a/adolc-2.5.2.tar.xz b/adolc-2.5.2.tar.xz new file mode 100644 index 0000000..5683660 --- /dev/null +++ b/adolc-2.5.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e616db2a16c10b3a14ece14610f9c21716db027d03935dcb3fc47db03ac5c3b +size 1738396 diff --git a/adolc.changes b/adolc.changes index 5b49c4e..40003db 100644 --- a/adolc.changes +++ b/adolc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 19 10:58:17 UTC 2014 - kkhere.geo@gmail.com + +- Update to upstream version 2.5.2 + * incorporated bugfixes since 2.5.1 + ------------------------------------------------------------------- Sun Aug 17 12:22:22 UTC 2014 - kkhere.geo@gmail.com diff --git a/adolc.spec b/adolc.spec index 2451485..a5acf8d 100644 --- a/adolc.spec +++ b/adolc.spec @@ -18,7 +18,7 @@ Name: adolc %define lname libadolc2 -Version: 2.5.1 +Version: 2.5.2 Release: 0 Summary: Algorithmic Differentiation Library for C/C++ License: GPL-2.0+ or EPL-1.0 @@ -26,9 +26,6 @@ Group: Development/Libraries/C and C++ Url: http://projects.coin-or.org/ADOL-C Source: %{name}-%{version}.tar.xz Source1: baselibs.conf -Patch1: 0001-Recompute-the-taylors-for-eq_plus_prod-and-eq_min_pr.patch -Patch2: 0001-make-the-macro-check-clearer.patch -Patch3: 0001-The-ABI-seems-to-have-been-broken-change-library-ver.patch BuildRequires: ColPack-devel BuildRequires: autoconf BuildRequires: automake @@ -106,12 +103,9 @@ This package provides the user´s manual for adolc %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -autoreconf -v --install --force +# autoreconf -v --install --force %configure --prefix=/usr make %{_smp_mflags} # pushd ADOL-C/doc