diff --git a/atlas.3.10.1-unbundle.patch b/atlas.3.10.1-unbundle.patch new file mode 100644 index 0000000..962a9e9 --- /dev/null +++ b/atlas.3.10.1-unbundle.patch @@ -0,0 +1,17 @@ +diff -up wrk/makes/Make.lib.wrk wrk/makes/Make.lib +--- wrk/makes/Make.lib.wrk 2015-01-23 21:14:46.465494411 +0100 ++++ wrk/makes/Make.lib 2015-01-23 22:48:39.632479588 +0100 +@@ -185,11 +185,11 @@ TRYALL : + # + fat_ptshared : # threaded target + $(MAKE) TRYALL outso=libtatlas.so \ +- libas="libptlapack.a libptf77blas.a libptcblas.a libatlas.a" \ ++ libas="libptlapack.a libptf77blas.a libptcblas.a libatlas.a $(SLAPACKlib)" \ + LIBINSTdir="$(LIBINSTdir)" + fat_shared : # serial target + $(MAKE) TRYALL outso=libsatlas.so \ +- libas="liblapack.a libf77blas.a libcblas.a libatlas.a" \ ++ libas="liblapack.a libf77blas.a libcblas.a libatlas.a $(SLAPACKlib)" \ + LIBINSTdir="$(LIBINSTdir)" + # + # Builds shared lib, not include fortran codes from LAPACK diff --git a/atlas.spec b/atlas.spec index bbbd85a..2c995bf 100644 --- a/atlas.spec +++ b/atlas.spec @@ -5,7 +5,7 @@ Version: 3.10.1 %if "%{?enable_native_atlas}" != "0" %define dist .native %endif -Release: 17%{?dist} +Release: 18%{?dist} Summary: Automatically Tuned Linear Algebra Software Group: System Environment/Libraries @@ -21,7 +21,6 @@ Source3: README.dist #Source7: IBMz1064.tgz #Source8: IBMz19632.tgz #Source9: IBMz19664.tgz -Source10: http://www.netlib.org/lapack/lapack-3.5.0.tgz #archdefs taken from debian: Source11: POWER332.tar.bz2 Source12: IBMz932.tar.bz2 @@ -44,6 +43,8 @@ Patch6: atlas-affinity.patch Patch7: atlas-aarch64port.patch Patch8: atlas-genparse.patch +Patch9: atlas.3.10.1-unbundle.patch + # ppc64le patches Patch95: initialize_malloc_memory.invtrsm.wms.oct23.patch Patch96: xlf.command.not.found.patch @@ -52,9 +53,9 @@ Patch99: ppc64le-remove-vsx.patch Patch100: ppc64le-abiv2.patch Patch110: p8-mem-barrier.patch -BuildRequires: gcc-gfortran +BuildRequires: gcc-gfortran, lapack-devel -Provides: bundled(lapack) +#Provides: bundled(lapack) %ifarch x86_64 Obsoletes: atlas-sse3 < 3.10 @@ -331,6 +332,8 @@ ix86 architecture. %endif %patch8 -p1 -b .genparse +%patch9 -p1 -b .unbundle + cp %{SOURCE1} CONFIG/ARCHS/ #cp %{SOURCE2} CONFIG/ARCHS/ cp %{SOURCE3} doc @@ -375,8 +378,11 @@ for type in %{types}; do ../configure %{mode} %{?threads_option} %{?arch_option} -D c -DWALL -Fa alg '%{armflags} -g -Wa,--noexecstack -fPIC'\ --prefix=%{buildroot}%{_prefix} \ --incdir=%{buildroot}%{_includedir} \ - --libdir=%{buildroot}%{_libdir}/${libname} \ - --with-netlib-lapack-tarfile=%{SOURCE10} + --libdir=%{buildroot}%{_libdir}/${libname} + #--with-netlib-lapack-tarfile=%{SOURCE10} + + #matches both SLAPACK and SSLAPACK + sed -i 's#SLAPACKlib.*#SLAPACKlib = %{_libdir}/liblapack.so#' Make.inc %if "%{?enable_native_atlas}" == "0" %ifarch x86_64 @@ -810,6 +816,9 @@ fi %endif %changelog +* Fri Jan 23 2015 Frantisek Kluknavsky - 3.10.1-18 +- unbundled lapack (only a few modified routines shipped with atlas sources are supposed to stay) + * Thu Oct 30 2014 Jaromir Capik - 3.10.1-17 - patching for Power8 to pass performance tunings and tests on P8 builders diff --git a/sources b/sources index 14d8509..0091827 100644 --- a/sources +++ b/sources @@ -11,4 +11,3 @@ ebb4732aff468bbc223e7f734252173b USII32.tgz f3e4ca175b5ffc49dce7f3c37f791827 IBMz964.tar.bz2 27e7baa49c588299260188afa78303dc POWER332.tar.bz2 af1f95e19d7afaf0342fb1377ec94817 ARMv732NEON.tar.bz2 -e7ba742120bd75339ac4c6fbdd8bce92 lapack-3.5.0.tgz