packages: UMFPACK/UMFPACK-shared.patch, UMFPACK/UMFPACK-ufconfig.patch, UMF...
qboosh
qboosh at pld-linux.org
Fri Jan 6 10:15:08 CET 2012
Author: qboosh Date: Fri Jan 6 09:15:08 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 5.5.2
- updated ufconfig,shared patches
---- Files affected:
packages/UMFPACK:
UMFPACK-shared.patch (1.8 -> 1.9) , UMFPACK-ufconfig.patch (1.2 -> 1.3) , UMFPACK.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/UMFPACK/UMFPACK-shared.patch
diff -u packages/UMFPACK/UMFPACK-shared.patch:1.8 packages/UMFPACK/UMFPACK-shared.patch:1.9
--- packages/UMFPACK/UMFPACK-shared.patch:1.8 Sun Jan 30 13:33:35 2011
+++ packages/UMFPACK/UMFPACK-shared.patch Fri Jan 6 10:15:03 2012
@@ -1,14 +1,8 @@
---- UMFPACK/Demo/Makefile.orig 2011-01-28 16:54:05.792693904 +0100
-+++ UMFPACK/Demo/Makefile 2011-01-28 16:56:24.156689713 +0100
-@@ -17,35 +17,17 @@
+--- UMFPACK/Demo/Makefile.orig 2012-01-06 09:13:28.333467677 +0100
++++ UMFPACK/Demo/Makefile 2012-01-06 09:18:09.170143746 +0100
+@@ -48,30 +48,10 @@
- C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd
-
--INC = ../Include/umfpack.h ../../AMD/Include/amd.h
-+INC = ../Include/umfpack.h
-
--LIBS = $(BLAS) $(XERBLA) $(LIB)
-+LIBS = $(BLAS) $(XERBLA) $(LIB) -lamd
+ LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
-../Lib/libumfpack.a:
+../Lib/libumfpack.la:
@@ -18,29 +12,28 @@
- ( cd ../../AMD ; $(MAKE) library )
-
-../../CHOLMOD/Lib/libcholmod.a:
-- ( cd ../../CHOLMOD ; $(MAKE) library )
+- - ( cd ../../CHOLMOD && $(MAKE) library )
-
-../../COLAMD/Lib/libcolamd.a:
-- ( cd ../../COLAMD ; $(MAKE) library )
+- - ( cd ../../COLAMD && $(MAKE) library )
+-
-
-../../CCOLAMD/Lib/libccolamd.a:
-- ( cd ../../CCOLAMD ; $(MAKE) library )
+- - ( cd ../../CCOLAMD && $(MAKE) library )
-
-../../CAMD/Lib/libcamd.a:
-- ( cd ../../CAMD ; $(MAKE) library )
+- - ( cd ../../CAMD && $(MAKE) library )
+-
+-$(METIS):
+- ( cd $(METIS_PATH) && $(MAKE) )
-
- $(METIS):
- ( cd $(METIS_PATH) ; $(MAKE) )
-
-UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
-- ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \
-- ../../CAMD/Lib/libcamd.a $(METIS) \
-- ../../CCOLAMD/Lib/libccolamd.a
+- $(WITH_CHOLMOD) $(WITH_PARTITION)
+UMFPACK = ../Lib/libumfpack.la
libs: $(UMFPACK)
-@@ -56,7 +38,7 @@
+@@ -82,7 +62,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)
@@ -49,7 +42,7 @@
# the GNU rules are simpler:
# umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed
-@@ -73,28 +55,28 @@
+@@ -99,28 +79,28 @@
- sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c
umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK)
@@ -82,9 +75,51 @@
run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple
./umfpack_simple
---- UMFPACK/Lib/GNUmakefile.orig 2010-10-13 20:56:34.119741882 +0200
-+++ UMFPACK/Lib/GNUmakefile 2010-10-13 20:57:29.679734339 +0200
-@@ -2,7 +2,7 @@
+@@ -162,16 +142,16 @@
+ - ./umf4 a 1e-6
+
+ umf4: umf4.c $(UMFPACK)
+- $(C) -o umf4 umf4.c $(UMFPACK) $(LIBS)
++ libtool --tag=CC --mode=link $(C) -o umf4 umf4.c $(UMFPACK) $(LIBS)
+
+ readhb: readhb.f
+- $(F77) $(F77FLAGS) -o readhb readhb.f $(F77LIB)
++ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -o readhb readhb.f $(F77LIB)
+
+ readhb_size: readhb_size.f
+- $(F77) $(F77FLAGS) -o readhb_size readhb_size.f $(F77LIB)
++ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -o readhb_size readhb_size.f $(F77LIB)
+
+ readhb_nozeros: readhb_nozeros.f
+- $(F77) $(F77FLAGS) -o readhb_nozeros readhb_nozeros.f $(F77LIB)
++ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -o readhb_nozeros readhb_nozeros.f $(F77LIB)
+
+ #-------------------------------------------------------------------------------
+ # compile the FORTRAN interface and demo
+@@ -179,17 +159,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)
+- $(F77) $(F77FLAGS) -o umf4hb umf4hb.f umf4_f77wrapper.o \
++ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -o umf4hb umf4hb.f umf4_f77wrapper.o \
+ $(UMFPACK) $(LIBS)
+ - ./umf4hb < HB/west0067.rua > my_umf4hb.out
+ - diff my_umf4hb.out umf4hb.out
+- $(F77) $(F77FLAGS) -o umf4zhb umf4zhb.f umf4_f77zwrapper.o \
++ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -o umf4zhb umf4zhb.f umf4_f77zwrapper.o \
+ $(UMFPACK) $(LIBS)
+ - ./umf4zhb < HB/qc324.cua > my_umf4zhb.out
+ - diff my_umf4zhb.out umf4zhb.out
+
+ fortran64: $(UMFPACK) umf4hb64.f umf4_f77wrapper64.o umf4_f77zwrapper64.o $(UMFPACK)
+- $(F77) $(F77FLAGS) -o umf4hb64 umf4hb64.f umf4_f77wrapper64.o \
++ libtool --tag=F77 --mode=link $(F77) $(F77FLAGS) -o umf4hb64 umf4hb64.f umf4_f77wrapper64.o \
+ $(UMFPACK) $(LIBS)
+ - ./umf4hb64 < HB/west0067.rua > my_umf4hb64.out
+ - diff my_umf4hb64.out umf4hb64.out
+--- UMFPACK/Lib/GNUmakefile.orig 2012-01-06 09:13:28.336801011 +0100
++++ UMFPACK/Lib/GNUmakefile 2012-01-06 09:43:51.583528725 +0100
+@@ -2,16 +2,18 @@
# UMFPACK Makefile for compiling on Unix systems (for GNU Make)
#-------------------------------------------------------------------------------
@@ -93,7 +128,18 @@
include /usr/share/misc/UFconfig.mk
-@@ -71,8 +71,7 @@
+ # UMFPACK can use CHOLMOD by default as an ordering option
+ ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
+ I = -I../Include -I../Source -I/usr/include/amd
++ LIBS = -lamd -lblas
+ else
+ I = -I../Include -I../Source -I/usr/include/amd \
+ -I/usr/include/cholmod
++ LIBS = -lcholmod -lamd -lblas
+ endif
+
+ C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
+@@ -78,8 +80,7 @@
$(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \
$(addprefix ../Source/, $(addsuffix .h,$(UMFINT))) \
$(addprefix ../Include/, $(addsuffix .h,$(USER))) \
@@ -103,7 +149,7 @@
#-------------------------------------------------------------------------------
# object files for each version
-@@ -91,171 +90,171 @@
+@@ -98,171 +99,171 @@
#-------------------------------------------------------------------------------
umf_i_%.o: ../Source/umf_%.c $(INC)
@@ -256,7 +302,7 @@
umf_zl_%hsolve.o: ../Source/umf_%tsolve.c $(INC)
- $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@
-+ libtool --tag=CC --mode=compile $(C) -DZLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@
umf_zl_triplet_map_x.o: ../Source/umf_triplet.c $(INC)
- $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@
@@ -303,10 +349,10 @@
#-------------------------------------------------------------------------------
-libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
-- $(AR) libumfpack.a $^
+- $(ARCHIVE) libumfpack.a $^
- - $(RANLIB) libumfpack.a
+libumfpack.la: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $(^:.o=.lo) -lm -lamd -lcholmod -lblas
++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $(^:.o=.lo) $(LIBS) -lm
-so: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL)
- gcc -shared -Wl,-soname,libumfpack.so -o libumfpack.so $^
@@ -324,66 +370,3 @@
clean:
- $(RM) $(CLEAN)
---- UMFPACK/Makefile.orig 2010-10-13 19:57:37.315740205 +0200
-+++ UMFPACK/Makefile 2010-10-13 20:23:19.519734339 +0200
-@@ -4,8 +4,6 @@
-
- VERSION = 5.5.0
-
--# UMFPACK requires the AMD package to be in ../AMD
--
- default: all
-
- include /usr/share/misc/UFconfig.mk
-@@ -13,14 +11,12 @@
- # compile all C code (except hb, fortran, and fortran64), including AMD and the
- # demos, but not the MATLAB mexFunctions
- all:
-- ( cd ../AMD ; $(MAKE) library )
- ( cd Lib ; $(MAKE) )
- ( cd Demo ; $(MAKE) )
- - cat Doc/License
-
- # compile just the C-callable libraries and demo programs (not mexFunctions)
- library:
-- ( cd ../AMD ; $(MAKE) library )
- ( cd Lib ; $(MAKE) )
-
- # compile the FORTRAN interface and demo program
-@@ -37,7 +33,6 @@
-
- # remove object files, but keep the compiled programs and library archives
- clean:
-- ( cd ../AMD ; $(MAKE) clean )
- ( cd Lib ; $(MAKE) clean )
- ( cd Demo ; $(MAKE) clean )
- ( cd MATLAB ; $(MAKE) clean )
-@@ -45,7 +40,6 @@
-
- # clean, and then remove compiled programs and library archives
- purge:
-- ( cd ../AMD ; $(MAKE) purge )
- ( cd Lib ; $(MAKE) purge )
- ( cd Demo ; $(MAKE) purge )
- ( cd MATLAB ; $(MAKE) purge )
-@@ -53,12 +47,10 @@
-
- # create PDF documents for the original distribution
- docs:
-- ( cd ../AMD ; $(MAKE) doc )
- ( cd Doc ; $(MAKE) )
-
- # get ready for distribution
- dist: purge
-- ( cd ../AMD ; $(MAKE) dist )
- ( cd Demo ; $(MAKE) dist )
- ( cd Doc ; $(MAKE) )
-
-@@ -68,7 +60,6 @@
-
- # compile the MATLAB mexFunction for AMD (but not UMFPACK)
- mex:
-- ( cd ../AMD/MATLAB ; $(MAKE) )
- # ( cd MATLAB ; $(MAKE) )
-
- # statement coverage (requires Linux; takes a lot of time and disk space)
================================================================
Index: packages/UMFPACK/UMFPACK-ufconfig.patch
diff -u packages/UMFPACK/UMFPACK-ufconfig.patch:1.2 packages/UMFPACK/UMFPACK-ufconfig.patch:1.3
--- packages/UMFPACK/UMFPACK-ufconfig.patch:1.2 Thu Oct 14 07:34:33 2010
+++ packages/UMFPACK/UMFPACK-ufconfig.patch Fri Jan 6 10:15:03 2012
@@ -1,21 +1,57 @@
-diff -ur UMFPACK/Demo/Makefile UMFPACK-uf/Demo/Makefile
---- UMFPACK/Demo/Makefile 2007-05-05 21:56:55.000000000 +0200
-+++ UMFPACK-uf/Demo/Makefile 2007-12-02 19:18:50.000000000 +0100
-@@ -7,12 +7,11 @@
+--- UMFPACK/Demo/Makefile.orig 2011-12-14 18:45:15.000000000 +0100
++++ UMFPACK/Demo/Makefile 2012-01-06 08:03:34.253327243 +0100
+@@ -13,7 +13,7 @@
- default: libs run
+ all64: libs run hb fortran64
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
--C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
-- -I../../UFconfig
-+C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd
+ #-------------------------------------------------------------------------------
+ # the optional Partition module requires METIS, CAMD, and CCOLAMD
+@@ -23,35 +23,28 @@
+ LIB_WITH_CHOLMOD =
+ ifeq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
+ # CHOLMOD is requested. See if it is available
+- ifeq (../../CHOLMOD, $(wildcard ../../CHOLMOD))
+- ifeq (../../COLAMD, $(wildcard ../../COLAMD))
++ ifeq ($(WITH_CHOLMOD), 1)
++ # assume COLAMD available
+ # CHOLMOD and COLAMD are available
+ CONFIG1 =
+- LIB_WITH_CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
+- ../../COLAMD/Lib/libcolamd.a
++ LIB_WITH_CHOLMOD = -lcholmod -lcolamd
+ # check if METIS is requested and available
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+ # METIS is requested. See if it is available
+- ifeq ($(METIS), $(wildcard $(METIS)))
+- ifeq (../../CAMD, $(wildcard ../../CAMD))
+- ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
++ ifeq ($(WITH_METIS), 1)
++ # assume CAMD and CCOLAMD are available
+ CONFIG2 =
+- LIB_WITH_PARTITION = $(METIS) \
+- ../../CCOLAMD/Lib/libccolamd.a \
+- ../../CAMD/Lib/libcamd.a
+- endif
+- endif
++ LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
+ endif
+ endif
+- endif
+ endif
+ endif
+ #-------------------------------------------------------------------------------
+
+ C = $(CC) $(CF) $(UMFPACK_CONFIG) $(CONFIG1) $(CONFIG2) \
+- -I../Include -I../../AMD/Include -I../../UFconfig
++ -I../Include -I/usr/include/amd
-INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h
-+INC = ../Include/umfpack.h ../../AMD/Include/amd.h
++INC = ../Include/umfpack.h
- LIBS = $(BLAS) $(XERBLA) $(LIB)
+ LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
--- UMFPACK/Doc/Makefile 2006-01-30 17:51:24.000000000 +0100
@@ -29,24 +65,28 @@
#-------------------------------------------------------------------------------
# Remove all but the files in the original distribution
---- UMFPACK/Lib/GNUmakefile.orig 2009-11-11 21:09:54.000000000 +0100
-+++ UMFPACK/Lib/GNUmakefile 2010-10-13 19:56:54.827741882 +0200
-@@ -4,12 +4,10 @@
+--- UMFPACK/Lib/GNUmakefile.orig 2011-12-08 19:48:30.000000000 +0100
++++ UMFPACK/Lib/GNUmakefile 2012-01-06 08:36:15.313392908 +0100
+@@ -4,14 +4,14 @@
default: libumfpack.a
-include ../../UFconfig/UFconfig.mk
+include /usr/share/misc/UFconfig.mk
- C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \
-- -I../Include -I../Source -I../../AMD/Include -I../../UFconfig \
-- -I../../CCOLAMD/Include -I../../CAMD/Include -I../../CHOLMOD/Include \
-- -I../../metis-4.0/Lib -I../../COLAMD/Include
-+ -I../Include -I../Source -I/usr/include/amd -I/usr/include/cholmod
+ # UMFPACK can use CHOLMOD by default as an ordering option
+ ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
+- I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig
++ I = -I../Include -I../Source -I/usr/include/amd
+ else
+- I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig \
+- -I../../CHOLMOD/Include
++ I = -I../Include -I../Source -I/usr/include/amd \
++ -I/usr/include/cholmod
+ endif
- #-------------------------------------------------------------------------------
- # source files
-@@ -67,7 +65,7 @@
+ C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
+@@ -72,7 +72,7 @@
# include files:
#-------------------------------------------------------------------------------
================================================================
Index: packages/UMFPACK/UMFPACK.spec
diff -u packages/UMFPACK/UMFPACK.spec:1.10 packages/UMFPACK/UMFPACK.spec:1.11
--- packages/UMFPACK/UMFPACK.spec:1.10 Sun Jan 30 13:33:35 2011
+++ packages/UMFPACK/UMFPACK.spec Fri Jan 6 10:15:03 2012
@@ -2,12 +2,12 @@
Summary: UMFPACK: sparse multifrontal LU factorization
Summary(pl.UTF-8): UMFPACK - wielofrontalny rozkład LU macierzy rzadkich
Name: UMFPACK
-Version: 5.5.1
+Version: 5.5.2
Release: 1
License: GPL v2+
Group: Libraries
Source0: http://www.cise.ufl.edu/research/sparse/umfpack/%{name}-%{version}.tar.gz
-# Source0-md5: cb13431ce9cf2b515d1f889f329f4558
+# Source0-md5: 07eaa6ae3de176e5b3681032c10c76be
Patch0: %{name}-ufconfig.patch
Patch1: %{name}-shared.patch
Patch2: %{name}-include-AMD.patch
@@ -117,6 +117,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2012/01/06 09:15:03 qboosh
+- updated to 5.5.2
+- updated ufconfig,shared patches
+
Revision 1.10 2011/01/30 12:33:35 qboosh
- updated to 5.5.1
- updated shared patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/UMFPACK/UMFPACK-shared.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/UMFPACK/UMFPACK-ufconfig.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/UMFPACK/UMFPACK.spec?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list