From a6b0c99a2a72e015ca7fb784e0e711e9f4e7fdbe17f01fcc8bb34aa29e24c78b Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 5 Nov 2020 16:39:58 +0000 Subject: [PATCH] Accepting request 846302 from home:anag:branches:science - New version 5.2.2 (boo#1178112) - bugfixes, documentation and examples update. - Update URL and Source0 and Source1, use get_tarball.sh to remove non distributable files. - Install superlu_ug.pdf provided by the tarball. - Remove patch, merged upstream * superlu-4.3-include.patch * superlu-4.3-dont-opt-away.diff * superlu-5.2-make.patch - Refresh patch: * superlu-examples_Makefile_remove_itersol.patch * superlu-make.linux.patch OBS-URL: https://build.opensuse.org/request/show/846302 OBS-URL: https://build.opensuse.org/package/show/science/superlu?expand=0&rev=26 --- get-tarball.sh | 29 ++++++++++++ superlu-4.3-dont-opt-away.diff | 20 --------- superlu-4.3-include.patch | 22 ---------- superlu-5.2-make.patch | 44 ------------------- superlu-5.2-remove-mc64ad.patch | 17 +++---- superlu-5.2.2.tar.gz | 3 ++ ...rlu-examples_Makefile_remove_itersol.patch | 28 ++++++------ superlu-make.linux.patch | 5 ++- superlu.changes | 16 +++++++ superlu.spec | 35 ++++++--------- superlu_5.2.1.tar.gz | 3 -- superlu_ug.pdf | 3 -- 12 files changed, 87 insertions(+), 138 deletions(-) create mode 100644 get-tarball.sh delete mode 100644 superlu-4.3-dont-opt-away.diff delete mode 100644 superlu-4.3-include.patch delete mode 100644 superlu-5.2-make.patch create mode 100644 superlu-5.2.2.tar.gz delete mode 100644 superlu_5.2.1.tar.gz delete mode 100644 superlu_ug.pdf diff --git a/get-tarball.sh b/get-tarball.sh new file mode 100644 index 0000000..df57405 --- /dev/null +++ b/get-tarball.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -e + +VERSION=5.2.2 +FILES="mc64ad.c sgsisx.c sldperm.c dgsisx.c dldperm.c cgsisx.c cldperm.c zgsisx.c zldperm.c" +URL="https://github.com/xiaoyeli/superlu/archive/v$VERSION/superlu-$VERSION.tar.gz" +TAR="superlu-$VERSION.tar.gz" + +WORKDIR="$(mktemp -d superlu.XXXX)" + +TODIR="$(pwd)" +cd "$WORKDIR" + +wget $URL +tar xfz superlu-$VERSION.tar.gz + +for file in $FILES; do + rm superlu-$VERSION/SRC/$file +done + +if [ -e "$TODIR/$TAR" ]; then + echo "$TAR already exists." +else + tar cfz "$TODIR/$TAR" superlu-$VERSION +fi + +cd "$TODIR" +rm -r "$WORKDIR" + diff --git a/superlu-4.3-dont-opt-away.diff b/superlu-4.3-dont-opt-away.diff deleted file mode 100644 index 23b015b..0000000 --- a/superlu-4.3-dont-opt-away.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -aruN SuperLU_4.3.orig/INSTALL/timertst.c SuperLU_4.3/INSTALL/timertst.c ---- SuperLU_4.3.orig/INSTALL/timertst.c 2011-10-27 21:49:47.000000000 +0200 -+++ SuperLU_4.3/INSTALL/timertst.c 2012-12-20 21:55:13.954437737 +0100 -@@ -6,6 +6,8 @@ - return; - } - -+volatile double _dummy; -+ - int main() - { - /* Parameters */ -@@ -32,6 +34,7 @@ - for (j = 0; j < iters; ++j) { - for (i = 0; i < NMAX; ++i) y[i] += alpha * x[i]; - alpha = -alpha; -+ _dummy = y[j%NMAX]; - } - t2 = SuperLU_timer_(); - tnotim = t2 - t1; diff --git a/superlu-4.3-include.patch b/superlu-4.3-include.patch deleted file mode 100644 index 8af8b69..0000000 --- a/superlu-4.3-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -aruN SuperLU_4.3.orig/TESTING/ddrive.c SuperLU_4.3/TESTING/ddrive.c ---- SuperLU_4.3.orig/TESTING/ddrive.c 2011-10-27 21:49:47.000000000 +0200 -+++ SuperLU_4.3/TESTING/ddrive.c 2012-12-20 22:14:43.026465899 +0100 -@@ -11,6 +11,7 @@ - * Purpose: MAIN test program - */ - #include -+#include - #include "slu_ddefs.h" - - #define NTESTS 5 /* Number of test types */ -diff -aruN SuperLU_4.3.orig/TESTING/sdrive.c SuperLU_4.3/TESTING/sdrive.c ---- SuperLU_4.3.orig/TESTING/sdrive.c 2011-10-27 21:49:47.000000000 +0200 -+++ SuperLU_4.3/TESTING/sdrive.c 2012-12-20 22:14:43.030465752 +0100 -@@ -11,6 +11,7 @@ - * Purpose: MAIN test program - */ - #include -+#include - #include "slu_sdefs.h" - - #define NTESTS 5 /* Number of test types */ diff --git a/superlu-5.2-make.patch b/superlu-5.2-make.patch deleted file mode 100644 index 73858a8..0000000 --- a/superlu-5.2-make.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ruN SuperLU_5.2.1.old/make.inc SuperLU_5.2.1/make.inc ---- SuperLU_5.2.1.old/make.inc 2016-05-22 17:08:28.000000000 +0100 -+++ SuperLU_5.2.1/make.inc 2016-09-29 21:04:09.000000000 +0100 -@@ -18,14 +18,14 @@ - # - # The name of the libraries to be created/linked to - # --SuperLUroot = /home/xiaoye/Dropbox/Codes/SuperLU/SuperLU_5.2.1/build -+SuperLUroot = ../ - SUPERLULIB = $(SuperLUroot)/SRC/libsuperlu.a - - TMGLIB = libtmglib.a - --# BLASDEF = -DUSE_VENDOR_BLAS --BLASLIB = /home/xiaoye/Dropbox/Codes/SuperLU/SuperLU_5.2.1/build/CBLAS/libblas.a --LIBS = $(SUPERLULIB) /home/xiaoye/Dropbox/Codes/SuperLU/SuperLU_5.2.1/build/CBLAS/libblas.a -+BLASDEF = -DUSE_VENDOR_BLAS -+BLASLIB = -lopenblas -+LIBS = $(SUPERLULIB) $(BLASLIB) - - # - # The archiver and the flag(s) to use when building archive (library) -@@ -35,10 +35,11 @@ - ARCHFLAGS = cr - RANLIB = /usr/bin/ranlib - --CC = /usr/bin/cc --CFLAGS = -O3 -DNDEBUG -DPRNTlevel=0 -DAdd_ --NOOPTS = -O0 --FORTRAN = /usr/bin/gfortran -+#CC = gcc -+CFLAGS = $(RPM_OPT_FLAGS) -fPIC -DPIC -+NOOPTS = $(RPM_OPT_FLAGS) -Os -fPIC -DPIC -+#FORTRAN = gfortran #g77 -+FFLAGS = $(RPM_OPT_FLAGS) -fPIC - - LOADER = $(CC) - LOADOPTS = -@@ -46,4 +47,4 @@ - # - # The directory in which Matlab is installed - # --MATLAB = /Applications/MATLAB_R2015b.app -+#MATLAB = /Applications/MATLAB_R2015b.app diff --git a/superlu-5.2-remove-mc64ad.patch b/superlu-5.2-remove-mc64ad.patch index 64bbd68..12ec520 100644 --- a/superlu-5.2-remove-mc64ad.patch +++ b/superlu-5.2-remove-mc64ad.patch @@ -1,14 +1,15 @@ ---- a/SRC/CMakeLists.txt 2016-05-29 13:57:44.683251096 +0200 -+++ b/SRC/CMakeLists.txt 2016-05-29 13:57:31.570987497 +0200 -@@ -22,7 +22,6 @@ +diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -21,7 +21,6 @@ ilu_relax_snode.c ilu_heap_relax_snode.c mark_relax.c - mc64ad.c qselect.c input_error.c - ) -@@ -63,9 +62,7 @@ + dmach.c +@@ -65,9 +64,7 @@ smemory.c sutil.c smyblas2.c @@ -18,7 +19,7 @@ ilu_sdrop_row.c ilu_ssnode_dfs.c ilu_scolumn_dfs.c -@@ -112,9 +109,7 @@ +@@ -115,9 +112,7 @@ dmemory.c dutil.c dmyblas2.c @@ -28,7 +29,7 @@ ilu_ddrop_row.c ilu_dsnode_dfs.c ilu_dcolumn_dfs.c -@@ -163,9 +158,7 @@ +@@ -168,9 +163,7 @@ cmemory.c cutil.c cmyblas2.c @@ -38,7 +39,7 @@ ilu_cdrop_row.c ilu_csnode_dfs.c ilu_ccolumn_dfs.c -@@ -213,9 +206,7 @@ +@@ -219,9 +212,7 @@ zmemory.c zutil.c zmyblas2.c diff --git a/superlu-5.2.2.tar.gz b/superlu-5.2.2.tar.gz new file mode 100644 index 0000000..ec2c27b --- /dev/null +++ b/superlu-5.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4339ba714c3ad2165d2b9a608114d3150921509fbc8757184a693ee4d4581abe +size 2595228 diff --git a/superlu-examples_Makefile_remove_itersol.patch b/superlu-examples_Makefile_remove_itersol.patch index 2a28c2b..2d55379 100644 --- a/superlu-examples_Makefile_remove_itersol.patch +++ b/superlu-examples_Makefile_remove_itersol.patch @@ -1,6 +1,7 @@ ---- EXAMPLE/Makefile 2019-02-08 09:57:41.220000000 +0100 -+++ EXAMPLE/Makefile.patched 2019-02-08 10:23:18.464000000 +0100 -@@ -40,8 +40,6 @@ +diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile +--- a/EXAMPLE/Makefile ++++ b/EXAMPLE/Makefile +@@ -39,8 +39,6 @@ SLINXEXM1 = slinsolx1.o SLINXEXM2 = slinsolx2.o SLINXEXM3 = slinsolx3.o @@ -9,7 +10,7 @@ DLINEXM = dlinsol.o DLINEXM1 = dlinsol1.o -@@ -50,8 +48,6 @@ +@@ -49,8 +47,6 @@ DLINXEXM2 = dlinsolx2.o DLINXEXM3 = dlinsolx3.o SUPERLUEXM = superlu.o sp_ienv.o @@ -18,7 +19,7 @@ CLINEXM = clinsol.o CLINEXM1 = clinsol1.o -@@ -59,8 +55,6 @@ +@@ -58,8 +54,6 @@ CLINXEXM1 = clinsolx1.o CLINXEXM2 = clinsolx2.o CLINXEXM3 = clinsolx3.o @@ -27,7 +28,7 @@ ZLINEXM = zlinsol.o ZLINEXM1 = zlinsol1.o -@@ -68,20 +62,17 @@ +@@ -67,20 +61,17 @@ ZLINXEXM1 = zlinsolx1.o ZLINXEXM2 = zlinsolx2.o ZLINXEXM3 = zlinsolx3.o @@ -54,7 +55,7 @@ slinsol: $(SLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@ -@@ -101,11 +92,6 @@ +@@ -100,11 +91,6 @@ slinsolx3: $(SLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@ @@ -66,7 +67,7 @@ dlinsol: $(DLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@ -@@ -128,12 +114,6 @@ +@@ -127,12 +113,6 @@ superlu: $(SUPERLUEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@ @@ -79,7 +80,7 @@ clinsol: $(CLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@ -@@ -152,12 +132,6 @@ +@@ -151,12 +131,6 @@ clinsolx3: $(CLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@ @@ -92,7 +93,7 @@ zlinsol: $(ZLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@ -@@ -176,11 +150,6 @@ +@@ -175,11 +149,6 @@ zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@ @@ -103,13 +104,10 @@ - $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@ .c.o: - $(CC) $(CFLAGS) $(CDEFS) -I$(HEADER) -c $< $(VERBOSE) -@@ -190,7 +159,7 @@ + $(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE) +@@ -189,7 +158,7 @@ clean: rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \ - superlu *itersol *itersol1 + superlu - - - diff --git a/superlu-make.linux.patch b/superlu-make.linux.patch index 5c03104..1eb19ef 100644 --- a/superlu-make.linux.patch +++ b/superlu-make.linux.patch @@ -1,5 +1,6 @@ ---- MAKE_INC/make.linux 2016-05-22 17:58:44.000000000 +0200 -+++ MAKE_INC/make.linux.patched 2019-02-08 10:35:38.740265921 +0100 +diff -Nrua a/MAKE_INC/make.linux b/MAKE_INC/make.linux +--- a/MAKE_INC/make.linux ++++ b/MAKE_INC/make.linux @@ -21,8 +21,8 @@ # # The name of the libraries to be created/linked to diff --git a/superlu.changes b/superlu.changes index 1432158..81d2c05 100644 --- a/superlu.changes +++ b/superlu.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Oct 26 14:11:13 UTC 2020 - Ana Guerrero Lopez + +- New version 5.2.2 (boo#1178112) + - bugfixes, documentation and examples update. +- Update URL and Source0 and Source1, use get_tarball.sh to remove + non distributable files. +- Install superlu_ug.pdf provided by the tarball. +- Remove patch, merged upstream + * superlu-4.3-include.patch + * superlu-4.3-dont-opt-away.diff + * superlu-5.2-make.patch +- Refresh patch: + * superlu-examples_Makefile_remove_itersol.patch + * superlu-make.linux.patch + ------------------------------------------------------------------- Fri Sep 11 06:13:46 UTC 2020 - Egbert Eich diff --git a/superlu.spec b/superlu.spec index 216d93d..9d51cb6 100644 --- a/superlu.spec +++ b/superlu.spec @@ -20,9 +20,7 @@ # Base package name %define pname superlu -%define ver 5.2.1 - -%define _ver %(echo %{ver} | tr . _) +%define ver 5.2.2 %if "%flavor" == "" ExclusiveArch: do_not_build @@ -77,7 +75,6 @@ ExclusiveArch: do_not_build %define libname lib%{name}%{?_sover} %else %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} -%define package_name %{hpc_package_name %_ver} %define p_prefix %hpc_prefix %define p_includedir %hpc_includedir %define p_libdir %hpc_libdir @@ -90,15 +87,11 @@ License: BSD-3-Clause Group: Productivity/Scientific/Math Version: %{ver} Release: 0 -Source: http://crd-legacy.lbl.gov/%7Exiaoye/SuperLU/%{pname}_%{version}.tar.gz -Source1: superlu_ug.pdf +URL: https://portal.nersc.gov/project/sparse/superlu/ +Source0: superlu-5.2.2.tar.gz +# Tarball above is generated with the script below +Source1: get-tarball.sh Source2: README.SUSE -# PATCH-FEATURE-OPENSUSE superlu-5.2-make.patch : add compiler and build flags in make.inc -Patch0: superlu-5.2-make.patch -# PATCH-FIX-UPSTREAM superlu-4.3-include.patch : avoid implicit declaration warnings -Patch1: superlu-4.3-include.patch -# PATCH-FIX-UPSTREAM superlu-4.3-dont-opt-away.diff -Patch2: superlu-4.3-dont-opt-away.diff # PATCH-FIX-OPENSUSE superlu-5.2-remove-mc64ad.patch [bnc#796236] # The Harwell Subroutine Library (HSL) routine mc64ad.c have been removed # from the original sources for legal reasons. This patch disables the inclusion of @@ -106,7 +99,6 @@ Patch2: superlu-4.3-dont-opt-away.diff Patch3: superlu-5.2-remove-mc64ad.patch Patch4: superlu-examples_Makefile_remove_itersol.patch Patch5: superlu-make.linux.patch -URL: http://crd.lbl.gov/~xiaoye/SuperLU/ BuildRequires: cmake >= 2.8.12 BuildRequires: fdupes BuildRequires: tcsh @@ -180,14 +172,11 @@ decomposition of sparse matrices. %endif %prep -%setup -q -n SuperLU_%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n superlu-%{version} %patch3 -p1 -%patch4 -p0 -%patch5 -p0 -cp %SOURCE1 %SOURCE2 ./ +%patch4 -p1 +%patch5 -p1 +cp %SOURCE2 ./ # Create baselibs.conf dynamically (non-HPC build only). %if %{without hpc} cat > %{_sourcedir}/baselibs.conf <