[packages/SuiteSparse] - updated to 4.4.6, fixed CCOLAMD obsoletes
qboosh
qboosh at pld-linux.org
Sun Jan 8 21:39:56 CET 2023
commit 6cd4ade9dce2350e7ef306fc914b595f85f432f0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jan 8 21:41:00 2023 +0100
- updated to 4.4.6, fixed CCOLAMD obsoletes
SuiteSparse-config.patch | 21 +++++---
SuiteSparse-externc.patch | 70 ++++++++++++-------------
SuiteSparse-shared.patch | 131 +++++++++++++++++++++++++++++++---------------
SuiteSparse.spec | 43 ++++++++-------
4 files changed, 162 insertions(+), 103 deletions(-)
---
diff --git a/SuiteSparse.spec b/SuiteSparse.spec
index c568018..077fe4f 100644
--- a/SuiteSparse.spec
+++ b/SuiteSparse.spec
@@ -1,31 +1,36 @@
+# TODO: GPU_CONFIG (CUDA) support, TBB
#
# Conditional build:
%bcond_without metis # partition support (using metis lib)
-%define suite_ver 4.3.1
-%define amd_ver 2.4.0
-%define btf_ver 1.2.0
-%define camd_ver 2.4.0
-%define ccolamd_ver 2.9.0
-%define colamd_ver 2.9.0
-%define cholmod_ver 3.0.1
-%define csparse_ver 3.1.3
-%define cxsparse_ver 3.1.3
-%define klu_ver 1.3.0
-%define ldl_ver 2.2.0
-%define rbio_ver 2.2.0
-%define spqr_ver 1.3.3
-%define umfpack_ver 5.7.0
+# main package version
+%define suite_ver 4.4.6
+# see */Makefile /VERSION
+%define amd_ver 2.4.1
+%define btf_ver 1.2.1
+%define camd_ver 2.4.1
+%define ccolamd_ver 2.9.1
+%define colamd_ver 2.9.1
+%define cholmod_ver 3.0.6
+%define csparse_ver 3.1.4
+%define cxsparse_ver 3.1.4
+%define klu_ver 1.3.3
+%define ldl_ver 2.2.1
+%define rbio_ver 2.2.1
+%define spqr_ver 2.0.2
+%define umfpack_ver 5.7.1
+%define gpuruntime_ver 1.0.0
+%define gpuqrengine_ver 1.0.0
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: 1
License: LGPL v2.1+, GPL v2+
Group: Libraries
Source0: https://people.engr.tamu.edu/davis/SuiteSparse/%{name}-%{version}.tar.gz
-# Source0-md5: f8f26a3b1c7f82444c0db0b375215287
+# Source0-md5: 131a3a5e2dee784cd946284e44ce9af2
Patch0: %{name}-config.patch
Patch1: %{name}-shared.patch
Patch2: %{name}-externc.patch
@@ -343,7 +348,7 @@ License: LGPL v2.1+
Group: Development/Libraries
Requires: %{name}-CCOLAMD = %{ccolamd_ver}-%{release}
Requires: %{name}-config = %{suite_ver}-%{release}
-Obsoletes: CCOLAMD < 2.9.0-4
+Obsoletes: CCOLAMD-devel < 2.9.0-4
%description CCOLAMD-devel
Header files for CCOLAMD library.
@@ -358,7 +363,7 @@ Version: %{ccolamd_ver}
License: LGPL v2.1+
Group: Development/Libraries
Requires: %{name}-CCOLAMD-devel = %{ccolamd_ver}-%{release}
-Obsoletes: CCOLAMD < 2.9.0-4
+Obsoletes: CCOLAMD-static < 2.9.0-4
%description CCOLAMD-static
Static CCOLAMD library.
@@ -925,7 +930,7 @@ rm -rf $RPM_BUILD_ROOT
%files AMD
%defattr(644,root,root,755)
-%doc AMD/README.txt AMD/Doc/{ChangeLog,License}
+%doc AMD/README.txt AMD/Doc/{ChangeLog,License.txt}
%attr(755,root,root) %{_libdir}/libamd.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libamd.so.0
diff --git a/SuiteSparse-config.patch b/SuiteSparse-config.patch
index f188f71..1d0270e 100644
--- a/SuiteSparse-config.patch
+++ b/SuiteSparse-config.patch
@@ -1,5 +1,5 @@
---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk.orig 2014-08-16 21:22:58.000000000 +0200
-+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2023-01-03 21:21:55.047555049 +0100
+--- SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk.orig 2014-12-22 23:21:00.000000000 +0100
++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2023-01-08 19:27:30.627731266 +0100
@@ -69,7 +69,7 @@
# C and C++ compiler flags. The first three are standard for *.c and *.cpp
# Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
@@ -8,8 +8,8 @@
+CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC
# for the MKL BLAS:
# CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
-
-@@ -84,7 +84,7 @@ MV = mv -f
+ # with no optimization:
+@@ -86,7 +86,7 @@ MV = mv -f
# Fortran compiler (not required for 'make' or 'make library')
F77 = gfortran
@@ -18,7 +18,7 @@
F77LIB =
# C and Fortran libraries. Remove -lrt if you don't have it.
-@@ -93,8 +93,10 @@ F77LIB =
+@@ -95,8 +95,10 @@ F77LIB =
# LIB = -lm
# For "make install"
@@ -31,7 +31,16 @@
# Which version of MAKE you are using (default is "make")
# MAKE = make
-@@ -210,8 +212,8 @@ XERBLA =
+@@ -133,7 +133,7 @@ INSTALL_INCLUDE = $(INSTALL_PREFIX)/incl
+ # LAPACK =
+
+ # OpenBLAS
+- BLAS = -lopenblas
++BLAS = -lblas
+ # LAPACK =
+
+ # NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+@@ -212,8 +214,8 @@ XERBLA =
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
diff --git a/SuiteSparse-externc.patch b/SuiteSparse-externc.patch
index 1e82b1f..944a6a9 100644
--- a/SuiteSparse-externc.patch
+++ b/SuiteSparse-externc.patch
@@ -1,21 +1,19 @@
---- SuiteSparse/SuiteSparse_config/SuiteSparse_config.h.orig 2014-07-16 23:35:20.000000000 +0200
-+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.h 2023-01-03 21:51:47.241179236 +0100
-@@ -38,14 +38,14 @@
+--- SuiteSparse/SuiteSparse_config/SuiteSparse_config.h.orig 2023-01-08 20:43:25.056391141 +0100
++++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.h 2023-01-08 20:44:40.592648593 +0100
+@@ -38,13 +38,13 @@
#ifndef SUITESPARSE_CONFIG_H
#define SUITESPARSE_CONFIG_H
--#ifdef __cplusplus
--extern "C" {
--#endif
--
- #include <limits.h>
- #include <stdlib.h>
- #include <math.h>
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
++#include <limits.h>
++#include <stdlib.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+-#include <limits.h>
+-#include <stdlib.h>
+-
/* ========================================================================== */
/* === SuiteSparse_long ===================================================== */
/* ========================================================================== */
@@ -222,11 +220,11 @@
+#endif
+
#endif
---- SuiteSparse/CHOLMOD/Include/cholmod_core.h.orig 2014-07-15 00:01:23.000000000 +0200
-+++ SuiteSparse/CHOLMOD/Include/cholmod_core.h 2023-01-07 17:11:23.860043407 +0100
-@@ -294,6 +294,11 @@
-
-
+--- SuiteSparse/CHOLMOD/Include/cholmod_core.h.orig 2015-07-15 05:18:18.000000000 +0200
++++ SuiteSparse/CHOLMOD/Include/cholmod_core.h 2023-01-08 20:50:15.337501791 +0100
+@@ -289,6 +289,11 @@
+ #define CHOLMOD_HOST_SUPERNODE_BUFFERS 8
+ #define CHOLMOD_DEVICE_STREAMS 2
+/* make it easy for C++ programs to include CHOLMOD */
+#ifdef __cplusplus
@@ -236,7 +234,7 @@
/* ========================================================================== */
/* === CHOLMOD objects ====================================================== */
/* ========================================================================== */
-@@ -2432,4 +2437,8 @@ int cholmod_l_version (int version [3])
+@@ -2447,4 +2452,8 @@ int cholmod_l_version (int version [3])
#endif
@@ -378,11 +376,11 @@
+#endif
+
#endif
---- SuiteSparse/CHOLMOD/Include/cholmod.h.orig 2014-07-14 21:46:58.000000000 +0200
-+++ SuiteSparse/CHOLMOD/Include/cholmod.h 2023-01-07 17:21:32.796744513 +0100
-@@ -79,11 +79,6 @@
- #include <cuda_runtime.h>
- #endif
+--- SuiteSparse/CHOLMOD/Include/cholmod.h.orig 2014-09-16 22:27:35.000000000 +0200
++++ SuiteSparse/CHOLMOD/Include/cholmod.h 2023-01-08 20:50:28.674096207 +0100
+@@ -75,11 +75,6 @@
+ #ifndef CHOLMOD_H
+ #define CHOLMOD_H
-/* make it easy for C++ programs to include CHOLMOD */
-#ifdef __cplusplus
@@ -392,7 +390,7 @@
/* assume large file support. If problems occur, compile with -DNLARGEFILE */
#include "cholmod_io64.h"
-@@ -126,8 +121,4 @@ extern "C" {
+@@ -123,8 +118,4 @@ extern "C" {
#include "cholmod_gpu.h"
#endif
@@ -401,10 +399,10 @@
-#endif
-
#endif
---- SuiteSparse/CSparse/Include/cs.h.orig 2014-03-25 15:57:25.000000000 +0100
-+++ SuiteSparse/CSparse/Include/cs.h 2023-01-07 18:34:53.096239378 +0100
+--- SuiteSparse/CSparse/Include/cs.h.orig 2014-10-09 22:01:10.000000000 +0200
++++ SuiteSparse/CSparse/Include/cs.h 2023-01-08 20:53:36.066414349 +0100
@@ -14,6 +14,10 @@
- #define CS_DATE "Mar 26, 2014" /* CSparse release date */
+ #define CS_DATE "Oct 10, 2014" /* CSparse release date */
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2014"
+#ifdef __cplusplus
@@ -467,8 +465,8 @@
/* -------------------------------------------------------------------------- */
/* Symbolic object - contains the pre-ordering computed by klu_analyze */
/* -------------------------------------------------------------------------- */
---- SuiteSparse/LDL/Include/ldl.h.orig 2014-03-21 20:21:11.000000000 +0100
-+++ SuiteSparse/LDL/Include/ldl.h 2023-01-07 20:22:25.274618261 +0100
+--- SuiteSparse/LDL/Include/ldl.h.orig 2014-10-09 22:29:41.000000000 +0200
++++ SuiteSparse/LDL/Include/ldl.h 2023-01-08 20:54:57.482639946 +0100
@@ -38,6 +38,10 @@
#endif
@@ -481,7 +479,7 @@
/* === int version ========================================================== */
/* ========================================================================== */
@@ -110,3 +114,6 @@ SuiteSparse_long ldl_l_valid_matrix ( Su
- #define LDL_SUBSUB_VERSION 0
+ #define LDL_SUBSUB_VERSION 1
#define LDL_VERSION LDL_VERSION_CODE(LDL_MAIN_VERSION,LDL_SUB_VERSION)
+#ifdef __cplusplus
@@ -530,20 +528,20 @@
#endif
/* ========================================================================== */
---- SuiteSparse/SPQR/Include/SuiteSparseQR.hpp.orig 2014-03-19 20:35:43.000000000 +0100
-+++ SuiteSparse/SPQR/Include/SuiteSparseQR.hpp 2023-01-07 21:29:05.256281833 +0100
+--- 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
// -----------------------------------------------------------------------------
-extern "C"
-{
- #include "cholmod.h"
#include "SuiteSparseQR_definitions.h"
+ #include "cholmod.h"
-}
// =============================================================================
- // === spqr_symbolic ===========================================================
+ // === 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
diff --git a/SuiteSparse-shared.patch b/SuiteSparse-shared.patch
index c13e9e0..0e809e9 100644
--- a/SuiteSparse-shared.patch
+++ b/SuiteSparse-shared.patch
@@ -667,8 +667,8 @@
reade: reade.f
- $(F77) $(FFLAGS) -O -o reade reade.f
+ libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) $(FFLAGS) -O -o reade reade.f
---- SuiteSparse/CHOLMOD/Lib/Makefile.orig 2014-03-23 01:46:29.000000000 +0100
-+++ SuiteSparse/CHOLMOD/Lib/Makefile 2023-01-07 17:56:47.118623582 +0100
+--- SuiteSparse/CHOLMOD/Lib/Makefile.orig 2014-09-04 20:44:03.000000000 +0200
++++ SuiteSparse/CHOLMOD/Lib/Makefile 2023-01-08 20:34:45.279207016 +0100
@@ -21,7 +21,7 @@ ifeq (,$(findstring -DNCAMD, $(CHOLMOD_C
ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
# CAMD and CCOLAMD are requested and available
@@ -707,7 +707,7 @@
clean:
- $(RM) $(CLEAN)
-@@ -156,9 +156,13 @@ DL = $(LCORE) $(LCHECK) $(LCHOLESKY) $(L
+@@ -164,9 +164,13 @@ DL = $(LCORE) $(LCHECK) $(LCHOLESKY) $(L
# to compile just the double/int version, use OBJ = $(DI)
OBJ = $(DI) $(DL)
@@ -724,7 +724,7 @@
$(OBJ): $(INC)
-@@ -167,24 +171,24 @@ $(OBJ): $(INC)
+@@ -175,24 +179,24 @@ $(OBJ): $(INC)
#-------------------------------------------------------------------------------
cholmod_check.o: ../Check/cholmod_check.c
@@ -755,7 +755,7 @@
#-------------------------------------------------------------------------------
-@@ -192,98 +196,98 @@ cholmod_l_write.o: ../Check/cholmod_writ
+@@ -200,98 +204,98 @@ cholmod_l_write.o: ../Check/cholmod_writ
#-------------------------------------------------------------------------------
cholmod_common.o: ../Core/cholmod_common.c
@@ -884,7 +884,7 @@
#-------------------------------------------------------------------------------
-@@ -291,116 +295,116 @@ cholmod_l_version.o: ../Core/cholmod_ver
+@@ -299,116 +303,116 @@ cholmod_l_version.o: ../Core/cholmod_ver
#-------------------------------------------------------------------------------
cholmod_amd.o: ../Cholesky/cholmod_amd.c
@@ -1035,7 +1035,7 @@
#-------------------------------------------------------------------------------
-@@ -408,88 +412,88 @@ cholmod_l_nesdis.o: ../Partition/cholmod
+@@ -416,88 +420,88 @@ cholmod_l_nesdis.o: ../Partition/cholmod
#-------------------------------------------------------------------------------
cholmod_horzcat.o: ../MatrixOps/cholmod_horzcat.c
@@ -1148,7 +1148,7 @@
#-------------------------------------------------------------------------------
-@@ -499,27 +503,27 @@ cholmod_l_updown.o: ../Modify/cholmod_up
+@@ -507,27 +511,27 @@ cholmod_l_updown.o: ../Modify/cholmod_up
cholmod_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \
../GPU/t_cholmod_gpu.c \
../Supernodal/t_cholmod_super_numeric.c
@@ -1182,12 +1182,7 @@
#-------------------------------------------------------------------------------
# GPU module
-@@ -532,12 +536,12 @@ cholmod_l_super_solve.o: ../Supernodal/c
-
- cholmod_gpu_kernels.o: ../GPU/cholmod_gpu_kernels.c \
- ../GPU/cholmod_gpu_kernels.cu
-- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(C) -c $(I) $<
+@@ -537,8 +541,8 @@ cholmod_gpu_kernels.o: ../GPU/cholmod_gp
$(NVCC) -I../../SuiteSparse_config -Xcompiler -fPIC -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -c ../GPU/cholmod_gpu_kernels.cu
cholmod_gpu.o: ../GPU/cholmod_gpu.c
@@ -2053,8 +2048,8 @@
+ $(RM) $(DESTDIR)$(INSTALL_LIB)/librbio.la
+ $(RM) $(DESTDIR)$(INSTALL_INCLUDE)/RBio.h
---- SuiteSparse/SPQR/Demo/Makefile.orig 2014-07-14 21:46:58.000000000 +0200
-+++ SuiteSparse/SPQR/Demo/Makefile 2023-01-07 21:33:51.208066033 +0100
+--- SuiteSparse/SPQR/Demo/Makefile.orig 2015-03-25 00:54:30.000000000 +0100
++++ SuiteSparse/SPQR/Demo/Makefile 2023-01-08 20:39:26.207685095 +0100
@@ -20,9 +20,9 @@ ifeq (,$(findstring -DNPARTITION, $(CHOL
ifeq (../../CAMD, $(wildcard ../../CAMD))
ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
@@ -2066,26 +2061,37 @@
+ ../../CAMD/Lib/libcamd.la
+ I_WITH_PARTITION = -I$(METIS_PATH) \
-I../../CCOLAMD/Include -I../../CAMD/Include
- CONFIG =
+ CONFIG_PARTITION =
endif
-@@ -31,10 +31,10 @@ ifeq (,$(findstring -DNPARTITION, $(CHOL
- endif
+@@ -35,8 +35,8 @@ endif
+ # the optional SPQRGPU module requires CUDA, SuiteSparse_GPURuntime, GPUQREngine
+ ifneq ($(GPU_CONFIG),)
+ LIB_WITH_SPQRGPU = $(CUDART_LIB) $(CUBLAS_LIB) \
+- ../../SuiteSparse_GPURuntime/Lib/libSuiteSparse_GPURuntime.a \
+- ../../GPUQREngine/Lib/libGPUQREngine.a
++ ../../SuiteSparse_GPURuntime/Lib/libSuiteSparse_GPURuntime.la \
++ ../../GPUQREngine/Lib/libGPUQREngine.la
+ I_WITH_SPQRGPU = -I../../SuiteSparse_GPURuntime/Include \
+ -I../../GPUQREngine/Include \
+ -I$(CUDA_INC_PATH)
+@@ -47,10 +47,10 @@ endif
+
#-------------------------------------------------------------------------------
-CLIB = ../Lib/libspqr.a \
-- ../../SuiteSparse_config/libsuitesparseconfig.a \
-- ../../CHOLMOD/Lib/libcholmod.a ../../AMD/Lib/libamd.a \
-- ../../COLAMD/Lib/libcolamd.a $(LIB_WITH_PARTITION)
+- ../../SuiteSparse_config/libsuitesparseconfig.a \
+- ../../CHOLMOD/Lib/libcholmod.a ../../AMD/Lib/libamd.a \
+- ../../COLAMD/Lib/libcolamd.a \
+CLIB = ../Lib/libspqr.la \
-+ ../../SuiteSparse_config/libsuitesparseconfig.la \
-+ ../../CHOLMOD/Lib/libcholmod.la ../../AMD/Lib/libamd.la \
-+ ../../COLAMD/Lib/libcolamd.la $(LIB_WITH_PARTITION)
++ ../../SuiteSparse_config/libsuitesparseconfig.la \
++ ../../CHOLMOD/Lib/libcholmod.la ../../AMD/Lib/libamd.la \
++ ../../COLAMD/Lib/libcolamd.la \
+ $(LIB_WITH_PARTITION) \
+ $(LIB_WITH_SPQRGPU)
- # use the BLAS and LAPACK defined by SuiteSparse_config.mk; do not use valgrind
- FLIB = $(LAPACK) $(BLAS)
-@@ -106,30 +106,27 @@ cdemo: qrdemoc
- - $(V) ./qrdemoc < ../Matrix/Ragusa16.mtx
- - $(V) ./qrdemoc < ../Matrix/young1c.mtx
+@@ -145,36 +145,33 @@ gpu4: qrdemo_gpu
+ - $(V) ./qrdemo_gpu ../Matrix/Groebner_id2003_aug.mtx 6
+ - $(V) ./qrdemo_gpu ../Matrix/Franz6_id1959_aug.mtx 6
-../Lib/libspqr.a:
+../Lib/libspqr.la:
@@ -2115,26 +2121,55 @@
+../../CAMD/Lib/libcamd.la:
- ( cd ../../CAMD && $(MAKE) library )
+-../../SuiteSparse_GPURuntime/Lib/libSuiteSparse_GPURuntime.a:
++../../SuiteSparse_GPURuntime/Lib/libSuiteSparse_GPURuntime.la:
+ - ( cd ../../SuiteSparse_GPURuntime && $(MAKE) )
+
+-../../GPUQREngine/Lib/libGPUQREngine.a:
++../../GPUQREngine/Lib/libGPUQREngine.la:
+ - ( cd ../../GPUQREngine && $(MAKE) )
+
-$(METIS):
-- ( cd $(METIS_PATH) && $(MAKE) )
+- - ( cd $(METIS_PATH) && $(MAKE) )
-
library:
( cd ../Lib ; $(MAKE) )
( cd ../../AMD ; $(MAKE) library )
-@@ -164,10 +161,10 @@ LIBS += $(CUDART_LIB) $(CUBLAS_LIB)
+@@ -220,28 +217,28 @@ LIBS += $(CUDART_LIB) $(CUBLAS_LIB)
endif
qrsimple: qrsimple.cpp library $(INC)
- $(C) qrsimple.cpp -o qrsimple $(LIBS)
-+ libtool --tag=CXX --mode=link $(C) $(LDFLAGS) qrsimple.cpp -o qrsimple $(LIBS)
++ libtool --tag=CXX --mode=link $(C) qrsimple.cpp -o qrsimple $(LIBS)
qrdemo: qrdemo.cpp library $(INC)
- $(C) qrdemo.cpp -o qrdemo $(LIBS)
-+ libtool --tag=CXX --mode=link $(C) $(LDFLAGS) qrdemo.cpp -o qrdemo $(LIBS)
++ libtool --tag=CXX --mode=link $(C) qrdemo.cpp -o qrdemo $(LIBS)
+
+ qrdemo_gpu: qrdemo_gpu.cpp library $(INC)
+ ifneq ($(GPU_CONFIG),)
+- $(C) qrdemo_gpu.cpp -o qrdemo_gpu $(LIBS)
++ libtool --tag=CXX --mode=link $(C) qrdemo_gpu.cpp -o qrdemo_gpu $(LIBS)
+ else
+ echo
+ endif
- # compile the C code with gcc, but link with g++ to use SuiteSparseQR:
+ qrdemo_gpu2: qrdemo_gpu2.cpp library $(INC)
+ ifneq ($(GPU_CONFIG),)
+- $(C) qrdemo_gpu2.cpp -o qrdemo_gpu2 $(LIBS)
++ libtool --tag=CXX --mode=link $(C) qrdemo_gpu2.cpp -o qrdemo_gpu2 $(LIBS)
+ else
+ echo
+ endif
-@@ -175,11 +172,11 @@ qrdemoc.o: qrdemoc.c $(INC)
+ qrdemo_gpu3: qrdemo_gpu3.cpp library $(INC)
+ ifneq ($(GPU_CONFIG),)
+- $(C) qrdemo_gpu3.cpp -o qrdemo_gpu3 $(LIBS)
++ libtool --tag=CXX --mode=link $(C) qrdemo_gpu3.cpp -o qrdemo_gpu3 $(LIBS)
+ else
+ echo
+ endif
+@@ -252,11 +249,11 @@ qrdemoc.o: qrdemoc.c $(INC)
$(CC) $(CF) $(SPQR_CONFIG) -ansi $(I) -c $<
qrdemoc: qrdemoc.o library $(INC)
@@ -2148,8 +2183,8 @@
- $(C) -o qrsimplec qrsimplec.o $(LIBS)
+ libtool --tag=CXX --mode=link $(C) $(LDFLAGS) -o qrsimplec qrsimplec.o $(LIBS)
---- SuiteSparse/SPQR/Lib/Makefile.orig 2012-06-21 07:37:08.000000000 +0200
-+++ SuiteSparse/SPQR/Lib/Makefile 2023-01-07 21:37:34.776854856 +0100
+--- SuiteSparse/SPQR/Lib/Makefile.orig 2014-09-17 22:29:37.000000000 +0200
++++ SuiteSparse/SPQR/Lib/Makefile 2023-01-08 20:42:55.896549113 +0100
@@ -20,9 +20,9 @@ ifeq (,$(findstring -DNPARTITION, $(CHOL
ifeq (../../CAMD, $(wildcard ../../CAMD))
ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
@@ -2161,9 +2196,9 @@
+ ../../CAMD/Lib/libcamd.la
+ I_WITH_PARTITION = -I$(METIS_PATH) \
-I../../CCOLAMD/Include -I../../CAMD/Include
- CONFIG =
+ CONFIG_PARTITION =
endif
-@@ -37,14 +37,14 @@ endif
+@@ -39,14 +39,14 @@ endif
# -Wredundant-decls -Wdisabled-optimization \
# -ansi -fexceptions
@@ -2181,9 +2216,9 @@
clean:
- $(RM) $(CLEAN)
-@@ -101,126 +101,130 @@ I = -I../../CHOLMOD/Include -I../../Suit
+@@ -116,135 +116,139 @@ endif
- C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I)
+ C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG_PARTITION) $(I)
-libspqr.a: $(OBJ)
- $(ARCHIVE) libspqr.a $(OBJ)
@@ -2354,6 +2389,18 @@
spqr_rmap.o: ../Source/spqr_rmap.cpp
- $(C) -c $<
++ libtool --tag=CXX --mode=compile $(C) -c $<
+
+ spqrgpu_kernel.o: ../SPQRGPU/spqrgpu_kernel.cpp
+- $(C) -c $<
++ libtool --tag=CXX --mode=compile $(C) -c $<
+
+ spqrgpu_buildAssemblyMaps.o: ../SPQRGPU/spqrgpu_buildAssemblyMaps.cpp
+- $(C) -c $<
++ libtool --tag=CXX --mode=compile $(C) -c $<
+
+ spqrgpu_computeFrontStaging.o: ../SPQRGPU/spqrgpu_computeFrontStaging.cpp
+- $(C) -c $<
+ libtool --tag=CXX --mode=compile $(C) -c $<
--- SuiteSparse/SPQR/Makefile.orig 2014-07-14 22:05:03.000000000 +0200
+++ SuiteSparse/SPQR/Makefile 2023-01-07 21:38:48.839786956 +0100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SuiteSparse.git/commitdiff/6cd4ade9dce2350e7ef306fc914b595f85f432f0
More information about the pld-cvs-commit
mailing list