Fix up mpich-devel requirement for el7 7.3
Avoid openblas on s3909(x)
This commit is contained in:
parent
b50e854782
commit
5e5f978aa4
|
@ -17,8 +17,10 @@
|
||||||
#
|
#
|
||||||
SuperLUroot =
|
SuperLUroot =
|
||||||
DSUPERLULIB = $(SuperLUroot)/SRC/libsuperlu_dist.a
|
DSUPERLULIB = $(SuperLUroot)/SRC/libsuperlu_dist.a
|
||||||
|
BLASDEF = -DUSE_VENDOR_BLAS
|
||||||
|
BLASLIB = -lopenblas
|
||||||
|
|
||||||
LIBS = $(DSUPERLULIB) -lptscotchparmetis -lptscotch -lptscotcherr -lmetis -lscotch -lopenblas
|
LIBS = $(DSUPERLULIB) -lptscotchparmetis -lptscotch -lptscotcherr -lmetis -lscotch $(BLASLIB)
|
||||||
|
|
||||||
#
|
#
|
||||||
# The archiver and the flag(s) to use when building archive (library)
|
# The archiver and the flag(s) to use when building archive (library)
|
||||||
|
@ -29,7 +31,7 @@ ARCHFLAGS = cr
|
||||||
RANLIB = /usr/bin/ranlib
|
RANLIB = /usr/bin/ranlib
|
||||||
|
|
||||||
CC = mpicc
|
CC = mpicc
|
||||||
CFLAGS += -O3 -DNDEBUG -DUSE_VENDOR_BLAS -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -std=c99 -fPIC -g
|
CFLAGS += -O3 -DNDEBUG $(BLASDEF) -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -std=c99 -fPIC -g
|
||||||
# CFLAGS += -D
|
# CFLAGS += -D
|
||||||
# CFLAGS +=
|
# CFLAGS +=
|
||||||
NOOPTS = -O0
|
NOOPTS = -O0
|
||||||
|
|
|
@ -1,9 +1,16 @@
|
||||||
# Copyright (c) 2016 Dave Love, Liverpool University
|
# Copyright (c) 2016 Dave Love, Liverpool University
|
||||||
# MIT licence, per Fedora policy.
|
# MIT licence, per Fedora policy.
|
||||||
|
|
||||||
|
%ifarch x86_64 %{ix86} armv7hl %{power64} aarch64
|
||||||
|
# matches openblas ExclusiveArch
|
||||||
|
%bcond_without openblas
|
||||||
|
%else
|
||||||
|
%bcond_with openblas
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: superlu_dist
|
Name: superlu_dist
|
||||||
Version: 5.1.3
|
Version: 5.1.3
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Solution of large, sparse, nonsymmetric systems of linear equations
|
Summary: Solution of large, sparse, nonsymmetric systems of linear equations
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
|
URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
|
||||||
|
@ -14,7 +21,12 @@ Patch1: superlu_dist-parmetis.patch
|
||||||
# Zap diagnostics, recommended in
|
# Zap diagnostics, recommended in
|
||||||
# <https://math.berkeley.edu/~linlin/pexsi/page_dependency.html>
|
# <https://math.berkeley.edu/~linlin/pexsi/page_dependency.html>
|
||||||
Patch2: superlu_dist-output.patch
|
Patch2: superlu_dist-output.patch
|
||||||
BuildRequires: scotch-devel gcc-gfortran openblas-devel
|
Patch3: superlu_dist-cblas.patch
|
||||||
|
BuildRequires: scotch-devel gcc-gfortran
|
||||||
|
%if %{with openblas}
|
||||||
|
BuildRequires: openblas-devel
|
||||||
|
# Probably not worth a bundled provides for the bundled partial cblas.
|
||||||
|
%endif
|
||||||
# The test program runs if we link with -lmetis but crashes if linked with
|
# The test program runs if we link with -lmetis but crashes if linked with
|
||||||
# -lscotchmetis.
|
# -lscotchmetis.
|
||||||
BuildRequires: metis-devel
|
BuildRequires: metis-devel
|
||||||
|
@ -124,7 +136,8 @@ This is the mpich version.
|
||||||
|
|
||||||
%package mpich-devel
|
%package mpich-devel
|
||||||
Summary: Development files for %name-mpich
|
Summary: Development files for %name-mpich
|
||||||
Requires: mpich-devel%{?_isa}
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1397192 (fixed in RHEL 7.4 beta)
|
||||||
|
Requires: mpich-devel%{!?el7:%{?_isa}}
|
||||||
Requires: %name-mpich%{?_isa} = %version-%release
|
Requires: %name-mpich%{?_isa} = %version-%release
|
||||||
|
|
||||||
%description mpich-devel
|
%description mpich-devel
|
||||||
|
@ -136,6 +149,7 @@ Development files for %name-mpich
|
||||||
%setup -q -n SuperLU_DIST_%version
|
%setup -q -n SuperLU_DIST_%version
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
cp %SOURCE1 make.inc
|
cp %SOURCE1 make.inc
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -148,13 +162,21 @@ esac
|
||||||
find -name \*.[oa] | xargs rm 2>/dev/null || true # no clean target
|
find -name \*.[oa] | xargs rm 2>/dev/null || true # no clean target
|
||||||
pwd
|
pwd
|
||||||
export CFLAGS="%optflags"
|
export CFLAGS="%optflags"
|
||||||
|
%if %{with openblas}
|
||||||
make SuperLUroot=$(pwd)
|
make SuperLUroot=$(pwd)
|
||||||
|
%else
|
||||||
|
make blaslib HEADER=. BLASLIB='../libblas.a'
|
||||||
|
make SuperLUroot=$(pwd) BLASDEF= BLASLIB='../libblas.a'
|
||||||
|
%endif
|
||||||
mkdir -p tmp $m
|
mkdir -p tmp $m
|
||||||
pushd tmp
|
pushd tmp
|
||||||
ar x ../SRC/libsuperlu_dist.a
|
ar x ../SRC/libsuperlu_dist.a
|
||||||
mpicc -shared -Wl,-soname=libsuperlu_dist.so.%major -Wl,--as-needed \
|
mpicc -shared -Wl,-soname=libsuperlu_dist.so.%major -Wl,--as-needed \
|
||||||
-o ../$m/libsuperlu_dist.so.%sover *.o -fopenmp -lptscotchparmetis \
|
-o ../$m/libsuperlu_dist.so.%sover *.o -fopenmp -lptscotchparmetis \
|
||||||
-lptscotch -lptscotcherr -lscotch -lmetis -lopenblas \
|
-lptscotch -lptscotcherr -lscotch -lmetis \
|
||||||
|
%if %{with openblas}
|
||||||
|
-lopenblas \
|
||||||
|
%endif
|
||||||
%{?__global_ldflags}
|
%{?__global_ldflags}
|
||||||
popd
|
popd
|
||||||
case $m in
|
case $m in
|
||||||
|
@ -230,6 +252,10 @@ make clean
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 8 2017 Dave Love <loveshack@fedoraproject.org> - 5.1.3-5
|
||||||
|
- Fix up mpich-devel requirement for el7 7.3
|
||||||
|
- Avoid openblas on s3909(x)
|
||||||
|
|
||||||
* Sat Jun 3 2017 Dave Love <loveshack@fedoraproject.org> - 5.1.3-4
|
* Sat Jun 3 2017 Dave Love <loveshack@fedoraproject.org> - 5.1.3-4
|
||||||
- Fix mpich conditional
|
- Fix mpich conditional
|
||||||
- Build for openmpi on s390 f25+
|
- Build for openmpi on s390 f25+
|
||||||
|
|
Loading…
Reference in New Issue