packages: CHOLMOD/CHOLMOD-metis.patch, CHOLMOD/CHOLMOD-shared.patch, CHOLMO...

qboosh qboosh at pld-linux.org
Wed Jun 27 18:53:38 CEST 2012 

Author: qboosh                       Date: Wed Jun 27 16:53:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.0.0; switched to SuiteSparse_config
- updated ufconfig,shared,metis patches

---- Files affected:
packages/CHOLMOD:
   CHOLMOD-metis.patch (1.1 -> 1.2) , CHOLMOD-shared.patch (1.7 -> 1.8) , CHOLMOD-ufconfig.patch (1.2 -> 1.3) , CHOLMOD.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/CHOLMOD/CHOLMOD-metis.patch
diff -u packages/CHOLMOD/CHOLMOD-metis.patch:1.1 packages/CHOLMOD/CHOLMOD-metis.patch:1.2
--- packages/CHOLMOD/CHOLMOD-metis.patch:1.1	Thu Jan  5 21:36:09 2012
+++ packages/CHOLMOD/CHOLMOD-metis.patch	Wed Jun 27 18:53:33 2012
@@ -1,16 +1,15 @@
-diff -ur ../SuiteSparse.orig/CHOLMOD/Partition/cholmod_metis.c ./CHOLMOD/Partition/cholmod_metis.c
---- ../SuiteSparse.orig/CHOLMOD/Partition/cholmod_metis.c	2007-05-04 11:47:17.000000000 -0500
-+++ ./CHOLMOD/Partition/cholmod_metis.c	2011-10-21 18:21:54.000000000 -0500
-@@ -76,7 +76,7 @@
+--- CHOLMOD/Partition/cholmod_metis.c.orig	2012-05-29 17:02:05.000000000 +0200
++++ CHOLMOD/Partition/cholmod_metis.c	2012-06-27 18:05:33.131952214 +0200
+@@ -75,7 +75,7 @@
  #ifdef DUMP_GRAPH
  #include <stdio.h>
  /* After dumping the graph with this routine, run "onmetis metisgraph" */
