From 396f0219c6ade8e41c1dccd6db4adec34f44678e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 3 Oct 2014 16:20:52 +0200 Subject: [PATCH] - updated to 5.7.0 - updated ufconfig,shared patches --- UMFPACK-shared.patch | 22 +++++++++++----------- UMFPACK-ufconfig.patch | 14 ++++++-------- UMFPACK.spec | 38 +++++++++++++++++++------------------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/UMFPACK-shared.patch b/UMFPACK-shared.patch index 4c2cd6c..d14c99d 100644 --- a/UMFPACK-shared.patch +++ b/UMFPACK-shared.patch @@ -1,19 +1,19 @@ ---- UMFPACK/Demo/Makefile.orig 2012-08-28 20:34:44.256987195 +0200 -+++ UMFPACK/Demo/Makefile 2012-08-28 20:35:27.766986287 +0200 +--- UMFPACK/Demo/Makefile.orig 2014-10-03 16:14:05.839641618 +0200 ++++ UMFPACK/Demo/Makefile 2014-10-03 16:15:11.772972188 +0200 @@ -48,10 +48,10 @@ - LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) + LIBS = $(LAPACK) $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) $(CUBLAS_LIB) $(CUDART_LIB) -../Lib/libumfpack.a: +../Lib/libumfpack.la: ( cd ../Lib ; $(MAKE) ) --UMFPACK = ../Lib/libumfpack.a -lamd \ -+UMFPACK = ../Lib/libumfpack.la -lamd \ - -lsuitesparseconfig \ - $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) +-UMFPACK = ../Lib/libumfpack.a -lamd -lsuitesparseconfig \ ++UMFPACK = ../Lib/libumfpack.la -lamd -lsuitesparseconfig \ + $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) -@@ -64,7 +64,7 @@ + libs: $(UMFPACK) +@@ -63,7 +63,7 @@ dist: umfpack_di_demo.c umfpack_dl_demo.c umfpack_zi_demo.c umfpack_zl_demo.c umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK) @@ -22,7 +22,7 @@ # the GNU rules are simpler: # umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed -@@ -81,28 +81,28 @@ +@@ -80,28 +80,28 @@ - sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK) @@ -55,7 +55,7 @@ run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple ./umfpack_simple -@@ -144,16 +144,16 @@ +@@ -143,16 +143,16 @@ - ./umf4 a 1e-6 umf4: umf4.c $(UMFPACK) @@ -76,7 +76,7 @@ #------------------------------------------------------------------------------- # compile the FORTRAN interface and demo -@@ -161,17 +161,17 @@ +@@ -160,17 +160,17 @@ # This doesn't seem to work on the Mac (Snow Leopard, OS X 10.6.1) fortran: $(UMFPACK) umf4hb.f umf4_f77wrapper.o umf4zhb.f umf4_f77zwrapper.o $(UMFPACK) diff --git a/UMFPACK-ufconfig.patch b/UMFPACK-ufconfig.patch index 275a792..a7863ac 100644 --- a/UMFPACK-ufconfig.patch +++ b/UMFPACK-ufconfig.patch @@ -1,5 +1,5 @@ ---- UMFPACK/Demo/Makefile.orig 2012-06-21 07:39:46.000000000 +0200 -+++ UMFPACK/Demo/Makefile 2012-08-28 20:34:10.400321229 +0200 +--- UMFPACK/Demo/Makefile.orig 2014-03-22 03:19:44.000000000 +0100 ++++ UMFPACK/Demo/Makefile 2014-10-03 16:13:22.816310091 +0200 @@ -13,7 +13,7 @@ all64: libs run hb fortran64 @@ -9,7 +9,7 @@ #------------------------------------------------------------------------------- # the optional Partition module requires METIS, CAMD, and CCOLAMD -@@ -22,69 +22,37 @@ +@@ -22,69 +22,36 @@ CONFIG1 = -DNCHOLMOD CONFIG2 = -DNPARTITION ifeq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG))) @@ -58,7 +58,7 @@ -INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h +INC = ../Include/umfpack.h - LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) + LIBS = $(LAPACK) $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) $(CUBLAS_LIB) $(CUDART_LIB) ../Lib/libumfpack.a: ( cd ../Lib ; $(MAKE) ) @@ -87,12 +87,10 @@ - -UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ - ../../SuiteSparse_config/libsuitesparseconfig.a \ -+UMFPACK = ../Lib/libumfpack.a -lamd \ -+ -lsuitesparseconfig \ - $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) ++UMFPACK = ../Lib/libumfpack.a -lamd -lsuitesparseconfig \ + $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION) libs: $(UMFPACK) -diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile --- UMFPACK/Doc/Makefile 2006-01-30 17:51:24.000000000 +0100 +++ UMFPACK-uf/Doc/Makefile 2007-12-02 19:19:00.000000000 +0100 @@ -7,7 +7,7 @@ diff --git a/UMFPACK.spec b/UMFPACK.spec index 0767071..723bbd2 100644 --- a/UMFPACK.spec +++ b/UMFPACK.spec @@ -1,29 +1,29 @@ Summary: UMFPACK: sparse multifrontal LU factorization Summary(pl.UTF-8): UMFPACK - wielofrontalny rozkład LU macierzy rzadkich Name: UMFPACK -Version: 5.6.2 +Version: 5.7.0 Release: 1 License: GPL v2+ Group: Libraries Source0: http://www.cise.ufl.edu/research/sparse/umfpack/%{name}-%{version}.tar.gz -# Source0-md5: 8d16f73dd16216f0d2ebb54460ae10a0 +# Source0-md5: 6b6dbac2f7c08d62c4b3220fed1888a3 Patch0: %{name}-ufconfig.patch Patch1: %{name}-shared.patch Patch2: %{name}-include-AMD.patch URL: http://www.cise.ufl.edu/research/sparse/umfpack/ -BuildRequires: AMD-devel >= 2.3.0 -BuildRequires: CAMD-devel >= 2.3.0 -BuildRequires: CCOLAMD-devel >= 2.8.0 -BuildRequires: COLAMD-devel >= 2.8.0 -BuildRequires: CHOLMOD-devel >= 2.0.0 -BuildRequires: SuiteSparse_config >= 4.0.0 +BuildRequires: AMD-devel >= 2.4.0 +BuildRequires: CAMD-devel >= 2.4.0 +BuildRequires: CCOLAMD-devel >= 2.9.0 +BuildRequires: COLAMD-devel >= 2.9.0 +BuildRequires: CHOLMOD-devel >= 3.0.0 +BuildRequires: SuiteSparse_config >= 4.3.0 BuildRequires: blas-devel BuildRequires: libtool >= 2:1.5 -Requires: AMD >= 2.3.0 -Requires: CAMD >= 2.3.0 -Requires: CCOLAMD >= 2.8.0 -Requires: COLAMD >= 2.8.0 -Requires: CHOLMOD >= 2.0.0 +Requires: AMD >= 2.4.0 +Requires: CAMD >= 2.4.0 +Requires: CCOLAMD >= 2.9.0 +Requires: COLAMD >= 2.9.0 +Requires: CHOLMOD >= 3.0.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -50,12 +50,12 @@ Summary: Header files for UMFPACK library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki UMFPACK Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: AMD-devel >= 2.3.0 -Requires: CAMD-devel >= 2.3.0 -Requires: CCOLAMD-devel >= 2.8.0 -Requires: COLAMD-devel >= 2.8.0 -Requires: CHOLMOD-devel >= 2.0.0 -Requires: SuiteSparse_config >= 4.0.0 +Requires: AMD-devel >= 2.4.0 +Requires: CAMD-devel >= 2.4.0 +Requires: CCOLAMD-devel >= 2.9.0 +Requires: COLAMD-devel >= 2.9.0 +Requires: CHOLMOD-devel >= 3.0.0 +Requires: SuiteSparse_config >= 4.3.0 %description devel Header files for UMFPACK library. -- 2.43.0