rpms
/
superlu_dist
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't run tests, export build flags, verbose make

This commit is contained in:
Dave Love 2018-11-23 10:54:46 +00:00
parent 1e6e5c45ab
commit 2e892c8390
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
superlu_dist-make.inc
View File

@ -32,17 +32,16 @@ ARCHFLAGS = cr
RANLIB = /usr/bin/ranlib RANLIB = /usr/bin/ranlib
CC = mpicc CC = mpicc
CFLAGS += -O3 -DNDEBUG $(BLASDEF) -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -std=c99 -fPIC -g CFLAGS += -O3 -DNDEBUG $(BLASDEF) -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -std=c99 -DUSE_VENDOR_BLAS -fPIC
# CFLAGS += -D # CFLAGS += -D
# CFLAGS += # CFLAGS +=
CXX = mpicxx CXX = mpicxx
CXXFLAGS += -O3 -DNDEBUG $(BLASDEF) -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -fPIC -g -std=gnu++11 CXXFLAGS += -O3 -DNDEBUG $(BLASDEF) -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -std=gnu++11 -DUSE_VENDOR_BLAS -fPIC
XSDK_INDEX_SIZE=64
HAVE_LAPACK=1 HAVE_LAPACK=1
HAVE_PARMETIS=0 HAVE_PARMETIS=1
HAVE_COMBBLAS=0 HAVE_COMBBLAS=0
NOOPTS = -O0 NOOPTS = -O0
FORTRAN = mpif90 FORTRAN = mpif90
LOADER = $(CXX) -fopenmp LOADER = $(CXX)
LOADOPTS = LOADOPTS = $(LDFLAGS) -fopenmp

29
superlu_dist.spec
View File

@ -1,4 +1,5 @@
# Copyright (c) 2016 Dave Love, Liverpool University # Copyright (c) 2016 Dave Love, Liverpool University
# Copyright (c) 2018 Dave Love, University of Manchester
# MIT licence, per Fedora policy. # MIT licence, per Fedora policy.
# Following scalapack # Following scalapack
@ -9,9 +10,12 @@
%bcond_with openblas %bcond_with openblas
%endif %endif
%bcond_with check
%if 0%{?el6}%{?el7} %if 0%{?el6}%{?el7}
# For good enough C++ # For good enough C++. DTS6 is better (compatible libgfortran), but
%global dts devtoolset-6- # gets an ICE on an openmp pragma.
%global dts devtoolset-7-
%endif %endif
Name: superlu_dist Name: superlu_dist
@ -143,21 +147,20 @@ Development files for %name-mpich
cp %SOURCE1 make.inc cp %SOURCE1 make.inc
%build %build
%{?dts:source /opt/rh/devtoolset-6/enable} %{?dts:source /opt/rh/devtoolset-7/enable}
export CFLAGS="%build_cflags" LDFLAGS="%build_ldflags" CXXFLAGS="%build_cxxflags"
# This order to leave openmpi version in place for %%check # This order to leave openmpi version in place for %%check
for m in %mpich %openmpi; do for m in %mpich %openmpi; do
case $m in case $m in
openmpi) %_openmpi_load ;; openmpi) %_openmpi_load ;;
mpich) %_mpich_load ;; mpich) %_mpich_load ;;
esac 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
export CFLAGS="%optflags"
%if %{with openblas} %if %{with openblas}
make SuperLUroot=$(pwd) INCLUDEDIR=$(pwd)/SRC make SuperLUroot=$(pwd) INCLUDEDIR=$(pwd)/SRC V=1
%else %else
make blaslib HEADER=. BLASLIB='../libblas.a' INCLUDEDIR=%_includedir make blaslib HEADER=. BLASLIB='../libblas.a' INCLUDEDIR=%_includedir V=1
make SuperLUroot=$(pwd) BLASDEF= BLASLIB='../libblas.a' INCLUDEDIR=$(pwd)/SRC make SuperLUroot=$(pwd) BLASDEF= BLASLIB='../libblas.a' INCLUDEDIR=$(pwd)/SRC V=1
%endif %endif
mkdir -p tmp $m mkdir -p tmp $m
pushd tmp pushd tmp
@ -205,11 +208,12 @@ esac
done done
%check %check
# This is hanging inconsistently in koji, normally on i686 and arm. I
# can't debug it, so let's hope it doesn't deadlock in realistic
# situations.
%if %{with check}
%{?dts:source /opt/rh/devtoolset-6/enable} %{?dts:source /opt/rh/devtoolset-6/enable}
pushd EXAMPLE pushd EXAMPLE
# There are SEGVs on koji ppc64le which are probably due to limited stack
%ifnarch %power64
%if %{with openmpi} %if %{with openmpi}
# just check that it runs # just check that it runs
%_openmpi_load %_openmpi_load
@ -247,6 +251,7 @@ make clean
%changelog %changelog
* Wed Nov 21 2018 Dave Love <loveshack@fedoraproject.org> - 6.0.0-1 * Wed Nov 21 2018 Dave Love <loveshack@fedoraproject.org> - 6.0.0-1
- New version - New version
- Avoid tests
* Thu Jul 19 2018 Sandro Mani <manisandro@gmail.com> - 5.4.0-3 * Thu Jul 19 2018 Sandro Mani <manisandro@gmail.com> - 5.4.0-3
- Rebuild (scotch) - Rebuild (scotch)