--static void dumpgraph (idxtype *Mp, idxtype *Mi, UF_long n,
-+static void dumpgraph (idx_t *Mp, idx_t *Mi, UF_long n,
+-static void dumpgraph (idxtype *Mp, idxtype *Mi, SuiteSparse_long n,
++static void dumpgraph (idx_t *Mp, idx_t *Mi, SuiteSparse_long n,
      cholmod_common *Common)
  {
-     UF_long i, j, p, nz ;
-@@ -162,7 +162,7 @@
+     SuiteSparse_long i, j, p, nz ;
+@@ -161,7 +161,7 @@
      s = GUESS ((double) nz, (double) n) ;
      s *= Common->metis_memory ;
  
@@ -19,7 +18,7 @@
      {
  	/* don't even attempt to malloc such a large block */
  	return (FALSE) ;
-@@ -173,7 +173,7 @@
+@@ -172,7 +172,7 @@
      metis_guard *= Common->metis_memory ;
  
      /* attempt to malloc the block */
@@ -28,7 +27,7 @@
      if (p == NULL)
      {
  	/* failure - return out-of-memory condition */
-@@ -181,7 +181,7 @@
+@@ -180,7 +180,7 @@
      }
  
      /* success - free the block */
@@ -37,7 +36,7 @@
      return (TRUE) ;
  }
  
-@@ -211,7 +211,7 @@
+@@ -210,7 +210,7 @@
  )
  {
      Int *Ap, *Ai ;
@@ -46,7 +45,7 @@
      Int n, nleft, nright, j, p, csep, total_weight, lightest, nz ;
      int Opt [8], nn, csp ;
      size_t n1 ;
-@@ -260,7 +260,7 @@
+@@ -259,7 +259,7 @@
      /* ---------------------------------------------------------------------- */
  
  #ifdef LONG
@@ -55,7 +54,7 @@
      {
  	/* CHOLMOD's matrix is too large for METIS */
  	return (EMPTY) ;
-@@ -283,34 +283,34 @@
+@@ -282,34 +282,34 @@
      DEBUG (for (j = 0 ; j < n ; j++) ASSERT (Anw [j] > 0)) ;
  
      /* ---------------------------------------------------------------------- */
@@ -108,7 +107,7 @@
  	    return (EMPTY) ;
  	}
  	for (p = 0 ; p < nz ; p++)
-@@ -338,13 +338,13 @@
+@@ -337,13 +337,13 @@
      if (!metis_memory_ok (n, nz, Common))
      {
  	/* METIS might ask for too much memory and thus terminate the program */
@@ -128,7 +127,7 @@
  	}
  	return (EMPTY) ;
      }
-@@ -370,27 +370,27 @@
+@@ -369,27 +369,27 @@
  #endif
  
      nn = n ;
@@ -164,7 +163,7 @@
      }
  
      /* ---------------------------------------------------------------------- */
-@@ -508,7 +508,7 @@
+@@ -507,7 +507,7 @@
  {
      double d ;
      Int *Iperm, *Iwork, *Bp, *Bi ;
@@ -173,7 +172,7 @@
      cholmod_sparse *B ;
      Int i, j, n, nz, p, identity, uncol ;
      int Opt [8], nn, zero = 0 ;
-@@ -601,7 +601,7 @@
+@@ -600,7 +600,7 @@
      /* ---------------------------------------------------------------------- */
  
  #ifdef LONG
@@ -182,7 +181,7 @@
      {
  	/* CHOLMOD's matrix is too large for METIS */
  	CHOLMOD(free_sparse) (&B, Common) ;
-@@ -630,29 +630,29 @@
+@@ -629,29 +629,29 @@
      /* allocate the METIS input arrays, if needed */
      /* ---------------------------------------------------------------------- */
  
@@ -226,7 +225,7 @@
  	    return (FALSE) ;
  	}
  	for (j = 0 ; j <= n ; j++)
-@@ -741,16 +741,16 @@
+@@ -740,16 +740,16 @@
      /* free the METIS input arrays */
      /* ---------------------------------------------------------------------- */
  
@@ -248,4 +247,3 @@
      }
  
      CHOLMOD(free_sparse) (&B, Common) ;
-Only in .: metis.patch

================================================================
Index: packages/CHOLMOD/CHOLMOD-shared.patch
diff -u packages/CHOLMOD/CHOLMOD-shared.patch:1.7 packages/CHOLMOD/CHOLMOD-shared.patch:1.8
--- packages/CHOLMOD/CHOLMOD-shared.patch:1.7	Thu Jan  5 21:36:09 2012
+++ packages/CHOLMOD/CHOLMOD-shared.patch	Wed Jun 27 18:53:33 2012
@@ -1,5 +1,5 @@
---- CHOLMOD/Demo/Makefile.orig	2012-01-01 17:10:50.000000000 +0100
-+++ CHOLMOD/Demo/Makefile	2012-01-01 17:13:20.706633471 +0100
+--- CHOLMOD/Demo/Makefile.orig	2012-06-27 18:03:08.271958293 +0200
++++ CHOLMOD/Demo/Makefile	2012-06-27 18:04:38.631954503 +0200
 @@ -15,9 +15,8 @@
  CONFIG =
  ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
@@ -12,20 +12,22 @@
      else
          # METIS is not available, but CHOLMOD_CONFIG does not specify
          # -DNPARTITION.  Add it here so we can still compile CHOLMOD.
-@@ -26,7 +25,7 @@
+@@ -26,8 +25,7 @@
  endif
  #-------------------------------------------------------------------------------
  
 -LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a \
-+LIB2 = -lcholmod -lamd -lcolamd \
+-        ../../SuiteSparse_config/libsuitesparseconfig.a \
++LIB2 = ../Lib/libcholmod.la -lamd -lcolamd \
  	$(LIB_WITH_PARTITION) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
  
  #-------------------------------------------------------------------------------
-@@ -63,27 +62,19 @@
+@@ -69,28 +67,19 @@
  #-------------------------------------------------------------------------------
  # See below if you compile with -DNPARTITION
  library:
--	( cd ../../UFconfig/xerbla ; $(MAKE) )
+-	( cd ../../SuiteSparse_config/xerbla ; $(MAKE) )
+-	( cd ../../SuiteSparse_config ; $(MAKE) )
  	( cd ../Lib ; $(MAKE) )
 -	( cd ../../AMD ; $(MAKE) library )
 -	( cd ../../COLAMD ; $(MAKE) library )
@@ -96,7 +98,7 @@
 -	- $(RANLIB) libcholmod.a
 +libcholmod.la: $(OBJ)
 +	libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcholmod.la -rpath $(libdir) $(OBJ:.o=.lo) -lm \
-+		-lamd -lcolamd $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS)
++		-lamd -lcolamd -lsuitesparseconfig $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS)
 +
 +install: libcholmod.la
 +	install -d $(DESTDIR)$(libdir)

