- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +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

sources

@@ -1 +1 @@
-SHA512 (superlu_dist_5.1.3.tar.gz) = 064942171543006047d5379bc47d27d14467a116e8d2fd8dac82283e237757e2afd31a4ad51c2925323c1b59e70e15da38c6b35db3c1d14b520fc02b906704b6
+SHA512 (superlu_dist_6.1.0.tar.gz) = dde1f8f47d2f2ff58f2421b563770ccd08b8ff1b5a2386d212554e6a283fd6a717dc2a20a31315727a2063e0c382a7fd94105ec608a6c99e54a68aace1bd7f3b

superlu_dist-cblas.patch

@@ -1,30 +0,0 @@
---- SuperLU_DIST_5.1.3/CBLAS/Makefile~	2017-02-14 04:51:02.000000000 +0000
-+++ SuperLU_DIST_5.1.3/CBLAS/Makefile	2017-06-07 22:24:24.229000000 +0000
-@@ -66,22 +66,22 @@
- 
- all: single double complex complex16
- 
--single: $(SBLAS1) $(SBLAS2) $(SBLAS3)
-+single: $(SBLAS1) $(SBLAS2) $(SBLAS3) $(ALLBLAS)
- 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
- 	$(SBLAS2) $(SBLAS3)
- 	$(RANLIB) $(BLASLIB)
- 
--double: $(DBLAS1) $(DBLAS2) $(DBLAS3)
-+double: $(DBLAS1) $(DBLAS2) $(DBLAS3) $(ALLBLAS)
- 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(DBLAS1) $(ALLBLAS) \
- 	$(DBLAS2) $(DBLAS3)
- 	$(RANLIB) $(BLASLIB)
- 
--complex: $(CBLAS1) $(CBLAS2) $(CBLAS3)
-+complex: $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ALLBLAS)
- 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(CBLAS1) $(ALLBLAS) \
- 	$(CBLAS2) $(CBLAS3)
- 	$(RANLIB) $(BLASLIB)
- 
--complex16: $(ZBLAS1) $(ZBLAS2) $(ZBLAS3)
-+complex16: $(ZBLAS1) $(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
- 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(ZBLAS1) $(ALLBLAS) \
- 	$(ZBLAS2) $(ZBLAS3)
- 	$(RANLIB) $(BLASLIB)
-

superlu_dist-inst.patch

@@ -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 $<

superlu_dist-make.inc

@@ -20,7 +20,8 @@ DSUPERLULIB   	= $(SuperLUroot)/SRC/libsuperlu_dist.a
 BLASDEF		= -DUSE_VENDOR_BLAS
 BLASLIB		= -lopenblas
 
-LIBS		= $(DSUPERLULIB) -lptscotchparmetis -lptscotch -lptscotcherr -lmetis -lscotch $(BLASLIB)
+LIBS		= $(DSUPERLULIB) -lptscotchparmetis -lmetis -lscotch \
+-lptscotch -lptscotcherr -lptscotcherrexit $(BLASLIB)
 
 #
 #  The archiver and the flag(s) to use when building archive (library)
@@ -31,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

superlu_dist-output.patch

@@ -1,22 +0,0 @@
---- SuperLU_DIST_5.1.2/SRC/dmemory_dist.c~	2016-10-21 19:50:33.000000000 +0100
-+++ SuperLU_DIST_5.1.2/SRC/dmemory_dist.c	2016-11-17 11:56:08.419300143 +0000
-@@ -129,7 +129,7 @@
-     mem_usage->total += (float)(2 * k * iword);
- #else
-     /*mem_usage->total += stat->current_buffer;*/
--    printf(".. dQuery_Space: peak_buffer %.2f (MB)\n", stat->peak_buffer * 1.0e-6);
-+    /* printf(".. dQuery_Space: peak_buffer %.2f (MB)\n", stat->peak_buffer * 1.0e-6); */
-     mem_usage->total += stat->peak_buffer;
- #endif
- 
---- SuperLU_DIST_5.1.2/SRC/zmemory_dist.c~	2016-10-21 19:50:33.000000000 +0100
-+++ SuperLU_DIST_5.1.2/SRC/zmemory_dist.c	2016-11-17 11:57:18.260046576 +0000
-@@ -128,7 +128,7 @@
-     mem_usage->total += (float)(2 * k * iword);
- #else
-     /*mem_usage->total += stat->current_buffer;*/
--    printf(".. zQuery_Space: peak_buffer %.2f (MB)\n", stat->peak_buffer * 1.0e-6);
-+    /* printf(".. zQuery_Space: peak_buffer %.2f (MB)\n", stat->peak_buffer * 1.0e-6); */
-     mem_usage->total += stat->peak_buffer;
- #endif
- 

superlu_dist-parmetis.patch

@@ -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"
- 

superlu_dist.spec

@@ -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,24 +10,28 @@
 %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.1.3
-Release:       6%{?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
-# Make the parmetis support work with Scotch
-Patch1:        superlu_dist-parmetis.patch
-# Zap diagnostics, recommended in
-# <https://math.berkeley.edu/~linlin/pexsi/page_dependency.html>
-Patch2:        superlu_dist-output.patch
-Patch3:	       superlu_dist-cblas.patch
-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
-# Probably not worth a bundled provides for the bundled partial cblas.
+# [else] 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
 # -lscotchmetis.
@@ -42,15 +47,7 @@ BuildRequires: metis-devel
 %bcond_without mpich
 %endif
 
-%ifarch s390 s390x
-%if 0%{?fedora} >= 25
 %bcond_without openmpi
-%else
-%bcond_with openmpi
-%endif
-%else
-%bcond_without openmpi
-%endif
 
 %if %{with openmpi}
 %global openmpi openmpi
@@ -66,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 0
+%global minor 3
 %global miner 0
 %global sover %major.%minor.%miner
 
@@ -137,8 +134,8 @@ This is the mpich version.
 
 %package mpich-devel
 Summary: Development files for %name-mpich
-# https://bugzilla.redhat.com/show_bug.cgi?id=1397192 (fixed in RHEL 7.4 beta)
-Requires: mpich-devel%{!?el7:%{?_isa}}
+Requires: mpich-devel%{?_isa}
+Requires: ptscotch-mpich-devel%{?_isa} ptscotch-mpich-devel-parmetis%{?_isa}
 Requires: %name-mpich%{?_isa} = %version-%release
 
 %description mpich-devel
@@ -148,33 +145,33 @@ Development files for %name-mpich
 
 %prep
 %setup -q -n SuperLU_DIST_%version
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 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 -Wl,--as-needed \
-      -o ../$m/libsuperlu_dist.so.%sover *.o -fopenmp -lptscotchparmetis \
-      -lptscotch -lptscotcherr -lscotch -lmetis \
+mpicxx -shared -Wl,-soname=libsuperlu_dist.so.%major \
+      -o ../$m/libsuperlu_dist.so.%sover *.o -fopenmp \
+       -lptscotchparmetis -lscotchmetis -lscotch -lptscotch \
+       -lptscotcherr -lptscotcherrexit \
 %if %{with openblas}
       -lopenblas \
 %endif
@@ -214,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
@@ -253,6 +253,63 @@ make clean
 
 
 %changelog
+* 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
+- Drop patch
+
+* Sun Nov  5 2017 Dave Love <loveshack@fedoraproject.org> - 5.2.2-2
+- Link againt ptscothmetis et al
+
+* Tue Oct 31 2017 Dave Love <loveshack@fedoraproject.org> - 5.2.2-1
+- New version
+- Drop output and cmake patches
+- Update soname minor version (added function)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Fri Jun  9 2017 Dave Love <loveshack@fedoraproject.org> - 5.1.3-6
 - Maybe use openblas_arches instead