Ana Guerrero 2023-08-30 08:17:37 +00:00 committed by Git OBS Bridge
commit b48d737be5
6 changed files with 30 additions and 129 deletions

View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
VERSION=5.3.0
VERSION=6.1.0
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"

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

Binary file not shown.

3
superlu-6.0.1.tar.gz Normal file
View File

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

View File

@ -1,114 +0,0 @@
diff --git a/EXAMPLE/Makefile b/EXAMPLE/Makefile
index eb961e3..0ae9052 100644
--- a/EXAMPLE/Makefile
+++ b/EXAMPLE/Makefile
@@ -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 dreadtriple_noheader.o #dgstrf.o dcolumn_dfs.o #sp_ienv.o
DLINEXM1 = dlinsol1.o
@@ -49,8 +47,6 @@ DLINXEXM1 = dlinsolx1.o
DLINXEXM2 = dlinsolx2.o
DLINXEXM3 = dlinsolx3.o
SUPERLUEXM = superlu.o sp_ienv.o
-DITSOL = ditersol.o dfgmr.o
-DITSOL1 = ditersol1.o dfgmr.o
CLINEXM = clinsol.o
CLINEXM1 = clinsol1.o
@@ -58,8 +54,6 @@ CLINXEXM = clinsolx.o
CLINXEXM1 = clinsolx1.o
CLINXEXM2 = clinsolx2.o
CLINXEXM3 = clinsolx3.o
-CITSOL = citersol.o cfgmr.o
-CITSOL1 = citersol1.o cfgmr.o
ZLINEXM = zlinsol.o
ZLINEXM1 = zlinsol1.o
@@ -67,20 +61,17 @@ ZLINXEXM = zlinsolx.o
ZLINXEXM1 = zlinsolx1.o
ZLINXEXM2 = zlinsolx2.o
ZLINXEXM3 = zlinsolx3.o
-ZITSOL = zitersol.o zfgmr.o
-ZITSOL1 = zitersol1.o zfgmr.o
all: single double complex complex16
-single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 slinsolx3 \
- sitersol sitersol1
+single: slinsol slinsol1 slinsolx slinsolx1 slinsolx2 slinsolx3
+
double: dlinsol dlinsol1 dlinsolx dlinsolx1 dlinsolx2 dlinsolx3 \
- superlu ditersol ditersol1
-complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 clinsolx3 \
- citersol citersol1
-complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zlinsolx3 \
- zitersol zitersol1
+ superlu
+complex: clinsol clinsol1 clinsolx clinsolx1 clinsolx2 clinsolx3
+
+complex16: zlinsol zlinsol1 zlinsolx zlinsolx1 zlinsolx2 zlinsolx3
slinsol: $(SLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(SLINEXM) $(LIBS) -lm -o $@
@@ -100,11 +91,6 @@ slinsolx2: $(SLINXEXM2) $(SUPERLULIB)
slinsolx3: $(SLINXEXM3) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(SLINXEXM3) $(LIBS) -lm -o $@
-sitersol: $(SITSOL) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(SITSOL) $(LIBS) -lm -o $@
-
-sitersol1: $(SITSOL1) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(SITSOL1) $(LIBS) -lm -o $@
dlinsol: $(DLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(DLINEXM) $(LIBS) -lm -o $@
@@ -127,12 +113,6 @@ dlinsolx3: $(DLINXEXM3) $(SUPERLULIB)
superlu: $(SUPERLUEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(SUPERLUEXM) $(LIBS) -lm -o $@
-ditersol: $(DITSOL) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(DITSOL) $(LIBS) -lm -o $@
-
-ditersol1: $(DITSOL1) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(DITSOL1) $(LIBS) -lm -o $@
-
clinsol: $(CLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(CLINEXM) $(LIBS) -lm -o $@
@@ -151,12 +131,6 @@ clinsolx2: $(CLINXEXM2) $(SUPERLULIB)
clinsolx3: $(CLINXEXM3) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(CLINXEXM3) $(LIBS) -lm -o $@
-citersol: $(CITSOL) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(CITSOL) $(LIBS) -lm -o $@
-
-citersol1: $(CITSOL1) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(CITSOL1) $(LIBS) -lm -o $@
-
zlinsol: $(ZLINEXM) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(ZLINEXM) $(LIBS) -lm -o $@
@@ -175,11 +149,6 @@ zlinsolx2: $(ZLINXEXM2) $(SUPERLULIB)
zlinsolx3: $(ZLINXEXM3) $(SUPERLULIB)
$(LOADER) $(LOADOPTS) $(ZLINXEXM3) $(LIBS) -lm -o $@
-zitersol: $(ZITSOL) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(ZITSOL) $(LIBS) -lm -o $@
-
-zitersol1: $(ZITSOL1) $(SUPERLULIB)
- $(LOADER) $(LOADOPTS) $(ZITSOL1) $(LIBS) -lm -o $@
.c.o:
$(CC) $(CFLAGS) $(CDEFS) $(INCLUDEDIR) -c $< $(VERBOSE)
@@ -189,7 +158,7 @@ zitersol1: $(ZITSOL1) $(SUPERLULIB)
clean:
rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \
- superlu *itersol *itersol1
+ superlu

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Aug 6 08:39:35 UTC 2023 - Christoph G <foss@grueninger.de>
- Update to version 6.0.1
* Doxygen cleanup
* Fix memory leak in ILU routines
* Clean up some f2c-ed files
- Run regression tests with CTest
- Disable building examples
- Update patch superlu-remove-mc64ad.patch
- Drop patch superlu-examples_Makefile_remove_itersol.patch as
we use CMake and no longer the provided Makefiles. And
examples are no longer built.
-------------------------------------------------------------------
Mon May 1 10:05:57 UTC 2023 - Egbert Eich <eich@suse.com>

View File

@ -20,7 +20,7 @@
# Base package name
%define pname superlu
%define ver 6.0.0
%define ver 6.0.1
%define _ver %(echo %{ver} | tr . _)
%if "%flavor" == ""
@ -99,10 +99,9 @@ Source3: superlu.rpmlintrc
# 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-remove-mc64ad.patch
Patch4: superlu-examples_Makefile_remove_itersol.patch
Patch5: superlu-make.linux.patch
BuildRequires: cmake >= 2.8.12
Patch0: superlu-remove-mc64ad.patch
Patch1: superlu-make.linux.patch
BuildRequires: cmake >= 3.5
BuildRequires: fdupes
BuildRequires: tcsh
%if %{without hpc}
@ -112,7 +111,7 @@ BuildRequires: gcc-fortran
Requires: %{compiler_family}%{?c_f_ver}-compilers-hpc
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel
BuildRequires: suse-hpc >= 0.3
BuildRequires: suse-hpc >= 0.5.20230501
%endif
%description
@ -120,7 +119,7 @@ SuperLU is an algorithm that uses group theory to optimize LU
decomposition of sparse matrices.
Documentation can be found in the %{name}-doc package or on
http://www.netlib.org.
https://portal.nersc.gov/project/sparse/superlu/.
%package -n %libname
Summary: SuperLU matrix solver
@ -178,9 +177,7 @@ decomposition of sparse matrices.
%prep
%setup -q -n superlu-%{version}
%patch3 -p1
%patch4 -p1
%patch5 -p1
%autopatch -p1
cp %SOURCE2 ./
# Create baselibs.conf dynamically (non-HPC build only).
%if %{without hpc}
@ -197,7 +194,8 @@ EOF
module load openblas
%hpc_cmake \
%endif
-DCMAKE_BUILD_TYPE=Release -DUSE_XSDK_DEFAULTS='TRUE' -Denable_tests=OFF
-DCMAKE_BUILD_TYPE=Release -DUSE_XSDK_DEFAULTS='TRUE' \
-Denable_tests=ON -Denable_examples=OFF
make %{?_smp_mflags}
%install
@ -217,6 +215,9 @@ rm -f examples/.gitignore
cp FORTRAN/README README.fortran
%fdupes -s examples
%check
%ctest
%if %{with hpc}
%{hpc_write_pkgconfig}