================================================================
Index: packages/CHOLMOD/CHOLMOD-ufconfig.patch
diff -u packages/CHOLMOD/CHOLMOD-ufconfig.patch:1.2 packages/CHOLMOD/CHOLMOD-ufconfig.patch:1.3
--- packages/CHOLMOD/CHOLMOD-ufconfig.patch:1.2	Thu Jan  5 21:36:09 2012
+++ packages/CHOLMOD/CHOLMOD-ufconfig.patch	Wed Jun 27 18:53:33 2012
@@ -5,8 +5,8 @@
  
  default: all
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  #-------------------------------------------------------------------------------
  # With METIS, CCOLAMD, CAMD, and the Partition Module:
@@ -14,7 +14,7 @@
  # 	( cd ../../COLAMD ; $(MAKE) )
  #-------------------------------------------------------------------------------
  
--I = -I../Include -I../../UFconfig
+-I = -I../Include -I../../SuiteSparse_config
 +I = -I../Include
  
  cholmod_demo: library cholmod_demo.c cholmod_demo.h
@@ -25,20 +25,19 @@
 @@ -1,6 +1,6 @@
  default: all
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  all: UserGuide.pdf
  
-diff -ur CHOLMOD/Include/cholmod.h CHOLMOD-uf/Include/cholmod.h
---- CHOLMOD/Include/cholmod.h	2006-12-13 14:31:07.000000000 +0100
-+++ CHOLMOD-uf/Include/cholmod.h	2007-12-02 17:12:47.000000000 +0100
-@@ -84,7 +84,7 @@
+--- CHOLMOD/Include/cholmod.h.orig	2012-05-29 18:45:58.000000000 +0200
++++ CHOLMOD/Include/cholmod.h	2012-06-27 18:02:23.815293493 +0200
+@@ -83,7 +83,7 @@
+ /* assume large file support.  If problems occur, compile with -DNLARGEFILE */
  #include "cholmod_io64.h"
  
- /* define UF_long */
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
  
  #include "cholmod_config.h"
  
@@ -46,11 +45,11 @@
 --- CHOLMOD/Include/cholmod_internal.h	2007-09-28 20:31:04.000000000 +0200
 +++ CHOLMOD-uf/Include/cholmod_internal.h	2007-12-02 17:13:05.000000000 +0100
 @@ -201,7 +201,7 @@
-  * It can also be redefined for other platforms, by modifying UFconfig.h.
+  * It can also be redefined for other platforms, by modifying SuiteSparse_config.h.
   */
  
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
  
  /* -------------------------------------------------------------------------- */
  /* Size_max: the largest value of size_t */
@@ -60,8 +59,8 @@
  
  ccode: all
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  #-------------------------------------------------------------------------------
  # the optional Partition module requires METIS, CAMD, and CCOLAMD
@@ -83,7 +82,7 @@
  endif
  
 -I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
