From 19c568332c72d3eb2814fa22043ea1c2e3f567587eeecdd6c32ad7126a6a8f8a Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sun, 16 Apr 2023 07:19:32 +0000 Subject: [PATCH] Accepting request 1079675 from home:mathletic:branches:science - update to version 6.0.0 * Add 64-bit indexing support, with mixed int and int64_t types. * Add METIS ordering option. * Add FORTRAN/CMakeLists.txt - Update and rename patch superlu-5.2-remove-mc64ad.patch to superlu-remove-mc64ad.patch - update superlu-examples_Makefile_remove_itersol.patch OBS-URL: https://build.opensuse.org/request/show/1079675 OBS-URL: https://build.opensuse.org/package/show/science/superlu?expand=0&rev=36 --- superlu-5.3.0.tar.gz | 3 --- superlu-6.0.0.tar.gz | 3 +++ ...rlu-examples_Makefile_remove_itersol.patch | 23 ++++++++++--------- ...c64ad.patch => superlu-remove-mc64ad.patch | 13 ++++++----- superlu.changes | 11 +++++++++ superlu.spec | 10 ++++---- 6 files changed, 38 insertions(+), 25 deletions(-) delete mode 100644 superlu-5.3.0.tar.gz create mode 100644 superlu-6.0.0.tar.gz rename superlu-5.2-remove-mc64ad.patch => superlu-remove-mc64ad.patch (74%) diff --git a/superlu-5.3.0.tar.gz b/superlu-5.3.0.tar.gz deleted file mode 100644 index fc3eccb..0000000 --- a/superlu-5.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c347397f791eb8cb18b557dfe8ed83eaed5638a59c7335808b3949673b35c0a3 -size 2468947 diff --git a/superlu-6.0.0.tar.gz b/superlu-6.0.0.tar.gz new file mode 100644 index 0000000..a781cd0 --- /dev/null +++ b/superlu-6.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c199eac2dc57092c337cfea7e422053e8f8229f24e029825b0950edd1d17e8e +size 2487927 diff --git a/superlu-examples_Makefile_remove_itersol.patch b/superlu-examples_Makefile_remove_itersol.patch index 2d55379..e5bc3f8 100644 --- a/superlu-examples_Makefile_remove_itersol.patch +++ b/superlu-examples_Makefile_remove_itersol.patch @@ -1,16 +1,17 @@ -diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile +diff --git a/EXAMPLE/Makefile b/EXAMPLE/Makefile +index eb961e3..0ae9052 100644 --- a/EXAMPLE/Makefile +++ b/EXAMPLE/Makefile -@@ -39,8 +39,6 @@ +@@ -39,8 +39,6 @@ SLINXEXM = slinsolx.o SLINXEXM1 = slinsolx1.o SLINXEXM2 = slinsolx2.o SLINXEXM3 = slinsolx3.o -SITSOL = sitersol.o sfgmr.o -SITSOL1 = sitersol1.o sfgmr.o - DLINEXM = dlinsol.o + DLINEXM = dlinsol.o dreadtriple_noheader.o #dgstrf.o dcolumn_dfs.o #sp_ienv.o DLINEXM1 = dlinsol1.o -@@ -49,8 +47,6 @@ +@@ -49,8 +47,6 @@ DLINXEXM1 = dlinsolx1.o DLINXEXM2 = dlinsolx2.o DLINXEXM3 = dlinsolx3.o SUPERLUEXM = superlu.o sp_ienv.o @@ -19,7 +20,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile CLINEXM = clinsol.o CLINEXM1 = clinsol1.o -@@ -58,8 +54,6 @@ +@@ -58,8 +54,6 @@ CLINXEXM = clinsolx.o CLINXEXM1 = clinsolx1.o CLINXEXM2 = clinsolx2.o CLINXEXM3 = clinsolx3.o @@ -28,7 +29,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile ZLINEXM = zlinsol.o ZLINEXM1 = zlinsol1.o -@@ -67,20 +61,17 @@ +@@ -67,20 +61,17 @@ ZLINXEXM = zlinsolx.o ZLINXEXM1 = zlinsolx1.o ZLINXEXM2 = zlinsolx2.o ZLINXEXM3 = zlinsolx3.o @@ -55,7 +56,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile slinsol: $(SLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@ -@@ -100,11 +91,6 @@ +@@ -100,11 +91,6 @@ slinsolx2: $(SLINXEXM2) $(SUPERLULIB) slinsolx3: $(SLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@ @@ -67,7 +68,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile dlinsol: $(DLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@ -@@ -127,12 +113,6 @@ +@@ -127,12 +113,6 @@ dlinsolx3: $(DLINXEXM3) $(SUPERLULIB) superlu: $(SUPERLUEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@ @@ -80,7 +81,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile clinsol: $(CLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@ -@@ -151,12 +131,6 @@ +@@ -151,12 +131,6 @@ clinsolx2: $(CLINXEXM2) $(SUPERLULIB) clinsolx3: $(CLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@ @@ -93,7 +94,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile zlinsol: $(ZLINEXM) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@ -@@ -175,11 +149,6 @@ +@@ -175,11 +149,6 @@ zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB) zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB) $(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@ @@ -105,7 +106,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile .c.o: $(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE) -@@ -189,7 +158,7 @@ +@@ -189,7 +158,7 @@ zitersol1: $(ZITSOL1) $(SUPERLULIB) clean: rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \ diff --git a/superlu-5.2-remove-mc64ad.patch b/superlu-remove-mc64ad.patch similarity index 74% rename from superlu-5.2-remove-mc64ad.patch rename to superlu-remove-mc64ad.patch index 12ec520..ce4f136 100644 --- a/superlu-5.2-remove-mc64ad.patch +++ b/superlu-remove-mc64ad.patch @@ -1,7 +1,8 @@ -diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +index 34c4aa4..7996af0 100644 --- a/SRC/CMakeLists.txt +++ b/SRC/CMakeLists.txt -@@ -21,7 +21,6 @@ +@@ -23,7 +23,6 @@ set(sources ilu_relax_snode.c ilu_heap_relax_snode.c mark_relax.c @@ -9,7 +10,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt qselect.c input_error.c dmach.c -@@ -65,9 +64,7 @@ +@@ -68,9 +67,7 @@ if(enable_single) smemory.c sutil.c smyblas2.c @@ -19,7 +20,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt ilu_sdrop_row.c ilu_ssnode_dfs.c ilu_scolumn_dfs.c -@@ -115,9 +112,7 @@ +@@ -118,9 +115,7 @@ if(enable_double) dmemory.c dutil.c dmyblas2.c @@ -29,7 +30,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt ilu_ddrop_row.c ilu_dsnode_dfs.c ilu_dcolumn_dfs.c -@@ -168,9 +163,7 @@ +@@ -171,9 +166,7 @@ if(enable_complex) cmemory.c cutil.c cmyblas2.c @@ -39,7 +40,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt ilu_cdrop_row.c ilu_csnode_dfs.c ilu_ccolumn_dfs.c -@@ -219,9 +212,7 @@ +@@ -222,9 +215,7 @@ if(enable_complex16) zmemory.c zutil.c zmyblas2.c diff --git a/superlu.changes b/superlu.changes index f46c3da..ebad1af 100644 --- a/superlu.changes +++ b/superlu.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Apr 9 03:01:30 UTC 2023 - Christoph G + +- update to version 6.0.0 + * Add 64-bit indexing support, with mixed int and int64_t types. + * Add METIS ordering option. + * Add FORTRAN/CMakeLists.txt +- Update and rename patch superlu-5.2-remove-mc64ad.patch to + superlu-remove-mc64ad.patch +- update superlu-examples_Makefile_remove_itersol.patch + ------------------------------------------------------------------- Thu Sep 30 19:47:48 UTC 2021 - Antoine Ginies diff --git a/superlu.spec b/superlu.spec index cc41660..c8ef3ac 100644 --- a/superlu.spec +++ b/superlu.spec @@ -1,7 +1,7 @@ # # spec file for package superlu # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ # Base package name %define pname superlu -%define ver 5.3.0 +%define ver 6.0.0 %define _ver %(echo %{ver} | tr . _) %if "%flavor" == "" @@ -72,7 +72,7 @@ ExclusiveArch: do_not_build %define p_prefix %_prefix %define p_includedir %_includedir %define p_libdir %_libdir -%define _sover 5 +%define _sover 6 %define libname lib%{name}%{?_sover} %else %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} @@ -94,11 +94,11 @@ Source0: %{pname}-%{version}.tar.gz # Tarball above is generated with the script below Source1: get-tarball.sh Source2: README.SUSE -# PATCH-FIX-OPENSUSE superlu-5.2-remove-mc64ad.patch [bnc#796236] +# PATCH-FIX-OPENSUSE superlu-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 # this routine in the library which, however, remains fully functional -Patch3: superlu-5.2-remove-mc64ad.patch +Patch3: superlu-remove-mc64ad.patch Patch4: superlu-examples_Makefile_remove_itersol.patch Patch5: superlu-make.linux.patch BuildRequires: cmake >= 2.8.12