Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
c1e507203d | ||
|
4f79b11d9b | ||
|
e04decbd12 | ||
|
a154320dc9 | ||
|
ff8fe6227d | ||
|
d2bb08c123 | ||
|
e3a1d0d8d1 | ||
|
2e892c8390 | ||
|
1e6e5c45ab | ||
|
af028c181a | ||
|
0fb73a7b27 | ||
|
539fc7cc35 | ||
|
cdd7b2cd75 | ||
|
cb458eecf8 | ||
|
061a2391fd |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,3 +1,6 @@
|
||||
/superlu_dist_5.1.3.tar.gz
|
||||
/superlu_dist_5.2.2.tar.gz
|
||||
/superlu_dist_5.3.0.tar.gz
|
||||
/superlu_dist_5.4.0.tar.gz
|
||||
/superlu_dist_6.0.0.tar.gz
|
||||
/superlu_dist_6.1.0.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (superlu_dist_5.3.0.tar.gz) = 178ac39593e3b98c974f354bd2da876684f809340a872485dd367054479ab66f739605f6be406c5ef2520c8dd01892fa77ec44120839b2904289ff3e1d3112e6
|
||||
SHA512 (superlu_dist_6.1.0.tar.gz) = dde1f8f47d2f2ff58f2421b563770ccd08b8ff1b5a2386d212554e6a283fd6a717dc2a20a31315727a2063e0c382a7fd94105ec608a6c99e54a68aace1bd7f3b
|
||||
|
15
superlu_dist-inst.patch
Normal file
15
superlu_dist-inst.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- SuperLU_DIST_6.0.0/INSTALL/Makefile~ 2018-09-22 17:56:51.000000000 +0100
|
||||
+++ SuperLU_DIST_6.0.0/INSTALL/Makefile 2018-11-23 11:57:07.731549805 +0000
|
||||
@@ -15,9 +15,9 @@
|
||||
@echo Testing machines parameters and timer
|
||||
csh install.csh
|
||||
|
||||
-smach_dist.o: ../SRC/smach_dist.c ; $(CC) -c $<
|
||||
-dmach_dist.o: ../SRC/dmach_dist.c ; $(CC) -c $<
|
||||
-superlu_timer.o: ../SRC/superlu_timer.c ; $(CC) -c $<
|
||||
+smach_dist.o: ../SRC/smach_dist.c ; $(CC) $(CFLAGS) -c $<
|
||||
+dmach_dist.o: ../SRC/dmach_dist.c ; $(CC) $(CFLAGS) -c $<
|
||||
+superlu_timer.o: ../SRC/superlu_timer.c ; $(CC) $(CFLAGS) -c $<
|
||||
|
||||
.c.o:
|
||||
$(CC) $(CFLAGS) -c $<
|
@ -32,11 +32,16 @@ ARCHFLAGS = cr
|
||||
RANLIB = /usr/bin/ranlib
|
||||
|
||||
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 +=
|
||||
CXX = mpicxx
|
||||
CXXFLAGS += -O3 -DNDEBUG $(BLASDEF) -DDEBUGlevel=0 -DPRNTlevel=0 -fopenmp -std=gnu++11 -DUSE_VENDOR_BLAS -fPIC
|
||||
HAVE_LAPACK=1
|
||||
HAVE_PARMETIS=1
|
||||
HAVE_COMBBLAS=0
|
||||
NOOPTS = -O0
|
||||
FORTRAN = mpif90
|
||||
|
||||
LOADER = $(CC) -fopenmp
|
||||
LOADOPTS =
|
||||
LOADER = $(CXX)
|
||||
LOADOPTS = $(LDFLAGS) -fopenmp
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- SuperLU_DIST_5.1.0/SRC/get_perm_c_parmetis.c~ 2016-05-16 06:16:44.000000000 +0100
|
||||
+++ SuperLU_DIST_5.1.0/SRC/get_perm_c_parmetis.c 2016-10-17 00:48:13.758797521 +0100
|
||||
@@ -24,6 +24,9 @@
|
||||
/* limits.h: the largest positive integer (INT_MAX) */
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <stdio.h>
|
||||
+#include <scotch.h>
|
||||
#include "parmetis.h"
|
||||
#include "superlu_ddefs.h"
|
||||
|
@ -1,4 +1,5 @@
|
||||
# Copyright (c) 2016 Dave Love, Liverpool University
|
||||
# Copyright (c) 2018 Dave Love, University of Manchester
|
||||
# MIT licence, per Fedora policy.
|
||||
|
||||
# Following scalapack
|
||||
@ -9,15 +10,25 @@
|
||||
%bcond_with openblas
|
||||
%endif
|
||||
|
||||
%bcond_without check
|
||||
|
||||
%if 0%{?el6}%{?el7}
|
||||
# For good enough C++
|
||||
%global dts devtoolset-7-
|
||||
%endif
|
||||
|
||||
Name: superlu_dist
|
||||
Version: 5.3.0
|
||||
Release: 2%{?dist}
|
||||
Version: 6.1.0
|
||||
Release: 3%{?dist}
|
||||
Summary: Solution of large, sparse, nonsymmetric systems of linear equations
|
||||
License: BSD
|
||||
URL: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
|
||||
Source0: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_%version.tar.gz
|
||||
Source1: superlu_dist-make.inc
|
||||
BuildRequires: scotch-devel gcc-gfortran
|
||||
# Use CFLAGS in INSTALL/Makefile (was only failing on some targets)
|
||||
Patch1: superlu_dist-inst.patch
|
||||
BuildRequires: scotch-devel
|
||||
BuildRequires: %{?dts}gcc-c++
|
||||
%if %{with openblas}
|
||||
BuildRequires: openblas-devel
|
||||
# [else] Probably not worth a bundled provides for the bundled partial cblas.
|
||||
@ -52,7 +63,7 @@ BuildRequires: metis-devel
|
||||
# For library soname. Start at one in case we need the incompatible
|
||||
# v4 packaged separately.
|
||||
%global major 1
|
||||
%global minor 2
|
||||
%global minor 3
|
||||
%global miner 0
|
||||
%global sover %major.%minor.%miner
|
||||
|
||||
@ -135,27 +146,29 @@ Development files for %name-mpich
|
||||
%prep
|
||||
%setup -q -n SuperLU_DIST_%version
|
||||
cp %SOURCE1 make.inc
|
||||
%patch1 -p1 -b .orig
|
||||
|
||||
|
||||
%build
|
||||
%{?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
|
||||
for m in %mpich %openmpi; do
|
||||
case $m in
|
||||
openmpi) %_openmpi_load ;;
|
||||
mpich) %_mpich_load ;;
|
||||
esac
|
||||
find -name \*.[oa] | xargs rm 2>/dev/null || true # no clean target
|
||||
pwd
|
||||
export CFLAGS="%optflags"
|
||||
find -name \*.[oa] | xargs rm 2>/dev/null || true # no "clean" target
|
||||
%if %{with openblas}
|
||||
make SuperLUroot=$(pwd)
|
||||
make SuperLUroot=$(pwd) INCLUDEDIR=$(pwd)/SRC V=1
|
||||
%else
|
||||
make blaslib HEADER=. BLASLIB='../libblas.a'
|
||||
make SuperLUroot=$(pwd) BLASDEF= BLASLIB='../libblas.a'
|
||||
make blaslib HEADER=. BLASLIB='../libblas.a' INCLUDEDIR=%_includedir V=1
|
||||
make SuperLUroot=$(pwd) BLASDEF= BLASLIB='../libblas.a' INCLUDEDIR=$(pwd)/SRC V=1
|
||||
%endif
|
||||
mkdir -p tmp $m
|
||||
pushd tmp
|
||||
ar x ../SRC/libsuperlu_dist.a
|
||||
mpicc -shared -Wl,-soname=libsuperlu_dist.so.%major \
|
||||
mpicxx -shared -Wl,-soname=libsuperlu_dist.so.%major \
|
||||
-o ../$m/libsuperlu_dist.so.%sover *.o -fopenmp \
|
||||
-lptscotchparmetis -lscotchmetis -lscotch -lptscotch \
|
||||
-lptscotcherr -lptscotcherrexit \
|
||||
@ -198,19 +211,22 @@ esac
|
||||
done
|
||||
|
||||
%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-7/enable}
|
||||
pushd EXAMPLE
|
||||
# There are SEGVs on koji ppc64le which are probably due to limited stack
|
||||
%ifnarch %power64
|
||||
%if %{with openmpi}
|
||||
# just check that it runs
|
||||
%_openmpi_load
|
||||
# Allow for more processes than cores
|
||||
export OMPI_MCA_rmaps_base_oversubscribe=1
|
||||
mpirun -n 4 ../pddrive -r 2 -c 2 g20.rua
|
||||
%endif
|
||||
%endif
|
||||
make clean
|
||||
|
||||
%{!?_licensedir:%global license %doc}
|
||||
%if %{with openmpi}
|
||||
%files openmpi
|
||||
%license License.txt
|
||||
@ -237,9 +253,44 @@ make clean
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 26 2018 Dave Love <loveshack@fedoraproject.org> - 5.3.0-2
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2019 Orion Poplawski <orion@nwra.com> - 6.1.0-2
|
||||
- Rebuild for openmpi 3.1.3
|
||||
|
||||
* Sun Feb 03 2019 Antonio Trande <sagitter@fedoraproject.org> - 6.1.0-1
|
||||
- Release 6.1.0
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sun Dec 16 2018 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-3
|
||||
- libsuperlu_dist is a C++ library, link with mpicxx
|
||||
- Allow oversubscription with openmpi in tests
|
||||
|
||||
* Thu Nov 29 2018 Orion Poplawski <orion@cora.nwra.com> - 6.0.0-2
|
||||
- Re-enable tests - seem to be working with openmpi 2.1.6rc1
|
||||
|
||||
* Wed Nov 21 2018 Dave Love <loveshack@fedoraproject.org> - 6.0.0-1
|
||||
- New version
|
||||
- Avoid tests
|
||||
|
||||
* Thu Jul 19 2018 Sandro Mani <manisandro@gmail.com> - 5.4.0-3
|
||||
- Rebuild (scotch)
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 10 2018 Dave Love <loveshack@fedoraproject.org> - 5.4.0-1
|
||||
- New version
|
||||
|
||||
* Thu Apr 26 2018 Dave Love <loveshack@fedoraproject.org> - 5.3.0-3
|
||||
- Require ptscotch-mpich-devel-parmetis
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Tue Jan 30 2018 Dave Love <loveshack@fedoraproject.org> - 5.3.0-1
|
||||
- New version
|
||||
- Update sovar
|
||||
|
Loading…
Reference in New Issue
Block a user