--	$(I_WITH_PARTITION) -I../Include -I../../UFconfig
+-	$(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config
 +I = -I/usr/include/amd -I/usr/include/colamd \
 +	$(I_WITH_PARTITION) -I../Include
  
@@ -96,8 +95,8 @@
  
  default: all
  
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  # Compile the C-callable libraries and the Demo programs.
  all:
@@ -108,27 +107,11 @@
  
  /* Shared prototypes and definitions for CHOLMOD mexFunctions */
  
--#include "UFconfig.h"
-+#include <UFconfig.h>
+-#include "SuiteSparse_config.h"
++#include <SuiteSparse_config.h>
  #ifndef DLONG
  #define DLONG
  #endif
-diff -ur CHOLMOD/MATLAB/Makefile CHOLMOD-uf/MATLAB/Makefile
---- CHOLMOD/MATLAB/Makefile	2007-05-05 19:08:13.000000000 +0200
-+++ CHOLMOD-uf/MATLAB/Makefile	2007-12-02 17:11:22.000000000 +0100
-@@ -4,10 +4,10 @@
- 
- default: all
- 
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
- 
- I = -I. -I../../AMD/Include -I../../COLAMD/Include -I../../CCOLAMD/Include \
--    -I../../CAMD/Include -I../Include -I../../UFconfig -I$(METIS_PATH)/Lib
-+    -I../../CAMD/Include -I../Include -I$(METIS_PATH)/Lib
- 
- all: mread sdmult ldlsolve resymbol symbfact2 chol2 lchol \
- 	ldlchol cholmod2 ldlupdate metis bisect nesdis etree2 sparse2 analyze \
 diff -ur CHOLMOD/Tcov/Makefile CHOLMOD-uf/Tcov/Makefile
 --- CHOLMOD/Tcov/Makefile	2007-05-05 19:12:46.000000000 +0200
 +++ CHOLMOD-uf/Tcov/Makefile	2007-12-02 17:11:45.000000000 +0100
@@ -136,8 +119,8 @@
  # If you compile CHOLMOD with -DNPARTITION, then you do not need METIS,
  # CCOLAMD, or the Partition module.
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  include Make.inc
  
  # Tcov requires gcc
@@ -145,7 +128,7 @@
  
  I = -I../../AMD/Include -I../../COLAMD/Include \
  	-I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
--	-I../Include -I../../UFconfig
+-	-I../Include -I../../SuiteSparse_config
 +	-I../Include
  
  default: cm cl z_demo l_demo cmread clread

================================================================
Index: packages/CHOLMOD/CHOLMOD.spec
diff -u packages/CHOLMOD/CHOLMOD.spec:1.13 packages/CHOLMOD/CHOLMOD.spec:1.14
--- packages/CHOLMOD/CHOLMOD.spec:1.13	Sun Jun 10 21:04:57 2012
+++ packages/CHOLMOD/CHOLMOD.spec	Wed Jun 27 18:53:33 2012
@@ -6,22 +6,22 @@
 Summary:	CHOLMOD: sparse supernodal Cholesky factorization and update/downdate
 Summary(pl.UTF-8):	CHOLMOD - rzadki wielowęzłowy rozkład Cholesky'ego z poprawianiem
 Name:		CHOLMOD
-Version:	1.7.4
+Version:	2.0.0
 Release:	1
 License:	GPL v2+ (some parts LGPL v2.1+)
 Group:		Libraries
 Source0:	http://www.cise.ufl.edu/research/sparse/cholmod/%{name}-%{version}.tar.gz
-# Source0-md5:	c2088078a86ca1a88e64037f80ae6540
+# Source0-md5:	3804ebf46feef5fece877ad52ea84b2b
 Patch0:		%{name}-ufconfig.patch
 Patch1:		%{name}-shared.patch
 # http://www.cise.ufl.edu/research/sparse/cholmod/metis.patch (for METIS 5)
 Patch2:		%{name}-metis.patch
 URL:		http://www.cise.ufl.edu/research/sparse/cholmod/
-BuildRequires:	AMD-devel >= 2.2.3
-BuildRequires:	CAMD-devel >= 2.2.3
-BuildRequires:	CCOLAMD-devel >= 2.7.3
-BuildRequires:	COLAMD-devel >= 2.7.4
-BuildRequires:	UFconfig >= 3.7.0
+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:	SuiteSparse_config-devel >= 4.0.0
 BuildRequires:	blas-devel
 BuildRequires:	gcc-fortran
 BuildRequires:	lapack-devel
@@ -29,6 +29,11 @@
 %if %{with metis}
 BuildRequires:	metis-devel >= 5
 %endif
+Requires:	AMD >= 2.3.0
+Requires:	CAMD >= 2.3.0
+Requires:	CCOLAMD >= 2.8.0
+Requires:	COLAMD >= 2.8.0
+Requires:	SuiteSparse_config-libs >= 4.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,7 +49,11 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki CHOLMOD
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	UFconfig >= 3.7.0
+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:	SuiteSparse_config-devel >= 4.0.0
 
 %description devel
 Header files for CHOLMOD library.
@@ -68,7 +77,7 @@
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p2
+%patch2 -p1
 
 %build
 %{__make} \
@@ -117,6 +126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2012/06/27 16:53:33  qboosh
+- updated to 2.0.0; switched to SuiteSparse_config
+- updated ufconfig,shared,metis patches
+
 Revision 1.13  2012/06/10 19:04:57  blekot
 - BR: gcc-fortran
 - build without metis requires: CAMD-devel and CCOLAMD-devel (.la files from this packages)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/CHOLMOD/CHOLMOD-metis.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/CHOLMOD/CHOLMOD-shared.patch?r1=1.7&r2=1.8
    http://cvs.pld-linux.org/packages/CHOLMOD/CHOLMOD-ufconfig.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/CHOLMOD/CHOLMOD.spec?r1=1.13&r2=1.14

More information about the pld-cvs-commit mailing list