From 23ac51ff92584488257dbc4c5c28fec45d1391c0 Mon Sep 17 00:00:00 2001 From: sagitter Date: Oct 30 2017 16:54:25 +0000 Subject: Rebuild against openblas --- diff --git a/SuperLUMT.spec b/SuperLUMT.spec index b7d793a..6b033b2 100644 --- a/SuperLUMT.spec +++ b/SuperLUMT.spec @@ -6,7 +6,7 @@ %endif # https://bugzilla.redhat.com/show_bug.cgi?id=1356207 -ExcludeArch: ppc64 ppc64le aarch64 +ExcludeArch: %{power64} aarch64 %global soname_version %{majorver}.0 @@ -18,19 +18,29 @@ ExcludeArch: ppc64 ppc64le aarch64 %global complex 0 %endif +# openblas available on these architectures. +%if 0%{?fedora} && 0%{?fedora} > 26 +%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64 s390x} +%else +%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} +%endif +%if 0%{?rhel} +%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} +%endif + Name: SuperLUMT Version: 3.1.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Single precision real SuperLU routines for shared memory parallel machines License: BSD Group: Development/Libraries URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/ Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_mt_%{majorver}.tar.gz -%ifarch s390x -BuildRequires: blas-devel +%ifarch %{openblas_arches} +BuildRequires: openblas-devel, openblas-srpm-macros %else -BuildRequires: openblas-devel +BuildRequires: blas-devel, lapack-devel %endif BuildRequires: pkgconfig BuildRequires: tcsh @@ -96,10 +106,10 @@ Shared links and header files used by SuperLUMT. Summary: Single precision real SuperLU routines (64bit INTEGER) Group: Development/Libraries -%ifarch s390x -BuildRequires: blas64-devel +%ifarch %{openblas_arches} +BuildRequires: openblas-devel, openblas-srpm-macros %else -BuildRequires: openblas-devel +BuildRequires: blas64-devel, lapack64-devel %endif Requires: %{name}-common = %{version}-%{release} %description -n SuperLUMT64 @@ -186,13 +196,16 @@ sed -i -e "s|-O3|$RPM_OPT_FLAGS|" \ make.inc ## Build lib ########################################## -make %{?_smp_mflags} \ - SONAME=%{majorver} \ -%ifarch s390x - BLASLIB="-L%{_libdir} -lblas" \ + +%ifarch %{openblas_arches} +export LIBBLASLINK=-lopenblaso %else - BLASLIB="-L%{_libdir} -lopenblaso -lopenblasp" \ +export LIBBLASLINK=-lblas %endif + +make %{?_smp_mflags} \ + SONAME=%{majorver} \ + BLASLIB="-L%{_libdir} $LIBBLASLINK" \ PREDEFS="$RPM_OPT_FLAGS -fPIC -pthread -fopenmp -D__OPENMP -D__PTHREAD -DPRNTlevel=0 -DDEBUGlevel=0" \ NOOPTS="-O0 -fPIC -pthread -fopenmp" \ CDEFS=-DAdd_ \ @@ -209,17 +222,20 @@ make %{?_smp_mflags} \ MPLIB=-lpthread -C SRC single double %endif -cp -p SRC/libsuperlumt_*.so.%{majorver} lib -cp -p SRC/libsuperlumt_*.so lib +cp -p SRC/libsuperlumt_*.so.%{majorver} lib/ +cp -p SRC/libsuperlumt_*.so lib/ # Make example files -make %{?_smp_mflags} \ - SONAME=%{majorver} \ -%ifarch s390x - BLASLIB="-L%{_libdir} -lblas" \ + +%ifarch %{openblas_arches} +export LIBBLASLINK=-lopenblaso %else - BLASLIB="-L%{_libdir} -lopenblaso -lopenblasp" \ +export LIBBLASLINK=-lblas %endif + +make %{?_smp_mflags} \ + SONAME=%{majorver} \ + BLASLIB="-L%{_libdir} $LIBBLASLINK" \ PREDEFS="$RPM_OPT_FLAGS -fPIC -pthread -fopenmp -D__OPENMP -D__PTHREAD -DPRNTlevel=0 -DDEBUGlevel=0" \ NOOPTS="-O0 -fPIC -pthread -fopenmp" \ CDEFS=-DAdd_ \ @@ -251,13 +267,15 @@ patch -p0 < %{PATCH2} patch -p0 < %{PATCH3} patch -p0 < %{PATCH5} -make %{?_smp_mflags} \ - SONAME=%{majorver} \ -%ifarch s390x - BLASLIB="-L%{_libdir} -lblas64_" \ +%ifarch %{openblas_arches} +export LIBBLASLINK=-lopenblaso64 %else - BLASLIB="-L%{_libdir} -lopenblaso64 -lopenblaso64_ -lopenblasp64 -lopenblasp64_" \ +export LIBBLASLINK=-lblas64_ %endif + +make %{?_smp_mflags} \ + SONAME=%{majorver} \ + BLASLIB="-L%{_libdir} $LIBBLASLINK" \ PREDEFS="$RPM_OPT_FLAGS -fPIC -pthread -fopenmp -D__OPENMP -D__PTHREAD -DPRNTlevel=0 -DDEBUGlevel=0 -D_LONGINT" \ NOOPTS="-O0 -fPIC -pthread -fopenmp" \ CDEFS=-DAdd_ \ @@ -278,13 +296,16 @@ cp -p SRC/libsuperlumt64_*.so.%{majorver} lib cp -p SRC/libsuperlumt64_*.so lib # Make example files -make %{?_smp_mflags} \ - SONAME=%{majorver} \ -%ifarch s390x - BLASLIB="-L%{_libdir} -lblas64_" \ + +%ifarch %{openblas_arches} +export LIBBLASLINK=-lopenblaso64 %else - BLASLIB="-L%{_libdir} -lopenblaso64 -lopenblaso64_ -lopenblasp64 -lopenblasp64_" \ +export LIBBLASLINK=-lblas64_ %endif + +make %{?_smp_mflags} \ + SONAME=%{majorver} \ + BLASLIB="-L%{_libdir} $LIBBLASLINK" \ PREDEFS="$RPM_OPT_FLAGS -fPIC -pthread -fopenmp -D__OPENMP -D__PTHREAD -DPRNTlevel=0 -DDEBUGlevel=0 -D_LONGINT" \ NOOPTS="-O0 -fPIC -pthread -fopenmp" \ CDEFS=-DAdd_ \ @@ -455,8 +476,11 @@ done %doc DOC README %changelog +* Mon Oct 30 2017 Antonio Trande - 3.1.0-13 +- Rebuild against openblas + * Wed Aug 16 2017 Antonio Trande - 3.1.0-12 -- Rebuild for lapack 3.7.1 (move to 64_ suffix) +- Rebuild for lapack 3.7.1 (moved to 64_ suffix) * Wed Aug 02 2017 Fedora Release Engineering - 3.1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild