[packages/SuiteSparse] - updated to 5.5.0, release 6
qboosh
qboosh at pld-linux.org
Wed Sep 6 19:09:15 CEST 2023
commit 29c37eb02bbac653bf1f0c9e23ea9e4ef0f227f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 6 18:45:36 2023 +0200
- updated to 5.5.0, release 6
SuiteSparse-config.patch | 62 +++++++++++++++++++++++++++++++++++-------------
SuiteSparse.spec | 17 ++++++-------
2 files changed, 54 insertions(+), 25 deletions(-)
---
diff --git a/SuiteSparse.spec b/SuiteSparse.spec
index c849faf..c5de881 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.4.0
+%define suite_ver 5.5.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
@@ -13,7 +13,7 @@
%define colamd_ver 2.9.6
%define cholmod_ver 3.0.13
%define csparse_ver 3.2.0
-%define cxsparse_ver 3.1.9
+%define cxsparse_ver 3.2.0
%define klu_ver 1.3.9
%define ldl_ver 2.2.6
%define rbio_ver 2.2.6
@@ -21,18 +21,19 @@
%define umfpack_ver 5.7.8
%define gpuruntime_ver 1.0.5
%define gpuqrengine_ver 1.0.5
-# GraphBLAS version 2.2.2, but disabled here, newer version is built from GraphBLAS.spec
-# Mongoose version 2.0.3, but disabled here, newer version is built from SuiteSparse-Mongoose.spec
+# GraphBLAS version 2.3.5, 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: 5
+Release: 6
License: LGPL v2.1+, GPL v2+
Group: Libraries
-Source0: https://people.engr.tamu.edu/davis/SuiteSparse/%{name}-%{version}.tar.gz
-# Source0-md5: 4a6d4e74fc44c503f52996ae95cad03a
+#Source0Download: https://github.com/DrTimothyAldenDavis/SuiteSparse/releases
+Source0: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: f70d7f9b01622da030dcb226abacd1ad
Patch0: %{name}-config.patch
Patch1: %{name}-amdf77.patch
Patch2: %{name}-externc.patch
@@ -879,7 +880,7 @@ Static UMFPACK library.
Statyczna biblioteka UMFPACK.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
diff --git a/SuiteSparse-config.patch b/SuiteSparse-config.patch
index 893816a..dbce85e 100644
--- a/SuiteSparse-config.patch
+++ b/SuiteSparse-config.patch
@@ -1,6 +1,6 @@
---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk.orig 2018-12-23 04:15:58.000000000 +0100
-+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2023-01-16 17:21:47.457377662 +0100
-@@ -136,7 +136,7 @@ SUITESPARSE_VERSION = 5.4.0
+--- SuiteSparse-5.5.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2019-10-21 04:34:43.000000000 +0200
++++ SuiteSparse-5.5.0/SuiteSparse_config/SuiteSparse_config.mk 2023-09-06 18:15:35.991275820 +0200
+@@ -137,7 +137,7 @@ SUITESPARSE_VERSION = 5.5.0
# The CF macro is used by SuiteSparse Makefiles as a combination of
# CFLAGS, CPPFLAGS, TARGET_ARCH, and system-dependent settings.
@@ -9,16 +9,16 @@
#---------------------------------------------------------------------------
# code formatting (for Tcov on Linux only)
-@@ -176,7 +176,7 @@ SUITESPARSE_VERSION = 5.4.0
+@@ -175,7 +175,7 @@ SUITESPARSE_VERSION = 5.5.0
LAPACK =
else
- # use the OpenBLAS at http://www.openblas.net
+ # use the OpenBLAS at http://www.openblas.net (CAN BE VERY SLOW)
- BLAS = -lopenblas
+ BLAS = -lblas
endif
endif
-@@ -201,7 +201,7 @@ SUITESPARSE_VERSION = 5.4.0
+@@ -200,7 +200,7 @@ SUITESPARSE_VERSION = 5.5.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,7 +27,7 @@
#---------------------------------------------------------------------------
# NVIDIA CUDA configuration for CHOLMOD and SPQR
-@@ -358,7 +358,7 @@ SUITESPARSE_VERSION = 5.4.0
+@@ -358,7 +358,7 @@ SUITESPARSE_VERSION = 5.5.0
ifeq ($(UNAME),Linux)
# add the realtime library, librt, and SuiteSparse/lib
@@ -55,44 +55,72 @@
I = -I../Include
LDLIBS += -lm
---- SuiteSparse/Makefile.orig 2023-01-16 17:21:00.207633636 +0100
-+++ SuiteSparse/Makefile 2023-01-16 17:23:30.703484997 +0100
-@@ -12,8 +12,6 @@ include SuiteSparse_config/SuiteSparse_c
+--- SuiteSparse-5.5.0/Makefile.orig 2019-10-21 04:34:43.000000000 +0200
++++ SuiteSparse-5.5.0/Makefile 2023-09-06 18:21:24.732719858 +0200
+@@ -12,7 +12,6 @@ include SuiteSparse_config/SuiteSparse_c
# Compile the default rules for each package
go: metis
( cd SuiteSparse_config && $(MAKE) )
-- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
( cd AMD && $(MAKE) )
( cd BTF && $(MAKE) )
( cd CAMD && $(MAKE) )
-@@ -38,8 +36,6 @@ endif
+@@ -30,7 +29,6 @@ ifneq ($(GPU_CONFIG),)
+ ( cd GPUQREngine && $(MAKE) )
+ endif
+ ( cd SPQR && $(MAKE) )
+- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
+ # ( cd PIRO_BAND && $(MAKE) )
+ # ( cd SKYLINE_SVD && $(MAKE) )
+
+@@ -38,7 +36,6 @@ endif
# (note that CSparse is not installed; CXSparse is installed instead)
install: metisinstall
( cd SuiteSparse_config && $(MAKE) install )
-- ( cd GraphBLAS && $(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 )
-@@ -116,8 +112,6 @@ endif
+@@ -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.txt $(INSTALL_DOC)/SuiteSparse_README.txt
+@@ -116,7 +112,6 @@ endif
# the static library
library: metis
( cd SuiteSparse_config && $(MAKE) )
-- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
( cd AMD && $(MAKE) library )
( cd BTF && $(MAKE) library )
( cd CAMD && $(MAKE) library )
-@@ -143,8 +137,6 @@ endif
+@@ -134,7 +129,6 @@ ifneq (,$(GPU_CONFIG))
+ ( cd GPUQREngine && $(MAKE) library )
+ endif
+ ( cd SPQR && $(MAKE) library )
+- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ # ( cd PIRO_BAND && $(MAKE) library )
+ # ( cd SKYLINE_SVD && $(MAKE) library )
+
+@@ -143,7 +137,6 @@ endif
# both the dynamic and static libraries.
static: metis
( cd SuiteSparse_config && $(MAKE) static )
-- ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
( cd AMD && $(MAKE) static )
( cd BTF && $(MAKE) static )
( cd CAMD && $(MAKE) static )
+@@ -161,7 +154,6 @@ ifneq (,$(GPU_CONFIG))
+ ( cd GPUQREngine && $(MAKE) static )
+ endif
+ ( cd SPQR && $(MAKE) static )
+- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static )
+ # ( cd PIRO_BAND && $(MAKE) static )
+ # ( cd SKYLINE_SVD && $(MAKE) static )
+
@@ -219,8 +211,6 @@ clean:
# Create the PDF documentation
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SuiteSparse.git/commitdiff/29c37eb02bbac653bf1f0c9e23ea9e4ef0f227f2
More information about the pld-cvs-commit
mailing list