Attachment 913761 Details for Bug 1115042 – use haswell patch in spec

[patch] use haswell patch in spec

openblas.spec.diff (text/plain), 3.92 KB, created by Dave Love on 2014-07-01 13:16:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Love

Created: 2014-07-01 13:16:45 UTC

Size: 3.92 KB

patch

obsolete

>--- openblas.spec.orig	2014-06-30 17:41:39.000000000 +0100
>+++ openblas.spec	2014-06-30 19:36:43.130350717 +0100
>@@ -1,6 +1,6 @@
> Name:           openblas
> Version:        0.2.9
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        An optimized BLAS library based on GotoBLAS2
> Group:          Development/Libraries
> License:        BSD
>@@ -14,6 +14,8 @@
> Patch2:         openblas-0.2.9-lapacke.patch
> # Fix build on i386: https://github.com/wernsaar/OpenBLAS/commit/438002204d79a0393999ae4fe8bc9b5125c45d97.patch
> Patch3:         openblas-0.2.9-i386.patch
>+# Provide switch to avoid Haswell instructions with old binutils
>+Patch4:         openblas-0.2.9-haswell.patch
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
> BuildRequires:  gcc-gfortran
>@@ -49,6 +51,10 @@
> %global build64 0
> %endif
> %endif
>+%if 0%{?rhel} == 5 || 0%{?rhel} == 6
>+# binutils too old
>+%global haswellflag NO_VPERMPD=1
>+%endif
> 
> %if %build64
> BuildRequires:  lapack64-static
>@@ -157,6 +163,7 @@
> %patch2 -p1 -b .lapacke
> %endif
> %patch3 -p1 -b .i386
>+%patch4 -p0 -b .haswell
> 
> # Get rid of bundled LAPACK sources
> rm -rf lapack-netlib
>@@ -255,15 +262,15 @@
> # Maximum possible amount of processors
> NMAX="NUM_THREADS=128"
> 
>-make -C serial     TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblas"    %{?avxflag} $LAPACKE INTERFACE64=0
>-make -C threaded   TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblasp"   %{?avxflag} $LAPACKE INTERFACE64=0
>+make -C serial     TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblas"    %{?avxflag} %{?haswellflag} $LAPACKE INTERFACE64=0
>+make -C threaded   TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblasp"   %{?avxflag} %{?haswellflag} $LAPACKE INTERFACE64=0
> # USE_THREAD determines use of SMP, not of pthreads
>-make -C openmp     TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblaso"   %{?avxflag} $LAPACKE INTERFACE64=0
>+make -C openmp     TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblaso"   %{?avxflag} %{?haswellflag} $LAPACKE INTERFACE64=0
> 
> %if %build64
>-make -C serial64   TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblas64"  %{?avxflag} $LAPACKE INTERFACE64=1
>-make -C threaded64 TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblasp64" %{?avxflag} $LAPACKE INTERFACE64=1
>-make -C openmp64   TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblaso64" %{?avxflag} $LAPACKE INTERFACE64=1
>+make -C serial64   TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=0 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblas64"  %{?avxflag} %{?haswellflag} $LAPACKE INTERFACE64=1
>+make -C threaded64 TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblasp64" %{?avxflag} %{?haswellflag} $LAPACKE INTERFACE64=1
>+make -C openmp64   TARGET=CORE2 DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=1 FC=gfortran CC=gcc COMMON_OPT="%{optflags}" $NMAX LIBPREFIX="libopenblaso64" %{?avxflag} %{?haswellflag} $LAPACKE INTERFACE64=1
> %endif
> 
> %install
>@@ -417,6 +424,9 @@
> %endif
> 
> %changelog
>+* Mon Jun 23 2014 Dave Love <d.love@liverpool.ac.uk> - 0.2.9-2
>+- Fix build with RHEL6 binutils (failure on haswell instructions)
>+
> * Wed Jun 11 2014 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.2.9-1
> - Increase maximum amount of cores from 32 to 128.
> - Add 64-bit interface support. (BZ #1088256)

Actions: View | Diff

Attachments on bug 1115042: 913760 | 913761