[packages/SuiteSparse] - updated to 5.4.0 (CHOLMOD 3.0.13, SPQR 2.0.9, UMFPACK 5.7.8); release 5 - disable new Mongoose mod
qboosh
qboosh at pld-linux.org
Mon Jan 16 21:00:49 CET 2023
commit d04231772dc9fc7a05993c249de32ea70d7f812e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jan 16 21:02:00 2023 +0100
- updated to 5.4.0 (CHOLMOD 3.0.13, SPQR 2.0.9, UMFPACK 5.7.8); release 5
- disable new Mongoose module, newer version is built from SuiteSparse-Mongoose.spec
SuiteSparse-config.patch | 41 +++++++++++++++++++++++++++--------------
SuiteSparse-externc.patch | 20 ++++++++++----------
SuiteSparse.spec | 15 ++++++++-------
3 files changed, 45 insertions(+), 31 deletions(-)
---
diff --git a/SuiteSparse.spec b/SuiteSparse.spec
index 3372cb8..c849faf 100644
--- a/SuiteSparse.spec
+++ b/SuiteSparse.spec
@@ -4,34 +4,35 @@
%bcond_without metis # partition support (using metis lib)
# main package version
-%define suite_ver 5.2.0
+%define suite_ver 5.4.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
%define camd_ver 2.4.6
%define ccolamd_ver 2.9.6
%define colamd_ver 2.9.6
-%define cholmod_ver 3.0.12
+%define cholmod_ver 3.0.13
%define csparse_ver 3.2.0
%define cxsparse_ver 3.1.9
%define klu_ver 1.3.9
%define ldl_ver 2.2.6
%define rbio_ver 2.2.6
-%define spqr_ver 2.0.8
-%define umfpack_ver 5.7.6
+%define spqr_ver 2.0.9
+%define umfpack_ver 5.7.8
%define gpuruntime_ver 1.0.5
%define gpuqrengine_ver 1.0.5
-# GraphBLAS version 2.0.1, but disabled here, newer version is built from GraphBLAS.spec
+# 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
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: 4
+Release: 5
License: LGPL v2.1+, GPL v2+
Group: Libraries
Source0: https://people.engr.tamu.edu/davis/SuiteSparse/%{name}-%{version}.tar.gz
-# Source0-md5: 8e625539dbeed061cc62fbdfed9be7cf
+# Source0-md5: 4a6d4e74fc44c503f52996ae95cad03a
Patch0: %{name}-config.patch
Patch1: %{name}-amdf77.patch
Patch2: %{name}-externc.patch
diff --git a/SuiteSparse-config.patch b/SuiteSparse-config.patch
index 17adcca..893816a 100644
--- a/SuiteSparse-config.patch
+++ b/SuiteSparse-config.patch
@@ -1,6 +1,6 @@
---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk.orig 2017-10-04 00:20:02.000000000 +0200
-+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2023-01-11 21:09:07.180496464 +0100
-@@ -89,7 +90,7 @@ SUITESPARSE_VERSION = 4.5.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
# The CF macro is used by SuiteSparse Makefiles as a combination of
# CFLAGS, CPPFLAGS, TARGET_ARCH, and system-dependent settings.
@@ -8,8 +8,8 @@
+ CF ?= $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC
#---------------------------------------------------------------------------
- # OpenMP is used in CHOLMOD
-@@ -161,7 +162,7 @@ SUITESPARSE_VERSION = 4.5.6
+ # code formatting (for Tcov on Linux only)
+@@ -176,7 +176,7 @@ SUITESPARSE_VERSION = 5.4.0
LAPACK =
else
# use the OpenBLAS at http://www.openblas.net
@@ -18,7 +18,7 @@
endif
endif
-@@ -186,7 +187,7 @@ SUITESPARSE_VERSION = 4.5.6
+@@ -201,7 +201,7 @@ SUITESPARSE_VERSION = 5.4.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
-@@ -339,7 +340,7 @@ SUITESPARSE_VERSION = 4.5.6
+@@ -358,7 +358,7 @@ SUITESPARSE_VERSION = 5.4.0
ifeq ($(UNAME),Linux)
# add the realtime library, librt, and SuiteSparse/lib
@@ -55,37 +55,50 @@
I = -I../Include
LDLIBS += -lm
---- SuiteSparse/Makefile.orig 2018-01-08 18:05:18.000000000 +0100
-+++ SuiteSparse/Makefile 2023-01-16 17:05:17.219408909 +0100
-@@ -12,7 +12,6 @@ include SuiteSparse_config/SuiteSparse_c
+--- 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
# 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) )
-@@ -37,7 +36,6 @@ endif
+@@ -38,8 +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 )
-@@ -113,7 +111,6 @@ endif
- # static library
+@@ -116,8 +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 )
-@@ -211,7 +208,6 @@ clean:
+@@ -143,8 +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 )
+@@ -219,8 +211,6 @@ clean:
# Create the PDF documentation
docs:
- ( cd GraphBLAS && $(MAKE) docs )
+- ( cd Mongoose && $(MAKE) docs )
( cd AMD && $(MAKE) docs )
( cd CAMD && $(MAKE) docs )
( cd KLU && $(MAKE) docs )
diff --git a/SuiteSparse-externc.patch b/SuiteSparse-externc.patch
index e4520db..0f3442c 100644
--- a/SuiteSparse-externc.patch
+++ b/SuiteSparse-externc.patch
@@ -243,10 +243,10 @@
+#endif
+
#endif
---- SuiteSparse/CHOLMOD/Include/cholmod_gpu.h.orig 2014-03-24 15:11:20.000000000 +0100
-+++ SuiteSparse/CHOLMOD/Include/cholmod_gpu.h 2023-01-07 17:13:58.369206359 +0100
+--- SuiteSparse/CHOLMOD/Include/cholmod_gpu.h.orig 2018-12-23 03:18:58.000000000 +0100
++++ SuiteSparse/CHOLMOD/Include/cholmod_gpu.h 2023-01-16 17:36:07.886049654 +0100
@@ -23,6 +23,11 @@
- #include <fenv.h>
+ #endif
#endif
+/* make it easy for C++ programs to include CHOLMOD */
@@ -528,20 +528,20 @@
#endif
/* ========================================================================== */
---- SuiteSparse/SPQR/Include/SuiteSparseQR.hpp.orig 2023-01-08 20:55:20.329182842 +0100
-+++ SuiteSparse/SPQR/Include/SuiteSparseQR.hpp 2023-01-08 20:56:01.678958831 +0100
-@@ -11,11 +11,8 @@
- // include files
- // -----------------------------------------------------------------------------
-
+--- SuiteSparse/SPQR/Include/SuiteSparseQR.hpp.orig 2023-01-16 17:36:42.955859665 +0100
++++ SuiteSparse/SPQR/Include/SuiteSparseQR.hpp 2023-01-16 17:37:05.512404132 +0100
+@@ -15,11 +15,8 @@
+ #include <cublas_v2.h>
+ #endif
+ #define SUITESPARSE_GPU_EXTERN_ON
-extern "C"
-{
#include "SuiteSparseQR_definitions.h"
#include "cholmod.h"
-}
+ #undef SUITESPARSE_GPU_EXTERN_ON
// =============================================================================
- // === spqr_gpu ================================================================
--- SuiteSparse/SPQR/Include/spqr.hpp.orig 2014-03-19 20:39:23.000000000 +0100
+++ SuiteSparse/SPQR/Include/spqr.hpp 2023-01-07 21:29:30.076147372 +0100
@@ -1015,9 +1015,7 @@ inline Long spqr_mult (Long a, Long b, i
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SuiteSparse.git/commitdiff/d04231772dc9fc7a05993c249de32ea70d7f812e
More information about the pld-cvs-commit
mailing list