[packages/SuiteSparse] - updated to 5.13.0, added SLIP_LU packages; release 8
qboosh
qboosh at pld-linux.org
Sat Sep 9 20:53:37 CEST 2023
commit b450e34faeca36f7af27f542f7342cb0e4eaa38a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Sep 9 20:39:37 2023 +0200
- updated to 5.13.0, added SLIP_LU packages; release 8
SuiteSparse-config.patch | 82 ++++++++++++++++++++++--------------------------
SuiteSparse.spec | 80 +++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 113 insertions(+), 49 deletions(-)
---
diff --git a/SuiteSparse.spec b/SuiteSparse.spec
index 791aaae..cba1ef5 100644
--- a/SuiteSparse.spec
+++ b/SuiteSparse.spec
@@ -4,7 +4,7 @@
%bcond_without metis # partition support (using metis lib)
# main package version
-%define suite_ver 5.7.2
+%define suite_ver 5.13.0
# see */Include/*.h /VER(SION)?_CODE, C*Sparse/Include/cs.h /CS_VER
%define amd_ver 2.4.6
%define btf_ver 1.2.6
@@ -17,23 +17,24 @@
%define klu_ver 1.3.9
%define ldl_ver 2.2.6
%define rbio_ver 2.2.6
+%define sliplu_ver 1.0.2
%define spqr_ver 2.0.9
%define umfpack_ver 5.7.9
%define gpuruntime_ver 1.0.5
%define gpuqrengine_ver 1.0.5
-# GraphBLAS version 3.2.2, but disabled here, newer version is built from GraphBLAS.spec
+# GraphBLAS version 7.2.0, but disabled here, newer version is built from GraphBLAS.spec
# Mongoose version 2.0.4, but disabled here, the same version is built from SuiteSparse-Mongoose.spec
Summary: A Suite of Sparse matrix packages
Summary(pl.UTF-8): Zbiór pakietów do operacji na macierzach rzadkich
Name: SuiteSparse
Version: %{suite_ver}
-Release: 7
+Release: 8
License: LGPL v2.1+, GPL v2+
Group: Libraries
#Source0Download: https://github.com/DrTimothyAldenDavis/SuiteSparse/releases
Source0: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 7dc408bd99f825ef75fca0dda708f95d
+# Source0-md5: e9e7bc594b77ae4b58d943cdc286d679
Patch0: %{name}-config.patch
Patch1: %{name}-amdf77.patch
Patch2: %{name}-externc.patch
@@ -41,6 +42,7 @@ Patch3: %{name}-ILP32.patch
URL: http://suitesparse.com/
BuildRequires: blas-devel
BuildRequires: gcc-fortran
+BuildRequires: gmp-devel
BuildRequires: lapack-devel
BuildRequires: libgomp-devel
BuildRequires: libstdc++-devel
@@ -48,6 +50,7 @@ BuildRequires: libtool >= 2:1.5
%if %{with metis}
BuildRequires: metis-devel >= 5
%endif
+BuildRequires: mpfr-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -752,6 +755,57 @@ Static RBio library.
%description RBio-static -l pl.UTF-8
Statyczna biblioteka RBio.
+%package SLIP_LU
+Summary: SLIP_LU: Sparse Left-looking Integer-Preserving LU factorization
+Summary(pl.UTF-8): SLIP_LU - lewostronny rozkład LU dla macierzy rzadkich zachowujący liczby całkowite
+Version: %{sliplu_ver}
+License: LGPL v3+ or GPL v2+
+Group: Libraries
+Requires: %{name}-AMD = %{amd_ver}-%{release}
+Requires: %{name}-COLAMD = %{colamd_ver}-%{release}
+Requires: %{name}-config-libs = %{suite_ver}-%{release}
+
+%description SLIP_LU
+SLIP_LU is software package used to solve a sparse systems of linear
+equations exactly using the Sparse Left-looking Integer-Preserving LU
+factorization.
+
+%description SLIP_LU -l pl.UTF-8
+SLIP_LU to pakiet służący do dokładnego rozwiązywania rzadkich układów
+równań liniowych przy użyciu lewostronnego rzadkiego rozkładu LU
+zachowującego liczby całkowite.
+
+%package SLIP_LU-devel
+Summary: Header file for SLIP_LU library
+Summary(pl.UTF-8): Plik nagłówkowy biblioteki SLIP_LU
+Version: %{sliplu_ver}
+License: LGPL v3+ or GPL v2+
+Group: Development/Libraries
+Requires: %{name}-SLIP_LU = %{sliplu_ver}-%{release}
+Requires: %{name}-config-devel = %{suite_ver}-%{release}
+Requires: gmp-devel
+Requires: mpfr-devel
+
+%description SLIP_LU-devel
+Header file for SLIP_LU library.
+
+%description SLIP_LU-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki SLIP_LU.
+
+%package SLIP_LU-static
+Summary: Static SLIP_LU library
+Summary(pl.UTF-8): Statyczna biblioteka SLIP_LU
+Version: %{sliplu_ver}
+License: LGPL v3+ or GPL v2+
+Group: Development/Libraries
+Requires: %{name}-SLIP_LU-devel = %{sliplu_ver}-%{release}
+
+%description SLIP_LU-static
+Static SLIP_LU library.
+
+%description SLIP_LU-static -l pl.UTF-8
+Statyczna biblioteka SLIP_LU.
+
%package SPQR
Summary: SuiteSparseQR: multithreaded multifrontal sparse QR factorization
Summary(pl.UTF-8): SuiteSparseQR - wielowątkowy, wielofrontalny rozkład QR dla macierzy rzadkich
@@ -967,6 +1021,9 @@ rm -rf $RPM_BUILD_ROOT
%post RBio -p /sbin/ldconfig
%postun RBio -p /sbin/ldconfig
+%post SLIP_LU -p /sbin/ldconfig
+%postun SLIP_LU -p /sbin/ldconfig
+
%post SPQR -p /sbin/ldconfig
%postun SPQR -p /sbin/ldconfig
@@ -1162,6 +1219,21 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/librbio.a
+%files SLIP_LU
+%defattr(644,root,root,755)
+%doc SLIP_LU/README.md SLIP_LU/License/license.txt
+%attr(755,root,root) %{_libdir}/libsliplu.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsliplu.so.1
+
+%files SLIP_LU-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsliplu.so
+%{_includedir}/suitesparse/SLIP_LU.h
+
+%files SLIP_LU-static
+%defattr(644,root,root,755)
+%{_libdir}/libsliplu.a
+
%files SPQR
%defattr(644,root,root,755)
%doc SPQR/README.txt SPQR/Doc/ChangeLog
diff --git a/SuiteSparse-config.patch b/SuiteSparse-config.patch
index 214147f..2a8d572 100644
--- a/SuiteSparse-config.patch
+++ b/SuiteSparse-config.patch
@@ -1,6 +1,6 @@
---- SuiteSparse-5.7.2/SuiteSparse_config/SuiteSparse_config.mk.orig 2020-04-08 22:42:59.000000000 +0200
-+++ SuiteSparse-5.7.2/SuiteSparse_config/SuiteSparse_config.mk 2023-09-07 20:41:07.502570836 +0200
-@@ -137,7 +137,7 @@ SUITESPARSE_VERSION = 5.7.2
+--- SuiteSparse-5.13.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2022-08-31 18:14:11.000000000 +0200
++++ SuiteSparse-5.13.0/SuiteSparse_config/SuiteSparse_config.mk 2023-09-09 18:37:07.316739831 +0200
+@@ -154,7 +154,7 @@ SUITESPARSE_VERSION = 5.13.0
# The CF macro is used by SuiteSparse Makefiles as a combination of
# CFLAGS, CPPFLAGS, TARGET_ARCH, and system-dependent settings.
@@ -9,16 +9,7 @@
#---------------------------------------------------------------------------
# code formatting (for Tcov on Linux only)
-@@ -174,7 +174,7 @@ SUITESPARSE_VERSION = 5.7.2
- else
- # use the OpenBLAS at http://www.openblas.net (CAN BE VERY SLOW;
- # CHOLMOD can be slowed down by a factor of 100x in extreme cases)
-- BLAS ?= -lopenblas
-+ BLAS ?= -lblas
- LAPACK ?= -llapack
- endif
- endif
-@@ -200,7 +200,7 @@ SUITESPARSE_VERSION = 5.7.2
+@@ -217,7 +217,7 @@ SUITESPARSE_VERSION = 5.13.0
# A Fortran compiler is optional. Only required for the optional Fortran
# interfaces to AMD and UMFPACK. Not needed by 'make' or 'make install'
F77 ?= gfortran
@@ -27,15 +18,23 @@
#---------------------------------------------------------------------------
# NVIDIA CUDA configuration for CHOLMOD and SPQR
-@@ -358,7 +358,7 @@ SUITESPARSE_VERSION = 5.7.2
-
+@@ -349,7 +349,6 @@ SUITESPARSE_VERSION = 5.13.0
ifeq ($(UNAME),Linux)
- # add the realtime library, librt, and SuiteSparse/lib
-- LDLIBS += -lrt -Wl,-rpath=$(INSTALL_LIB)
-+ LDLIBS += -lrt
+ # add the posix realtime extensions library: librt
+ LDLIBS += -lrt
+- LDFLAGS += -Wl,-rpath=$(INSTALL_LIB)
endif
#---------------------------------------------------------------------------
+@@ -469,7 +468,7 @@ else
+ SO_MAIN = $(LIBRARY).so.$(SO_VERSION)
+ SO_TARGET = $(LIBRARY).so.$(VERSION)
+ SO_OPTS += -shared -Wl,-soname -Wl,$(SO_MAIN) -Wl,--no-undefined \
+- -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
++
+ # Use rpath ORIGIN so that Linux/Unix *.so files can be moved without modification:
+ SO_INSTALL_NAME = echo
+ endif
--- SuiteSparse/CSparse/Lib/Makefile.orig 2017-12-23 20:00:31.000000000 +0100
+++ SuiteSparse/CSparse/Lib/Makefile 2023-01-13 16:42:59.747528205 +0100
@@ -15,7 +15,7 @@
@@ -55,41 +54,34 @@
I = -I../Include
LDLIBS += -lm
---- SuiteSparse-5.7.2/Makefile.orig 2020-04-08 22:42:59.000000000 +0200
-+++ SuiteSparse-5.7.2/Makefile 2023-09-07 20:42:22.222166045 +0200
-@@ -12,7 +12,6 @@ include SuiteSparse_config/SuiteSparse_c
- # Compile the default rules for each package
+--- SuiteSparse-5.13.0/Makefile.orig 2022-08-31 18:14:11.000000000 +0200
++++ SuiteSparse-5.13.0/Makefile 2023-09-09 18:42:15.215071803 +0200
+@@ -16,7 +16,6 @@ include SuiteSparse_config/SuiteSparse_c
+ # installs all libraries SuiteSparse/lib.
go: metis
( cd SuiteSparse_config && $(MAKE) )
-- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
+- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
( cd AMD && $(MAKE) )
( cd BTF && $(MAKE) )
( cd CAMD && $(MAKE) )
-@@ -30,7 +29,6 @@ ifneq ($(GPU_CONFIG),)
+@@ -34,7 +33,6 @@ ifneq ($(GPU_CONFIG),)
( cd GPUQREngine && $(MAKE) )
endif
( cd SPQR && $(MAKE) )
- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
+ ( cd SLIP_LU && $(MAKE) )
# ( cd PIRO_BAND && $(MAKE) )
# ( cd SKYLINE_SVD && $(MAKE) )
-
-@@ -38,7 +36,6 @@ endif
+@@ -44,7 +42,7 @@ endif
+ # sudo make install INSTALL=/usr/local
+ # See SuiteSparse/README.md for more details.
# (note that CSparse is not installed; CXSparse is installed instead)
- install: metisinstall
+-install: metisinstall gbinstall moninstall
++install: metisinstall
( cd SuiteSparse_config && $(MAKE) install )
-- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
+ # ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
( cd AMD && $(MAKE) install )
- ( cd BTF && $(MAKE) install )
- ( cd CAMD && $(MAKE) install )
-@@ -55,7 +52,6 @@ ifneq (,$(GPU_CONFIG))
- ( cd GPUQREngine && $(MAKE) install )
- endif
- ( cd SPQR && $(MAKE) install )
-- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install )
- # ( cd PIRO_BAND && $(MAKE) install )
- # ( cd SKYLINE_SVD && $(MAKE) install )
- $(CP) README.md $(INSTALL_DOC)/SuiteSparse_README.md
-@@ -116,7 +112,6 @@ endif
+@@ -126,7 +124,6 @@ endif
# the static library
library: metis
( cd SuiteSparse_config && $(MAKE) )
@@ -97,15 +89,15 @@
( cd AMD && $(MAKE) library )
( cd BTF && $(MAKE) library )
( cd CAMD && $(MAKE) library )
-@@ -134,7 +129,6 @@ ifneq (,$(GPU_CONFIG))
+@@ -144,7 +141,6 @@ ifneq (,$(GPU_CONFIG))
( cd GPUQREngine && $(MAKE) library )
endif
( cd SPQR && $(MAKE) library )
- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ ( cd SLIP_LU && $(MAKE) library )
# ( cd PIRO_BAND && $(MAKE) library )
# ( cd SKYLINE_SVD && $(MAKE) library )
-
-@@ -143,7 +137,6 @@ endif
+@@ -154,7 +150,6 @@ endif
# both the dynamic and static libraries.
static: metis
( cd SuiteSparse_config && $(MAKE) static )
@@ -113,15 +105,15 @@
( cd AMD && $(MAKE) static )
( cd BTF && $(MAKE) static )
( cd CAMD && $(MAKE) static )
-@@ -161,7 +154,6 @@ ifneq (,$(GPU_CONFIG))
+@@ -172,7 +167,6 @@ ifneq (,$(GPU_CONFIG))
( cd GPUQREngine && $(MAKE) static )
endif
( cd SPQR && $(MAKE) static )
- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
+ ( cd SLIP_LU && $(MAKE) static )
# ( cd PIRO_BAND && $(MAKE) static )
# ( cd SKYLINE_SVD && $(MAKE) static )
-
-@@ -219,8 +211,6 @@ clean:
+@@ -233,8 +227,6 @@ clean:
# Create the PDF documentation
docs:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SuiteSparse.git/commitdiff/b450e34faeca36f7af27f542f7342cb0e4eaa38a
More information about the pld-cvs-commit
mailing list