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
This commit is contained in:
Atri Bhattacharya 2023-04-16 07:19:32 +00:00 committed by Git OBS Bridge
parent 0d0133e0b3
commit 19c568332c
6 changed files with 38 additions and 25 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c347397f791eb8cb18b557dfe8ed83eaed5638a59c7335808b3949673b35c0a3
size 2468947

BIN
superlu-6.0.0.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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 --- a/EXAMPLE/Makefile
+++ b/EXAMPLE/Makefile +++ b/EXAMPLE/Makefile
@@ -39,8 +39,6 @@ @@ -39,8 +39,6 @@ SLINXEXM = slinsolx.o
SLINXEXM1 = slinsolx1.o SLINXEXM1 = slinsolx1.o
SLINXEXM2 = slinsolx2.o SLINXEXM2 = slinsolx2.o
SLINXEXM3 = slinsolx3.o SLINXEXM3 = slinsolx3.o
-SITSOL = sitersol.o sfgmr.o -SITSOL = sitersol.o sfgmr.o
-SITSOL1 = sitersol1.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 DLINEXM1 = dlinsol1.o
@@ -49,8 +47,6 @@ @@ -49,8 +47,6 @@ DLINXEXM1 = dlinsolx1.o
DLINXEXM2 = dlinsolx2.o DLINXEXM2 = dlinsolx2.o
DLINXEXM3 = dlinsolx3.o DLINXEXM3 = dlinsolx3.o
SUPERLUEXM = superlu.o sp_ienv.o SUPERLUEXM = superlu.o sp_ienv.o
@ -19,7 +20,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
CLINEXM = clinsol.o CLINEXM = clinsol.o
CLINEXM1 = clinsol1.o CLINEXM1 = clinsol1.o
@@ -58,8 +54,6 @@ @@ -58,8 +54,6 @@ CLINXEXM = clinsolx.o
CLINXEXM1 = clinsolx1.o CLINXEXM1 = clinsolx1.o
CLINXEXM2 = clinsolx2.o CLINXEXM2 = clinsolx2.o
CLINXEXM3 = clinsolx3.o CLINXEXM3 = clinsolx3.o
@ -28,7 +29,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
ZLINEXM = zlinsol.o ZLINEXM = zlinsol.o
ZLINEXM1 = zlinsol1.o ZLINEXM1 = zlinsol1.o
@@ -67,20 +61,17 @@ @@ -67,20 +61,17 @@ ZLINXEXM = zlinsolx.o
ZLINXEXM1 = zlinsolx1.o ZLINXEXM1 = zlinsolx1.o
ZLINXEXM2 = zlinsolx2.o ZLINXEXM2 = zlinsolx2.o
ZLINXEXM3 = zlinsolx3.o ZLINXEXM3 = zlinsolx3.o
@ -55,7 +56,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
slinsol: $(SLINEXM) $(SUPERLULIB) slinsol: $(SLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@
@@ -100,11 +91,6 @@ @@ -100,11 +91,6 @@ slinsolx2: $(SLINXEXM2) $(SUPERLULIB)
slinsolx3: $(SLINXEXM3) $(SUPERLULIB) slinsolx3: $(SLINXEXM3) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@
@ -67,7 +68,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
dlinsol: $(DLINEXM) $(SUPERLULIB) dlinsol: $(DLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
@@ -127,12 +113,6 @@ @@ -127,12 +113,6 @@ dlinsolx3: $(DLINXEXM3) $(SUPERLULIB)
superlu: $(SUPERLUEXM) $(SUPERLULIB) superlu: $(SUPERLUEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
@ -80,7 +81,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
clinsol: $(CLINEXM) $(SUPERLULIB) clinsol: $(CLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
@@ -151,12 +131,6 @@ @@ -151,12 +131,6 @@ clinsolx2: $(CLINXEXM2) $(SUPERLULIB)
clinsolx3: $(CLINXEXM3) $(SUPERLULIB) clinsolx3: $(CLINXEXM3) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@
@ -93,7 +94,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
zlinsol: $(ZLINEXM) $(SUPERLULIB) zlinsol: $(ZLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@
@@ -175,11 +149,6 @@ @@ -175,11 +149,6 @@ zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB)
zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB) zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@ $(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@
@ -105,7 +106,7 @@ diff -Nrua a/EXAMPLE/Makefile b/EXAMPLE/Makefile
.c.o: .c.o:
$(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE) $(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE)
@@ -189,7 +158,7 @@ @@ -189,7 +158,7 @@ zitersol1: $(ZITSOL1) $(SUPERLULIB)
clean: clean:
rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \ rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \

View File

@ -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 --- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt +++ b/SRC/CMakeLists.txt
@@ -21,7 +21,6 @@ @@ -23,7 +23,6 @@ set(sources
ilu_relax_snode.c ilu_relax_snode.c
ilu_heap_relax_snode.c ilu_heap_relax_snode.c
mark_relax.c mark_relax.c
@ -9,7 +10,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
qselect.c qselect.c
input_error.c input_error.c
dmach.c dmach.c
@@ -65,9 +64,7 @@ @@ -68,9 +67,7 @@ if(enable_single)
smemory.c smemory.c
sutil.c sutil.c
smyblas2.c smyblas2.c
@ -19,7 +20,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
ilu_sdrop_row.c ilu_sdrop_row.c
ilu_ssnode_dfs.c ilu_ssnode_dfs.c
ilu_scolumn_dfs.c ilu_scolumn_dfs.c
@@ -115,9 +112,7 @@ @@ -118,9 +115,7 @@ if(enable_double)
dmemory.c dmemory.c
dutil.c dutil.c
dmyblas2.c dmyblas2.c
@ -29,7 +30,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
ilu_ddrop_row.c ilu_ddrop_row.c
ilu_dsnode_dfs.c ilu_dsnode_dfs.c
ilu_dcolumn_dfs.c ilu_dcolumn_dfs.c
@@ -168,9 +163,7 @@ @@ -171,9 +166,7 @@ if(enable_complex)
cmemory.c cmemory.c
cutil.c cutil.c
cmyblas2.c cmyblas2.c
@ -39,7 +40,7 @@ diff -Nrua a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
ilu_cdrop_row.c ilu_cdrop_row.c
ilu_csnode_dfs.c ilu_csnode_dfs.c
ilu_ccolumn_dfs.c ilu_ccolumn_dfs.c
@@ -219,9 +212,7 @@ @@ -222,9 +215,7 @@ if(enable_complex16)
zmemory.c zmemory.c
zutil.c zutil.c
zmyblas2.c zmyblas2.c

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Apr 9 03:01:30 UTC 2023 - Christoph G <foss@grueninger.de>
- 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 <aginies@suse.com> Thu Sep 30 19:47:48 UTC 2021 - Antoine Ginies <aginies@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package superlu # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
# Base package name # Base package name
%define pname superlu %define pname superlu
%define ver 5.3.0 %define ver 6.0.0
%define _ver %(echo %{ver} | tr . _) %define _ver %(echo %{ver} | tr . _)
%if "%flavor" == "" %if "%flavor" == ""
@ -72,7 +72,7 @@ ExclusiveArch: do_not_build
%define p_prefix %_prefix %define p_prefix %_prefix
%define p_includedir %_includedir %define p_includedir %_includedir
%define p_libdir %_libdir %define p_libdir %_libdir
%define _sover 5 %define _sover 6
%define libname lib%{name}%{?_sover} %define libname lib%{name}%{?_sover}
%else %else
%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?ext:-e %{ext}}} %{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 # Tarball above is generated with the script below
Source1: get-tarball.sh Source1: get-tarball.sh
Source2: README.SUSE 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 # The Harwell Subroutine Library (HSL) routine mc64ad.c have been removed
# from the original sources for legal reasons. This patch disables the inclusion of # from the original sources for legal reasons. This patch disables the inclusion of
# this routine in the library which, however, remains fully functional # 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 Patch4: superlu-examples_Makefile_remove_itersol.patch
Patch5: superlu-make.linux.patch Patch5: superlu-make.linux.patch
BuildRequires: cmake >= 2.8.12 BuildRequires: cmake >= 2.8.12