- updated to 1.7.4

- updated shared patch
- added metis patch to use metis 5.0.x

Changed files:
    CHOLMOD-metis.patch -> 1.1
    CHOLMOD-shared.patch -> 1.7
    CHOLMOD-ufconfig.patch -> 1.2
    CHOLMOD.spec -> 1.12

diff --git a/CHOLMOD-metis.patch b/CHOLMOD-metis.patch
new file mode 100644 (file)
index 0000000..1b354d6
--- /dev/null
+++ b/CHOLMOD-metis.patch
@@ -0,0 +1,251 @@
+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 @@
+ #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,
+     cholmod_common *Common)
+ {
+     UF_long i, j, p, nz ;
+@@ -162,7 +162,7 @@
+     s = GUESS ((double) nz, (double) n) ;
+     s *= Common->metis_memory ;
+ 
+-    if (s * sizeof (idxtype) >= ((double) Size_max))
++    if (s * sizeof (idx_t) >= ((double) Size_max))
+     {
+       /* don't even attempt to malloc such a large block */
+       return (FALSE) ;
+@@ -173,7 +173,7 @@
+     metis_guard *= Common->metis_memory ;
+ 
+     /* attempt to malloc the block */
+-    p = CHOLMOD(malloc) (metis_guard, sizeof (idxtype), Common) ;
++    p = CHOLMOD(malloc) (metis_guard, sizeof (idx_t), Common) ;
+     if (p == NULL)
+     {
+       /* failure - return out-of-memory condition */
+@@ -181,7 +181,7 @@
+     }
+ 
+     /* success - free the block */
+-    CHOLMOD(free) (metis_guard, sizeof (idxtype), p, Common) ;
++    CHOLMOD(free) (metis_guard, sizeof (idx_t), p, Common) ;
+     return (TRUE) ;
+ }
+ 
+@@ -211,7 +211,7 @@
+ )
+ {
+     Int *Ap, *Ai ;
+-    idxtype *Mp, *Mi, *Mnw, *Mew, *Mpart ;
++    idx_t *Mp, *Mi, *Mnw, *Mew, *Mpart ;
+     Int n, nleft, nright, j, p, csep, total_weight, lightest, nz ;
+     int Opt [8], nn, csp ;
+     size_t n1 ;
+@@ -260,7 +260,7 @@
+     /* ---------------------------------------------------------------------- */
+ 
+ #ifdef LONG
+-    if (sizeof (Int) > sizeof (idxtype) && MAX (n,nz) > INT_MAX / sizeof (int))
++    if (sizeof (Int) > sizeof (idx_t) && MAX (n,nz) > INT_MAX / sizeof (int))
+     {
+       /* CHOLMOD's matrix is too large for METIS */
+       return (EMPTY) ;
+@@ -283,34 +283,34 @@
+     DEBUG (for (j = 0 ; j < n ; j++) ASSERT (Anw [j] > 0)) ;
+ 
+     /* ---------------------------------------------------------------------- */
+-    /* copy Int to METIS idxtype, if necessary */
++    /* copy Int to METIS idx_t, if necessary */
+     /* ---------------------------------------------------------------------- */
+ 
+     DEBUG (for (j = 0 ; j < nz ; j++) ASSERT (Aew [j] > 0)) ;
+-    if (sizeof (Int) == sizeof (idxtype))
++    if (sizeof (Int) == sizeof (idx_t))
+     {
+       /* this is the typical case */
+-      Mi    = (idxtype *) Ai ;
+-      Mew   = (idxtype *) Aew ;
+-      Mp    = (idxtype *) Ap ;
+-      Mnw   = (idxtype *) Anw ;
+-      Mpart = (idxtype *) Partition ;
++      Mi    = (idx_t *) Ai ;
++      Mew   = (idx_t *) Aew ;
++      Mp    = (idx_t *) Ap ;
++      Mnw   = (idx_t *) Anw ;
++      Mpart = (idx_t *) Partition ;
+     }
+     else
+     {
+-      /* idxtype and Int differ; copy the graph into the METIS idxtype */
+-      Mi    = CHOLMOD(malloc) (nz, sizeof (idxtype), Common) ;
+-      Mew   = CHOLMOD(malloc) (nz, sizeof (idxtype), Common) ;
+-      Mp    = CHOLMOD(malloc) (n1, sizeof (idxtype), Common) ;
+-      Mnw   = CHOLMOD(malloc) (n,  sizeof (idxtype), Common) ;
+-      Mpart = CHOLMOD(malloc) (n,  sizeof (idxtype), Common) ;
++      /* idx_t and Int differ; copy the graph into the METIS idx_t */
++      Mi    = CHOLMOD(malloc) (nz, sizeof (idx_t), Common) ;
++      Mew   = CHOLMOD(malloc) (nz, sizeof (idx_t), Common) ;
++      Mp    = CHOLMOD(malloc) (n1, sizeof (idx_t), Common) ;
++      Mnw   = CHOLMOD(malloc) (n,  sizeof (idx_t), Common) ;
++      Mpart = CHOLMOD(malloc) (n,  sizeof (idx_t), Common) ;
+       if (Common->status < CHOLMOD_OK)
+       {
+-          CHOLMOD(free) (nz, sizeof (idxtype), Mi,    Common) ;
+-          CHOLMOD(free) (nz, sizeof (idxtype), Mew,   Common) ;
+-          CHOLMOD(free) (n1, sizeof (idxtype), Mp,    Common) ;
+-          CHOLMOD(free) (n,  sizeof (idxtype), Mnw,   Common) ;
+-          CHOLMOD(free) (n,  sizeof (idxtype), Mpart, Common) ;
++          CHOLMOD(free) (nz, sizeof (idx_t), Mi,    Common) ;
++          CHOLMOD(free) (nz, sizeof (idx_t), Mew,   Common) ;
++          CHOLMOD(free) (n1, sizeof (idx_t), Mp,    Common) ;
++          CHOLMOD(free) (n,  sizeof (idx_t), Mnw,   Common) ;
++          CHOLMOD(free) (n,  sizeof (idx_t), Mpart, Common) ;
+           return (EMPTY) ;
+       }
+       for (p = 0 ; p < nz ; p++)
+@@ -338,13 +338,13 @@
+     if (!metis_memory_ok (n, nz, Common))
+     {
+       /* METIS might ask for too much memory and thus terminate the program */
+-      if (sizeof (Int) != sizeof (idxtype))
++      if (sizeof (Int) != sizeof (idx_t))
+       {
+-          CHOLMOD(free) (nz, sizeof (idxtype), Mi,    Common) ;
+-          CHOLMOD(free) (nz, sizeof (idxtype), Mew,   Common) ;
+-          CHOLMOD(free) (n1, sizeof (idxtype), Mp,    Common) ;
+-          CHOLMOD(free) (n,  sizeof (idxtype), Mnw,   Common) ;
+-          CHOLMOD(free) (n,  sizeof (idxtype), Mpart, Common) ;
++          CHOLMOD(free) (nz, sizeof (idx_t), Mi,    Common) ;
++          CHOLMOD(free) (nz, sizeof (idx_t), Mew,   Common) ;
++          CHOLMOD(free) (n1, sizeof (idx_t), Mp,    Common) ;
++          CHOLMOD(free) (n,  sizeof (idx_t), Mnw,   Common) ;
++          CHOLMOD(free) (n,  sizeof (idx_t), Mpart, Common) ;
+       }
+       return (EMPTY) ;
+     }
+@@ -370,27 +370,27 @@
+ #endif
+ 
+     nn = n ;
+-    METIS_NodeComputeSeparator (&nn, Mp, Mi, Mnw, Mew, Opt, &csp, Mpart) ;
++    METIS_ComputeVertexSeparator (&nn, Mp, Mi, Mnw, Opt, &csp, Mpart) ;
+     n = nn ;
+     csep = csp ;
+ 
+     PRINT1 (("METIS csep "ID"\n", csep)) ;
+ 
+     /* ---------------------------------------------------------------------- */
+-    /* copy the results back from idxtype, if required */
++    /* copy the results back from idx_t, if required */
+     /* ---------------------------------------------------------------------- */
+ 
+-    if (sizeof (Int) != sizeof (idxtype))
++    if (sizeof (Int) != sizeof (idx_t))
+     {
+       for (j = 0 ; j < n ; j++)
+       {
+           Partition [j] = Mpart [j] ;
+       }
+-      CHOLMOD(free) (nz, sizeof (idxtype), Mi,    Common) ;
+-      CHOLMOD(free) (nz, sizeof (idxtype), Mew,   Common) ;
+-      CHOLMOD(free) (n1, sizeof (idxtype), Mp,    Common) ;
+-      CHOLMOD(free) (n,  sizeof (idxtype), Mnw,   Common) ;
+-      CHOLMOD(free) (n,  sizeof (idxtype), Mpart, Common) ;
++      CHOLMOD(free) (nz, sizeof (idx_t), Mi,    Common) ;
++      CHOLMOD(free) (nz, sizeof (idx_t), Mew,   Common) ;
++      CHOLMOD(free) (n1, sizeof (idx_t), Mp,    Common) ;
++      CHOLMOD(free) (n,  sizeof (idx_t), Mnw,   Common) ;
++      CHOLMOD(free) (n,  sizeof (idx_t), Mpart, Common) ;
+     }
+ 
+     /* ---------------------------------------------------------------------- */
+@@ -508,7 +508,7 @@
+ {
+     double d ;
+     Int *Iperm, *Iwork, *Bp, *Bi ;
+-    idxtype *Mp, *Mi, *Mperm, *Miperm ;
++    idx_t *Mp, *Mi, *Mperm, *Miperm ;
+     cholmod_sparse *B ;
+     Int i, j, n, nz, p, identity, uncol ;
+     int Opt [8], nn, zero = 0 ;
+@@ -601,7 +601,7 @@
+     /* ---------------------------------------------------------------------- */
+ 
+ #ifdef LONG
+-    if (sizeof (Int) > sizeof (idxtype) && MAX (n,nz) > INT_MAX / sizeof (int))
++    if (sizeof (Int) > sizeof (idx_t) && MAX (n,nz) > INT_MAX / sizeof (int))
+     {
+       /* CHOLMOD's matrix is too large for METIS */
+       CHOLMOD(free_sparse) (&B, Common) ;
+@@ -630,29 +630,29 @@
+     /* allocate the METIS input arrays, if needed */
+     /* ---------------------------------------------------------------------- */
+ 
+-    if (sizeof (Int) == sizeof (idxtype))
++    if (sizeof (Int) == sizeof (idx_t))
+     {
+       /* This is the typical case. */
+-      Miperm = (idxtype *) Iperm ;
+-      Mperm  = (idxtype *) Perm ;
+-      Mp     = (idxtype *) Bp ;
+-      Mi     = (idxtype *) Bi ;
++      Miperm = (idx_t *) Iperm ;
++      Mperm  = (idx_t *) Perm ;
++      Mp     = (idx_t *) Bp ;
++      Mi     = (idx_t *) Bi ;
+     }
+     else
+     {
+-      /* allocate graph for METIS only if Int and idxtype differ */
+-      Miperm = CHOLMOD(malloc) (n,  sizeof (idxtype), Common) ;
+-      Mperm  = CHOLMOD(malloc) (n,  sizeof (idxtype), Common) ;
+-      Mp     = CHOLMOD(malloc) (n1, sizeof (idxtype), Common) ;
+-      Mi     = CHOLMOD(malloc) (nz, sizeof (idxtype), Common) ;
++      /* allocate graph for METIS only if Int and idx_t differ */
++      Miperm = CHOLMOD(malloc) (n,  sizeof (idx_t), Common) ;
++      Mperm  = CHOLMOD(malloc) (n,  sizeof (idx_t), Common) ;
++      Mp     = CHOLMOD(malloc) (n1, sizeof (idx_t), Common) ;
++      Mi     = CHOLMOD(malloc) (nz, sizeof (idx_t), Common) ;
+       if (Common->status < CHOLMOD_OK)
+       {
+           /* out of memory */
+           CHOLMOD(free_sparse) (&B, Common) ;
+-          CHOLMOD(free) (n,  sizeof (idxtype), Miperm, Common) ;
+-          CHOLMOD(free) (n,  sizeof (idxtype), Mperm, Common) ;
+-          CHOLMOD(free) (n1, sizeof (idxtype), Mp, Common) ;
+-          CHOLMOD(free) (nz, sizeof (idxtype), Mi, Common) ;
++          CHOLMOD(free) (n,  sizeof (idx_t), Miperm, Common) ;
++          CHOLMOD(free) (n,  sizeof (idx_t), Mperm, Common) ;
++          CHOLMOD(free) (n1, sizeof (idx_t), Mp, Common) ;
++          CHOLMOD(free) (nz, sizeof (idx_t), Mi, Common) ;
+           return (FALSE) ;
+       }
+       for (j = 0 ; j <= n ; j++)
+@@ -741,16 +741,16 @@
+     /* free the METIS input arrays */
+     /* ---------------------------------------------------------------------- */
+ 
+-    if (sizeof (Int) != sizeof (idxtype))
++    if (sizeof (Int) != sizeof (idx_t))
+     {
+       for (i = 0 ; i < n ; i++)
+       {
+           Perm [i] = (Int) (Mperm [i]) ;
+       }
+-      CHOLMOD(free) (n,   sizeof (idxtype), Miperm, Common) ;
+-      CHOLMOD(free) (n,   sizeof (idxtype), Mperm, Common) ;
+-      CHOLMOD(free) (n+1, sizeof (idxtype), Mp, Common) ;
+-      CHOLMOD(free) (nz,  sizeof (idxtype), Mi, Common) ;
++      CHOLMOD(free) (n,   sizeof (idx_t), Miperm, Common) ;
++      CHOLMOD(free) (n,   sizeof (idx_t), Mperm, Common) ;
++      CHOLMOD(free) (n+1, sizeof (idx_t), Mp, Common) ;
++      CHOLMOD(free) (nz,  sizeof (idx_t), Mi, Common) ;
+     }
+ 
+     CHOLMOD(free_sparse) (&B, Common) ;
+Only in .: metis.patch

diff --git a/CHOLMOD-shared.patch b/CHOLMOD-shared.patch
index cbbf56c04263e04b721ae94d0f78cc1034a4f0f3..103f165a2365c40d9d6ce25b71b0757b585adf35 100644 (file)
--- a/CHOLMOD-shared.patch
+++ b/CHOLMOD-shared.patch
@@ -1,63 +1,77 @@
-diff -ur CHOLMOD/Demo/Makefile CHOLMOD.shared/Demo/Makefile
---- CHOLMOD/Demo/Makefile      2007-12-07 12:29:51.000000000 +0100
-+++ CHOLMOD.shared/Demo/Makefile       2007-12-07 12:20:59.000000000 +0100
-@@ -11,12 +11,8 @@
- 
- #-------------------------------------------------------------------------------
- # With METIS, CCOLAMD, CAMD, and the Partition Module:
--LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a \
--      ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a \
--      $(METIS) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
--# Use this instead, if you compile with -DNPARTITION:
--# LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/libcolamd.a \
--      $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
-+LIB2 = ../Lib/libcholmod.la -lamd -lcolamd -lccolamd -lcamd \
-+      $(METIS) $(LAPACK) $(BLAS) $(LIB)
+--- CHOLMOD/Demo/Makefile.orig 2012-01-01 17:10:50.000000000 +0100
++++ CHOLMOD/Demo/Makefile      2012-01-01 17:13:20.706633471 +0100
+@@ -15,9 +15,8 @@
+ CONFIG =
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+     # check if METIS is available
+-    ifeq (../../metis-4.0, $(wildcard ../../metis-4.0))
+-        LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
+-            ../../CAMD/Lib/libcamd.a
++    ifeq ($(WITH_METIS), 1)
++        LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
+     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 @@
+ endif
  #-------------------------------------------------------------------------------
  
- C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
-@@ -48,32 +44,20 @@
-       - $(RM) $(CLEAN)
+-LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/Lib/libcolamd.a \
++LIB2 = -lcholmod -lamd -lcolamd \
+       $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
  
  #-------------------------------------------------------------------------------
--# See below if you compile with -DNPARTITION
+@@ -63,27 +62,19 @@
+ #-------------------------------------------------------------------------------
+ # See below if you compile with -DNPARTITION
  library:
 -      ( cd ../../UFconfig/xerbla ; $(MAKE) )
        ( cd ../Lib ; $(MAKE) )
 -      ( cd ../../AMD ; $(MAKE) library )
--      ( cd ../../CAMD ; $(MAKE) library )
 -      ( cd ../../COLAMD ; $(MAKE) library )
+-ifneq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+-else
 -      ( cd ../../CCOLAMD ; $(MAKE) library )
--# use this rule instead, if you compile with -DNPARTITION:
--# library:
--#     ( cd ../../UFconfig/xerbla ; $(MAKE) )
--#     ( cd ../Lib ; $(MAKE) )
--#     ( cd ../../AMD ; $(MAKE) library )
--#     ( cd ../../COLAMD ; $(MAKE) )
+-      ( cd ../../CAMD ; $(MAKE) library )
+-endif
  #-------------------------------------------------------------------------------
  
  I = -I../Include
  
  cholmod_demo: library cholmod_demo.c cholmod_demo.h
 -      $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_demo cholmod_demo.c $(LIB2)
++      libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
  
  cholmod_simple: library cholmod_simple.c
 -      $(C) -o cholmod_simple $(I) cholmod_simple.c $(LIB2)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_simple cholmod_simple.c $(LIB2)
++      libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o cholmod_simple $(I) cholmod_simple.c $(LIB2)
  
  cholmod_l_demo: library cholmod_l_demo.c cholmod_demo.h
 -      $(C) -o cholmod_l_demo $(I) cholmod_l_demo.c $(LIB2)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) $(CHOLMOD_CONFIG) -I../Include -o cholmod_l_demo cholmod_l_demo.c $(LIB2)
++      libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o cholmod_l_demo $(I) cholmod_l_demo.c $(LIB2)
  
  readhb: readhb.f
        $(F77) $(FFLAGS) -o readhb readhb.f
-diff -ur CHOLMOD/Lib/Makefile CHOLMOD.shared/Lib/Makefile
---- CHOLMOD/Lib/Makefile       2007-12-07 12:29:51.000000000 +0100
-+++ CHOLMOD.shared/Lib/Makefile        2007-12-07 12:29:12.000000000 +0100
-@@ -10,14 +10,14 @@
- 
- C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
+--- CHOLMOD/Lib/Makefile.orig  2012-01-01 17:10:50.673295114 +0100
++++ CHOLMOD/Lib/Makefile       2012-01-01 17:16:30.863306505 +0100
+@@ -11,12 +11,14 @@
+ #-------------------------------------------------------------------------------
+ # the optional Partition module requires METIS, CAMD, and CCOLAMD
+ I_WITH_PARTITION =
++LIB_WITH_PARTITION =
+ CONFIG =
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+     # METIS is check if METIS is available
+     ifeq ($(WITH_METIS), 1)
+         I_WITH_PARTITION = -I/usr/include/metis \
+             -I/usr/include/ccolamd -I/usr/include/camd
++      LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
+     else
+         # METIS is not available, but CHOLMOD_CONFIG does not specify
+         # -DNPARTITION.  Add it here so we can still compile CHOLMOD.
+@@ -31,14 +33,14 @@
+ 
+ C = $(CC) $(CF) $(CHOLMOD_CONFIG) $(CONFIG)
  
 -all: libcholmod.a
 +all: libcholmod.la
@@ -73,16 +87,16 @@ diff -ur CHOLMOD/Lib/Makefile CHOLMOD.shared/Lib/Makefile
  
  clean:
        - $(RM) $(CLEAN)
-@@ -109,39 +109,42 @@
+@@ -130,9 +132,13 @@
  # to compile just the double/int version, use OBJ = $(DI)
  OBJ = $(DI) $(DL)
  
 -libcholmod.a: $(OBJ)
--      $(AR) libcholmod.a $(OBJ)
--      $(RANLIB) libcholmod.a
+-      $(ARCHIVE)  libcholmod.a $(OBJ)
+-      - $(RANLIB) libcholmod.a
 +libcholmod.la: $(OBJ)
 +      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcholmod.la -rpath $(libdir) $(OBJ:.o=.lo) -lm \
-+              -lamd -lcolamd -lccolamd -lcamd $(METIS) $(LAPACK) $(BLAS)
++              -lamd -lcolamd $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS)
 +
 +install: libcholmod.la
 +      install -d $(DESTDIR)$(libdir)
@@ -90,267 +104,260 @@ diff -ur CHOLMOD/Lib/Makefile CHOLMOD.shared/Lib/Makefile
  
  $(OBJ): $(INC)
  
--I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
--      -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
--      -I../Include
-+I = -I../Include -I/usr/include/amd -I/usr/include/camd -I/usr/include/colamd \
-+      -I/usr/include/ccolamd -I$(METIS_PATH)
- 
- #-------------------------------------------------------------------------------
- # Check Module:
+@@ -141,24 +147,24 @@
  #-------------------------------------------------------------------------------
  
  cholmod_check.o: ../Check/cholmod_check.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
  
  cholmod_read.o: ../Check/cholmod_read.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
  
  cholmod_write.o: ../Check/cholmod_write.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) -c $(I) $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_check.o: ../Check/cholmod_check.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
  
  cholmod_l_read.o: ../Check/cholmod_read.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
  
  cholmod_l_write.o: ../Check/cholmod_write.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
  
  
  #-------------------------------------------------------------------------------
-@@ -149,92 +150,92 @@
+@@ -166,92 +172,92 @@
  #-------------------------------------------------------------------------------
  
  cholmod_common.o: ../Core/cholmod_common.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_dense.o: ../Core/cholmod_dense.c ../Core/t_cholmod_dense.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_factor.o: ../Core/cholmod_factor.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_change_factor.o: ../Core/cholmod_change_factor.c \
        ../Core/t_cholmod_change_factor.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_memory.o: ../Core/cholmod_memory.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_sparse.o: ../Core/cholmod_sparse.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_complex.o: ../Core/cholmod_complex.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_transpose.o: ../Core/cholmod_transpose.c ../Core/t_cholmod_transpose.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_band.o: ../Core/cholmod_band.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_copy.o: ../Core/cholmod_copy.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_triplet.o: ../Core/cholmod_triplet.c ../Core/t_cholmod_triplet.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_error.o: ../Core/cholmod_error.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_aat.o: ../Core/cholmod_aat.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_add.o: ../Core/cholmod_add.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_common.o: ../Core/cholmod_common.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_dense.o: ../Core/cholmod_dense.c ../Core/t_cholmod_dense.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_factor.o: ../Core/cholmod_factor.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_change_factor.o: ../Core/cholmod_change_factor.c \
        ../Core/t_cholmod_change_factor.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_memory.o: ../Core/cholmod_memory.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_sparse.o: ../Core/cholmod_sparse.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_complex.o: ../Core/cholmod_complex.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_transpose.o: ../Core/cholmod_transpose.c ../Core/t_cholmod_transpose.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_band.o: ../Core/cholmod_band.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_copy.o: ../Core/cholmod_copy.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_triplet.o: ../Core/cholmod_triplet.c ../Core/t_cholmod_triplet.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_error.o: ../Core/cholmod_error.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_aat.o: ../Core/cholmod_aat.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_add.o: ../Core/cholmod_add.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  
  #-------------------------------------------------------------------------------
-@@ -242,116 +243,116 @@
+@@ -259,116 +265,116 @@
  #-------------------------------------------------------------------------------
  
  cholmod_amd.o: ../Cholesky/cholmod_amd.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_analyze.o: ../Cholesky/cholmod_analyze.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_colamd.o: ../Cholesky/cholmod_colamd.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_etree.o: ../Cholesky/cholmod_etree.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_factorize.o: ../Cholesky/cholmod_factorize.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_postorder.o: ../Cholesky/cholmod_postorder.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_rcond.o: ../Cholesky/cholmod_rcond.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_resymbol.o: ../Cholesky/cholmod_resymbol.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_rowcolcounts.o: ../Cholesky/cholmod_rowcolcounts.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_solve.o: ../Cholesky/cholmod_solve.c ../Cholesky/t_cholmod_lsolve.c \
        ../Cholesky/t_cholmod_ltsolve.c ../Cholesky/t_cholmod_solve.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_spsolve.o: ../Cholesky/cholmod_spsolve.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_rowfac.o: ../Cholesky/cholmod_rowfac.c ../Cholesky/t_cholmod_rowfac.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_amd.o: ../Cholesky/cholmod_amd.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_analyze.o: ../Cholesky/cholmod_analyze.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_colamd.o: ../Cholesky/cholmod_colamd.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_etree.o: ../Cholesky/cholmod_etree.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_factorize.o: ../Cholesky/cholmod_factorize.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_postorder.o: ../Cholesky/cholmod_postorder.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_rcond.o: ../Cholesky/cholmod_rcond.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_resymbol.o: ../Cholesky/cholmod_resymbol.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_rowcolcounts.o: ../Cholesky/cholmod_rowcolcounts.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_solve.o: ../Cholesky/cholmod_solve.c ../Cholesky/t_cholmod_lsolve.c \
        ../Cholesky/t_cholmod_ltsolve.c ../Cholesky/t_cholmod_solve.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_spsolve.o: ../Cholesky/cholmod_spsolve.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_rowfac.o: ../Cholesky/cholmod_rowfac.c ../Cholesky/t_cholmod_rowfac.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  #-------------------------------------------------------------------------------
  # Partition Module:
@@ -358,126 +365,126 @@ diff -ur CHOLMOD/Lib/Makefile CHOLMOD.shared/Lib/Makefile
  
  cholmod_ccolamd.o: ../Partition/cholmod_ccolamd.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_csymamd.o: ../Partition/cholmod_csymamd.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_camd.o: ../Partition/cholmod_camd.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_metis.o: ../Partition/cholmod_metis.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_nesdis.o: ../Partition/cholmod_nesdis.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_ccolamd.o: ../Partition/cholmod_ccolamd.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_csymamd.o: ../Partition/cholmod_csymamd.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_camd.o: ../Partition/cholmod_camd.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_metis.o: ../Partition/cholmod_metis.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_nesdis.o: ../Partition/cholmod_nesdis.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  
  #-------------------------------------------------------------------------------
-@@ -359,88 +360,88 @@
+@@ -376,88 +382,88 @@
  #-------------------------------------------------------------------------------
  
  cholmod_horzcat.o: ../MatrixOps/cholmod_horzcat.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_norm.o: ../MatrixOps/cholmod_norm.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_scale.o: ../MatrixOps/cholmod_scale.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_drop.o: ../MatrixOps/cholmod_drop.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_sdmult.o: ../MatrixOps/cholmod_sdmult.c \
        ../MatrixOps/t_cholmod_sdmult.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_ssmult.o: ../MatrixOps/cholmod_ssmult.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_submatrix.o: ../MatrixOps/cholmod_submatrix.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_vertcat.o: ../MatrixOps/cholmod_vertcat.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_symmetry.o: ../MatrixOps/cholmod_symmetry.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_horzcat.o: ../MatrixOps/cholmod_horzcat.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_norm.o: ../MatrixOps/cholmod_norm.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_scale.o: ../MatrixOps/cholmod_scale.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_drop.o: ../MatrixOps/cholmod_drop.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_sdmult.o: ../MatrixOps/cholmod_sdmult.c \
        ../MatrixOps/t_cholmod_sdmult.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_ssmult.o: ../MatrixOps/cholmod_ssmult.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_submatrix.o: ../MatrixOps/cholmod_submatrix.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_vertcat.o: ../MatrixOps/cholmod_vertcat.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_symmetry.o: ../MatrixOps/cholmod_symmetry.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  #-------------------------------------------------------------------------------
  # Modify Module:
@@ -485,62 +492,62 @@ diff -ur CHOLMOD/Lib/Makefile CHOLMOD.shared/Lib/Makefile
  
  cholmod_rowadd.o: ../Modify/cholmod_rowadd.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_rowdel.o: ../Modify/cholmod_rowdel.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_updown.o: ../Modify/cholmod_updown.c \
        ../Modify/t_cholmod_updown.c ../Modify/t_cholmod_updown_numkr.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_rowadd.o: ../Modify/cholmod_rowadd.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_rowdel.o: ../Modify/cholmod_rowdel.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_updown.o: ../Modify/cholmod_updown.c \
        ../Modify/t_cholmod_updown.c ../Modify/t_cholmod_updown_numkr.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  
  #-------------------------------------------------------------------------------
-@@ -449,24 +450,24 @@
+@@ -466,24 +472,24 @@
  
  cholmod_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \
        ../Supernodal/t_cholmod_super_numeric.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  cholmod_super_solve.o: ../Supernodal/cholmod_super_solve.c \
        ../Supernodal/t_cholmod_super_solve.c
 -      $(C) -c $(I) $<
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $<
++      libtool --tag=CC --mode=compile $(C) $(I) -c $<
  
  #-------------------------------------------------------------------------------
  
  cholmod_l_super_numeric.o: ../Supernodal/cholmod_super_numeric.c \
        ../Supernodal/t_cholmod_super_numeric.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_super_symbolic.o: ../Supernodal/cholmod_super_symbolic.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
  
  cholmod_l_super_solve.o: ../Supernodal/cholmod_super_solve.c \
        ../Supernodal/t_cholmod_super_solve.c
 -      $(C) -DDLONG -c $(I) $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CHOLMOD_CONFIG) $(I) -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@

diff --git a/CHOLMOD-ufconfig.patch b/CHOLMOD-ufconfig.patch
index 2349911877967f4e54e2c31daf0fc65dc47b8d6e..db3e56fbe7a9e1f99c9f49410c67d231d2d3f48a 100644 (file)
--- a/CHOLMOD-ufconfig.patch
+++ b/CHOLMOD-ufconfig.patch
@@ -54,9 +54,8 @@ diff -ur CHOLMOD/Include/cholmod_internal.h CHOLMOD-uf/Include/cholmod_internal.
  
  /* -------------------------------------------------------------------------- */
  /* Size_max: the largest value of size_t */
-diff -ur CHOLMOD/Lib/Makefile CHOLMOD-uf/Lib/Makefile
---- CHOLMOD/Lib/Makefile       2007-05-05 16:36:56.000000000 +0200
-+++ CHOLMOD-uf/Lib/Makefile    2007-12-02 17:11:09.000000000 +0100
+--- CHOLMOD/Lib/Makefile.orig  2011-12-14 18:17:26.000000000 +0100
++++ CHOLMOD/Lib/Makefile       2012-01-01 17:07:06.246620933 +0100
 @@ -6,7 +6,7 @@
  
  ccode: all
@@ -64,17 +63,32 @@ diff -ur CHOLMOD/Lib/Makefile CHOLMOD-uf/Lib/Makefile
 -include ../../UFconfig/UFconfig.mk
 +include /usr/share/misc/UFconfig.mk
  
- C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
- 
-@@ -117,7 +117,7 @@
- 
- I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
-       -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
--      -I../Include -I../../UFconfig
-+      -I../Include
+ #-------------------------------------------------------------------------------
+ # the optional Partition module requires METIS, CAMD, and CCOLAMD
+@@ -14,9 +14,9 @@
+ CONFIG =
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+     # METIS is check if METIS is available
+-    ifeq (../../metis-4.0, $(wildcard ../../metis-4.0))
+-        I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
+-            -I../../CCOLAMD/Include -I../../CAMD/Include
++    ifeq ($(WITH_METIS), 1)
++        I_WITH_PARTITION = -I/usr/include/metis \
++            -I/usr/include/ccolamd -I/usr/include/camd
+     else
+         # METIS is not available, but CHOLMOD_CONFIG does not specify
+         # -DNPARTITION.  Add it here so we can still compile CHOLMOD.
+@@ -24,8 +24,8 @@
+     endif
+ endif
+ 
+-I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
+-      $(I_WITH_PARTITION) -I../Include -I../../UFconfig
++I = -I/usr/include/amd -I/usr/include/colamd \
++      $(I_WITH_PARTITION) -I../Include
  
  #-------------------------------------------------------------------------------
- # Check Module:
+ 
 diff -ur CHOLMOD/Makefile CHOLMOD-uf/Makefile
 --- CHOLMOD/Makefile   2006-11-30 17:40:08.000000000 +0100
 +++ CHOLMOD-uf/Makefile        2007-12-02 17:12:17.000000000 +0100

diff --git a/CHOLMOD.spec b/CHOLMOD.spec
index 35521752d4e9d67ed0cf7d1490e7d9698c83a1c2..16af420767c5559a04a2c961d312fc8961bbaed0 100644 (file)
--- a/CHOLMOD.spec
+++ b/CHOLMOD.spec
@@ -1,28 +1,32 @@
 #
 # Conditional build:
-%bcond_with    metis           # build with metis lib
+%bcond_with    metis           # build with partition support (using metis lib)
 #
 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.3
+Version:       1.7.4
 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: e3bcfeefe40a2f3ef712e1bd3ec36781
+# Source0-md5: c2088078a86ca1a88e64037f80ae6540
 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
-BuildRequires: CAMD-devel
-BuildRequires: CCOLAMD-devel
-BuildRequires: COLAMD-devel
-BuildRequires: UFconfig
+BuildRequires: AMD-devel >= 2.2.3
+BuildRequires: COLAMD-devel >= 2.7.4
+BuildRequires: UFconfig >= 3.7.0
 BuildRequires: blas-devel
 BuildRequires: lapack-devel
 BuildRequires: libtool >= 2:1.5
-%{?with_metis:BuildRequires:   metis-devel}
+%if %{with metis}
+BuildRequires: CAMD-devel >= 2.2.3
+BuildRequires: CCOLAMD-devel >= 2.7.4
+BuildRequires: metis-devel >= 5
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +42,7 @@ Summary:      Header files for CHOLMOD library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki CHOLMOD
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      UFconfig
+Requires:      UFconfig >= 3.7.0
 
 %description devel
 Header files for CHOLMOD library.
@@ -62,16 +66,13 @@ Statyczna biblioteka CHOLMOD.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2
 
 %build
 %{__make} \
        CC="%{__cc}" \
-%if %{with metis}
+       %{?with_metis:WITH_METIS=1} \
        CFLAGS="%{rpmcflags}" \
-%else
-       CFLAGS="%{rpmcflags} -DNPARTITION" \
-       METIS= \
-%endif
        LDFLAGS="%{rpmldflags}" \
        libdir=%{_libdir}