Hello community, here is the log from the commit of package cloog-isl for openSUSE:Factory checked in at 2013-08-04 20:24:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloog-isl (Old) and /work/SRC/openSUSE:Factory/.cloog-isl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloog-isl" Changes: -------- --- /work/SRC/openSUSE:Factory/cloog-isl/cloog-isl.changes 2013-01-12 07:51:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cloog-isl.new/cloog-isl.changes 2013-08-04 23:52:24.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 2 12:29:21 UTC 2013 - tchva...@suse.com + +- Bock also cloog package, collision on /usr/bin/cloog and provide + the same as the binaries are swapable, just backend + implementation and lib differs. +- Remove clean phase as it is default one + +------------------------------------------------------------------- +Mon Jul 29 21:22:26 UTC 2013 - dval...@suse.com + +- Pick upstream commits to adress test failures (cloog-tests.patch) + +------------------------------------------------------------------- New: ---- cloog-tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloog-isl.spec ++++++ --- /var/tmp/diff_new_pack.Peq7ch/_old 2013-08-04 23:52:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Peq7ch/_new 2013-08-04 23:52:24.000000000 +0200 @@ -25,8 +25,11 @@ Url: http://www.cloog.org/ Source: cloog-0.18.0.tar.gz Source1: baselibs.conf +Patch0: cloog-tests.patch BuildRequires: gmp-devel BuildRequires: isl-devel +Conflicts: cloog +Provides: cloog BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,6 +55,7 @@ %prep %setup -q -n cloog-0.18.0 +%patch0 -p1 %build %configure --disable-static --with-isl=system @@ -61,9 +65,9 @@ make %{_smp_mflags} check %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig +make DESTDIR=%{buildroot} install +rm -f %{buildroot}%{_libdir}/*.la +rm -rf %{buildroot}%{_libdir}/pkgconfig %post -n libcloog-isl4 -p /sbin/ldconfig @@ -82,7 +86,4 @@ %{_includedir}/cloog %{_libdir}/libcloog-isl.so -%clean -rm -rf $RPM_BUILD_ROOT - %changelog ++++++ cloog-tests.patch ++++++ >From fc8b0627b734271db42f5555fcb8c525828f3252 Mon Sep 17 00:00:00 2001 From: Tobias Grosser <tob...@grosser.es> Date: Sun, 16 Jun 2013 10:46:45 -0700 Subject: [PATCH] Update isl to remove platform dependent behavior isl commit 9e01482 changed an internal comparision function to ensure consistent results across different platforms. Differences that have previously observed between Linux and Solaris 10 should disappear with the updated isl version. --- test/darte.c | 4 ++-- test/dartef.f | 4 ++-- test/dealII.c | 7 +++++-- test/isl/jacobi-shared.c | 2 +- test/vasilache.c | 8 ++++---- 6 files changed, 15 insertions(+), 12 deletions(-) Index: cloog-0.18.0/test/darte.c =================================================================== --- cloog-0.18.0.orig/test/darte.c +++ cloog-0.18.0/test/darte.c @@ -6,14 +6,14 @@ if (n >= 1) { } } for (t1=-n+2;t1<=n-1;t1++) { - if (t1 >= 2) { + if (t1 >= 0) { for (t3=t1+4;t3<=t1+2*n+2;t3++) { if ((t1+t3)%2 == 0) { S1(t1+1,1,(-t1+t3-2)/2); } } } - for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) { + for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) { for (t3=t2+2;t3<=t2+2*n;t3++) { if ((t1+t2)%2 == 0) { if ((t1+t3)%2 == 0) { Index: cloog-0.18.0/test/dartef.f =================================================================== --- cloog-0.18.0.orig/test/dartef.f +++ cloog-0.18.0/test/dartef.f @@ -6,14 +6,14 @@ IF (n >= 1) THEN END IF END DO DO t1=-n+2, n-1 - IF (t1 >= 2) THEN + IF (t1 >= 0) THEN DO t3=t1+4, t1+2*n+2 IF (MOD(t1+t3, 2) == 0) THEN S1(t1+1,1,(-t1+t3-2)/2) END IF END DO END IF - DO t2=MAX(-t1+2,t1+2), -t1+4 + DO t2=MAX(-t1+2,t1+3), -t1+4 DO t3=t2+2, t2+2*n IF (MOD(t1+t2, 2) == 0) THEN IF (MOD(t1+t3, 2) == 0) THEN Index: cloog-0.18.0/test/dealII.c =================================================================== --- cloog-0.18.0.orig/test/dealII.c +++ cloog-0.18.0/test/dealII.c @@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);sc S1(scat_0); S2(scat_0); } -if ((T_2 == 0) && (T_67 == 0)) { +if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) { S1(0); } -for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) { +if ((T_66 <= -1) && (T_67 == 0)) { + S1(0); +} +for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) { S1(scat_0); } for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) { Index: cloog-0.18.0/test/isl/jacobi-shared.c =================================================================== --- cloog-0.18.0.orig/test/isl/jacobi-shared.c +++ cloog-0.18.0/test/isl/jacobi-shared.c @@ -1,10 +1,11 @@ /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */ if ((h0+1)%2 == 0) { - if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { + if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(g1+t0-3,16) >= -N+g1+t0+1) && (32*floord(t1-1,32) >= -N+g2+t1+1) && (32*floord(g2+t1-3,32) >= t1-32)) { for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) { - c1 = 32*floord(-t1,32)+t1+32; - if (c1 <= 32) { - S1(c0+g1-1,c1+g2-1); + for (c1=-32*floord(t1-1,32)+t1;c1<=min(32,N-g2-1);c1+=32) { + if ((c1 >= 1) && (c1 <= 32)) { + S1(c0+g1-1,c1+g2-1); + } } } } Index: cloog-0.18.0/test/vasilache.c =================================================================== --- cloog-0.18.0.orig/test/vasilache.c +++ cloog-0.18.0/test/vasilache.c @@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) { S6(p1,p3,p5,p7-1); S7(p1,p3,p5,p7); } - if (p5 <= floord(N-33,32)) { - S6(p1,p3,p5,32*p5+31); - } - if (p5 >= ceild(N-32,32)) { + if (p5 >= ceild(N-31,32)) { S6(p1,p3,p5,N-1); } + if (p5 <= floord(N-32,32)) { + S6(p1,p3,p5,32*p5+31); + } } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
