pool/superlu
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 672776 from science

Browse Source 
- Set default module version correctly when installing
  master package, unset when deinstalling the default library
  package.
- make example make.inc work with non-HPC builds as well.

- Add superlu-examples_Makefile_remove_itersol.patch
      superlu-make.linux.patch:
  get a buildable examples test suite (bsc#1124765)
  fixing Makefile
  adding missing make.inc (forwarded request 672775 from eeich)

OBS-URL: https://build.opensuse.org/request/show/672776
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/superlu?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2019-02-11 20:16:18 +00:00 committed by Git OBS Bridge
commit ceb7c6e989
4 changed files with 156 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
superlu-examples_Makefile_remove_itersol.patch Normal file
View File

@ -0,0 +1,115 @@
--- 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 @@
SLINXEXM1 = slinsolx1.o
SLINXEXM2 = slinsolx2.o
SLINXEXM3 = slinsolx3.o
-SITSOL = sitersol.o sfgmr.o
-SITSOL1 = sitersol1.o sfgmr.o
DLINEXM = dlinsol.o
DLINEXM1 = dlinsol1.o
@@ -50,8 +48,6 @@
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
@@ -59,8 +55,6 @@
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
@@ -68,20 +62,17 @@
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 $@
@@ -101,11 +92,6 @@
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 $@
@@ -128,12 +114,6 @@
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 $@
@@ -152,12 +132,6 @@
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 $@
@@ -176,11 +150,6 @@
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) -I$(HEADER) -c $< $(VERBOSE)
@@ -190,7 +159,7 @@
clean:
rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 *linsolx3 \
- superlu *itersol *itersol1
+ superlu

13
superlu-make.linux.patch Normal file
View File

@ -0,0 +1,13 @@
--- 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
@@ -21,8 +21,8 @@
#
# The name of the libraries to be created/linked to
#
-SuperLUroot = $(HOME)/Dropbox/Codes/SuperLU/SuperLU
-SUPERLULIB = $(SuperLUroot)/lib/libsuperlu_5.1.a
+SuperLUroot = @superlu_home@
+SUPERLULIB = @superlu_lib@
#BLASLIB = $(SuperLUroot)/lib/libblas.a

17
superlu.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Feb 8 10:50:43 UTC 2019 - eich@suse.com
- Set default module version correctly when installing
master package, unset when deinstalling the default library
package.
- make example make.inc work with non-HPC builds as well.
-------------------------------------------------------------------
Fri Feb 8 09:40:33 UTC 2019 - Antoine Ginies <aginies@suse.com>
- Add superlu-examples_Makefile_remove_itersol.patch
superlu-make.linux.patch:
get a buildable examples test suite (bsc#1124765)
fixing Makefile
adding missing make.inc
-------------------------------------------------------------------
Tue Jan 22 11:58:01 UTC 2019 - eich@suse.com

13
superlu.spec
View File

@ -46,12 +46,14 @@ ExclusiveArch: do_not_build
%define package_name %pname
%if %{without hpc}
%define p_prefix %_prefix
%define p_includedir %_includedir
%define p_libdir %_libdir
%define _sover 5
%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
%endif
@ -76,6 +78,8 @@ Patch2: superlu-4.3-dont-opt-away.diff
# 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
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
@ -137,9 +141,9 @@ decomposition of sparse matrices.
%if %{with hpc}
%{hpc_master_package -l -L}
%{hpc_master_package devel}
%{hpc_master_package -L devel}
%{hpc_master_package doc}
%{hpc_master_package examples}
%{hpc_master_package -L examples}
%endif
%prep
@ -148,6 +152,8 @@ decomposition of sparse matrices.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p0
%patch5 -p0
cp %SOURCE1 %SOURCE2 ./
# Create baselibs.conf dynamically (non-HPC build only).
%if %{without hpc}
@ -178,6 +184,8 @@ make clean
rm -rf *itersol* .gitignore
cd ..
mv EXAMPLE examples
cp MAKE_INC/make.linux examples/make.inc
sed -i -e 's&@superlu_home@&%p_prefix&' -e 's&@superlu_lib@&%p_libdir&' examples/make.inc
rm -f examples/.gitignore
cp FORTRAN/README README.fortran
%fdupes -s examples
@ -227,6 +235,7 @@ EOF
%postun -n lib%{name}%{?_sover}
/sbin/ldconfig -N %hpc_libdir
%hpc_module_delete_if_default
%endif
%files -n lib%{name}%{?_sover}