CHOLMOD-ufconfig.patch

   1 diff -ur CHOLMOD/Demo/Makefile CHOLMOD-uf/Demo/Makefile
   2 --- CHOLMOD/Demo/Makefile       2007-05-05 16:37:46.000000000 +0200
   3 +++ CHOLMOD-uf/Demo/Makefile    2007-12-02 17:10:39.000000000 +0100
   4 @@ -7,7 +7,7 @@
   5
   6  default: all
   7
   8 -include ../../UFconfig/UFconfig.mk
   9 +include /usr/share/misc/UFconfig.mk
  10
  11  #-------------------------------------------------------------------------------
  12  # With METIS, CCOLAMD, CAMD, and the Partition Module:
  13 @@ -64,7 +64,7 @@
  14  #      ( cd ../../COLAMD ; $(MAKE) )
  15  #-------------------------------------------------------------------------------
  16
  17 -I = -I../Include -I../../UFconfig
  18 +I = -I../Include
  19
  20  cholmod_demo: library cholmod_demo.c cholmod_demo.h
  21         $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
  22 diff -ur CHOLMOD/Doc/Makefile CHOLMOD-uf/Doc/Makefile
  23 --- CHOLMOD/Doc/Makefile        2007-05-03 23:32:54.000000000 +0200
  24 +++ CHOLMOD-uf/Doc/Makefile     2007-12-02 17:10:52.000000000 +0100
  25 @@ -1,6 +1,6 @@
  26  default: all
  27
  28 -include ../../UFconfig/UFconfig.mk
  29 +include /usr/share/misc/UFconfig.mk
  30
  31  all: UserGuide.pdf
  32
  33 diff -ur CHOLMOD/Include/cholmod.h CHOLMOD-uf/Include/cholmod.h
  34 --- CHOLMOD/Include/cholmod.h   2006-12-13 14:31:07.000000000 +0100
  35 +++ CHOLMOD-uf/Include/cholmod.h        2007-12-02 17:12:47.000000000 +0100
  36 @@ -84,7 +84,7 @@
  37  #include "cholmod_io64.h"
  38
  39  /* define UF_long */
  40 -#include "UFconfig.h"
  41 +#include <UFconfig.h>
  42
  43  #include "cholmod_config.h"
  44
  45 diff -ur CHOLMOD/Include/cholmod_internal.h CHOLMOD-uf/Include/cholmod_internal.h
  46 --- CHOLMOD/Include/cholmod_internal.h  2007-09-28 20:31:04.000000000 +0200
  47 +++ CHOLMOD-uf/Include/cholmod_internal.h       2007-12-02 17:13:05.000000000 +0100
  48 @@ -201,7 +201,7 @@
  49   * It can also be redefined for other platforms, by modifying UFconfig.h.
  50   */
  51
  52 -#include "UFconfig.h"
  53 +#include <UFconfig.h>
  54
  55  /* -------------------------------------------------------------------------- */
  56  /* Size_max: the largest value of size_t */
  57 --- CHOLMOD/Lib/Makefile.orig   2011-12-14 18:17:26.000000000 +0100
  58 +++ CHOLMOD/Lib/Makefile        2012-01-01 17:07:06.246620933 +0100
  59 @@ -6,7 +6,7 @@
  60
  61  ccode: all
  62
  63 -include ../../UFconfig/UFconfig.mk
  64 +include /usr/share/misc/UFconfig.mk
  65
  66  #-------------------------------------------------------------------------------
  67  # the optional Partition module requires METIS, CAMD, and CCOLAMD
  68 @@ -14,9 +14,9 @@
  69  CONFIG =
  70  ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
  71      # METIS is check if METIS is available
  72 -    ifeq (../../metis-4.0, $(wildcard ../../metis-4.0))
  73 -        I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
  74 -            -I../../CCOLAMD/Include -I../../CAMD/Include
  75 +    ifeq ($(WITH_METIS), 1)
  76 +        I_WITH_PARTITION = -I/usr/include/metis \
  77 +            -I/usr/include/ccolamd -I/usr/include/camd
  78      else
  79          # METIS is not available, but CHOLMOD_CONFIG does not specify
  80          # -DNPARTITION.  Add it here so we can still compile CHOLMOD.
  81 @@ -24,8 +24,8 @@
  82      endif
  83  endif
  84
  85 -I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
  86 -       $(I_WITH_PARTITION) -I../Include -I../../UFconfig
  87 +I = -I/usr/include/amd -I/usr/include/colamd \
  88 +       $(I_WITH_PARTITION) -I../Include
  89
  90  #-------------------------------------------------------------------------------
  91
  92 diff -ur CHOLMOD/Makefile CHOLMOD-uf/Makefile
  93 --- CHOLMOD/Makefile    2006-11-30 17:40:08.000000000 +0100
  94 +++ CHOLMOD-uf/Makefile 2007-12-02 17:12:17.000000000 +0100
  95 @@ -7,7 +7,7 @@
  96
  97  default: all
  98
  99 -include ../UFconfig/UFconfig.mk
 100 +include /usr/share/misc/UFconfig.mk
 101
 102  # Compile the C-callable libraries and the Demo programs.
 103  all:
 104 diff -ur CHOLMOD/MATLAB/cholmod_matlab.h CHOLMOD-uf/MATLAB/cholmod_matlab.h
 105 --- CHOLMOD/MATLAB/cholmod_matlab.h     2007-06-14 19:52:47.000000000 +0200
 106 +++ CHOLMOD-uf/MATLAB/cholmod_matlab.h  2007-12-02 17:13:28.000000000 +0100
 107 @@ -4,7 +4,7 @@
 108
 109  /* Shared prototypes and definitions for CHOLMOD mexFunctions */
 110
 111 -#include "UFconfig.h"
 112 +#include <UFconfig.h>
 113  #ifndef DLONG
 114  #define DLONG
 115  #endif
 116 diff -ur CHOLMOD/MATLAB/Makefile CHOLMOD-uf/MATLAB/Makefile
 117 --- CHOLMOD/MATLAB/Makefile     2007-05-05 19:08:13.000000000 +0200
 118 +++ CHOLMOD-uf/MATLAB/Makefile  2007-12-02 17:11:22.000000000 +0100
 119 @@ -4,10 +4,10 @@
 120
 121  default: all
 122
 123 -include ../../UFconfig/UFconfig.mk
 124 +include /usr/share/misc/UFconfig.mk
 125
 126  I = -I. -I../../AMD/Include -I../../COLAMD/Include -I../../CCOLAMD/Include \
 127 -    -I../../CAMD/Include -I../Include -I../../UFconfig -I$(METIS_PATH)/Lib
 128 +    -I../../CAMD/Include -I../Include -I$(METIS_PATH)/Lib
 129
 130  all: mread sdmult ldlsolve resymbol symbfact2 chol2 lchol \
 131         ldlchol cholmod2 ldlupdate metis bisect nesdis etree2 sparse2 analyze \
 132 diff -ur CHOLMOD/Tcov/Makefile CHOLMOD-uf/Tcov/Makefile
 133 --- CHOLMOD/Tcov/Makefile       2007-05-05 19:12:46.000000000 +0200
 134 +++ CHOLMOD-uf/Tcov/Makefile    2007-12-02 17:11:45.000000000 +0100
 135 @@ -5,7 +5,7 @@
 136  # If you compile CHOLMOD with -DNPARTITION, then you do not need METIS,
 137  # CCOLAMD, or the Partition module.
 138
 139 -include ../../UFconfig/UFconfig.mk
 140 +include /usr/share/misc/UFconfig.mk
 141  include Make.inc
 142
 143  # Tcov requires gcc
 144 @@ -31,7 +31,7 @@
 145
 146  I = -I../../AMD/Include -I../../COLAMD/Include \
 147         -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
 148 -       -I../Include -I../../UFconfig
 149 +       -I../Include
 150
 151  default: cm cl z_demo l_demo cmread clread
 152