| 1 |
--- setup.py.orig 2011-12-22 10:53:49.000000000 +1300
|
| 2 |
+++ setup.py 2012-01-16 11:17:04.207596266 +1300
|
| 3 |
@@ -2,73 +2,57 @@
|
| 4 |
from glob import glob
|
| 5 |
|
| 6 |
# directory containing libblas and liblapack
|
| 7 |
-ATLAS_LIB_DIR = '/usr/lib'
|
| 8 |
+ATLAS_LIB_DIR = ''
|
| 9 |
|
| 10 |
# Set to 1 if you are using the random number generators in the GNU
|
| 11 |
# Scientific Library.
|
| 12 |
BUILD_GSL = 0
|
| 13 |
|
| 14 |
# Directory containing libgsl (used only when BUILD_GSL = 1).
|
| 15 |
-GSL_LIB_DIR = '/usr/lib'
|
| 16 |
-
|
| 17 |
-# Directory containing the GSL header files (used only when BUILD_GSL = 1).
|
| 18 |
-GSL_INC_DIR = '/usr/include/gsl'
|
| 19 |
+GSL_LIB_DIR = ''
|
| 20 |
|
| 21 |
# Set to 1 if you are installing the fftw module.
|
| 22 |
BUILD_FFTW = 0
|
| 23 |
|
| 24 |
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
|
| 25 |
-FFTW_LIB_DIR = '/usr/lib'
|
| 26 |
-
|
| 27 |
-# Directory containing fftw.h (used only when BUILD_FFTW = 1).
|
| 28 |
-FFTW_INC_DIR = '/usr/include'
|
| 29 |
+FFTW_LIB_DIR = ''
|
| 30 |
|
| 31 |
# Set to 1 if you are installing the glpk module.
|
| 32 |
BUILD_GLPK = 0
|
| 33 |
|
| 34 |
# Directory containing libglpk (used only when BUILD_GLPK = 1).
|
| 35 |
-GLPK_LIB_DIR = '/usr/lib'
|
| 36 |
-
|
| 37 |
-# Directory containing glpk.h (used only when BUILD_GLPK = 1).
|
| 38 |
-GLPK_INC_DIR = '/usr/include'
|
| 39 |
+GLPK_LIB_DIR = ''
|
| 40 |
|
| 41 |
# Set to 1 if you are installing the DSDP module.
|
| 42 |
BUILD_DSDP = 0
|
| 43 |
|
| 44 |
# Directory containing libdsdp (used only when BUILD_DSDP = 1).
|
| 45 |
-DSDP_LIB_DIR = '/usr/lib'
|
| 46 |
+DSDP_LIB_DIR = ''
|
| 47 |
|
| 48 |
-# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
|
| 49 |
-DSDP_INC_DIR = '/usr/include'
|
| 50 |
-
|
| 51 |
extmods = []
|
| 52 |
|
| 53 |
# optional modules
|
| 54 |
|
| 55 |
if BUILD_GSL:
|
| 56 |
- gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
|
| 57 |
- include_dirs = [ GSL_INC_DIR ],
|
| 58 |
+ gsl = Extension('gsl', libraries = ['gsl'],
|
| 59 |
library_dirs = [ GSL_LIB_DIR ],
|
| 60 |
sources = ['C/gsl.c'] )
|
| 61 |
extmods += [gsl];
|
| 62 |
|
| 63 |
if BUILD_FFTW:
|
| 64 |
- fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
|
| 65 |
- include_dirs = [ FFTW_INC_DIR ],
|
| 66 |
+ fftw = Extension('fftw', libraries = ['fftw3'],
|
| 67 |
library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
|
| 68 |
sources = ['C/fftw.c'] )
|
| 69 |
extmods += [fftw];
|
| 70 |
|
| 71 |
if BUILD_GLPK:
|
| 72 |
glpk = Extension('glpk', libraries = ['glpk'],
|
| 73 |
- include_dirs = [ GLPK_INC_DIR ],
|
| 74 |
library_dirs = [ GLPK_LIB_DIR ],
|
| 75 |
sources = ['C/glpk.c'] )
|
| 76 |
extmods += [glpk];
|
| 77 |
|
| 78 |
if BUILD_DSDP:
|
| 79 |
- dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
|
| 80 |
- include_dirs = [ DSDP_INC_DIR ],
|
| 81 |
+ dsdp = Extension('dsdp', libraries = ['dsdp'],
|
| 82 |
library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
|
| 83 |
sources = ['C/dsdp.c'] )
|
| 84 |
extmods += [dsdp];
|
| 85 |
@@ -85,7 +69,7 @@
|
| 86 |
else:
|
| 87 |
MACROS = []
|
| 88 |
|
| 89 |
-base = Extension('base', libraries = ['m','lapack','blas'],
|
| 90 |
+base = Extension('base', libraries = ['lapack'],
|
| 91 |
library_dirs = [ ATLAS_LIB_DIR ],
|
| 92 |
define_macros = MACROS,
|
| 93 |
sources = ['C/base.c','C/dense.c','C/sparse.c'])
|
| 94 |
@@ -95,22 +79,16 @@
|
| 95 |
define_macros = MACROS,
|
| 96 |
sources = ['C/blas.c'] )
|
| 97 |
|
| 98 |
-lapack = Extension('lapack', libraries = ['lapack','blas'],
|
| 99 |
+lapack = Extension('lapack', libraries = ['lapack'],
|
| 100 |
library_dirs = [ ATLAS_LIB_DIR ],
|
| 101 |
define_macros = MACROS,
|
| 102 |
sources = ['C/lapack.c'] )
|
| 103 |
|
| 104 |
umfpack = Extension('umfpack',
|
| 105 |
- include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
|
| 106 |
- 'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source',
|
| 107 |
- 'C/SuiteSparse/UFconfig' ],
|
| 108 |
library_dirs = [ ATLAS_LIB_DIR ],
|
| 109 |
define_macros = MACROS,
|
| 110 |
- libraries = [ 'blas', 'lapack'],
|
| 111 |
- sources = [ 'C/umfpack.c',
|
| 112 |
- 'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
|
| 113 |
- 'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
|
| 114 |
- glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
|
| 115 |
+ libraries = [ 'umfpack' ],
|
| 116 |
+ sources = [ 'C/umfpack.c' ])
|
| 117 |
|
| 118 |
# Build for int or long?
|
| 119 |
import sys
|
| 120 |
@@ -118,28 +96,16 @@
|
| 121 |
|
| 122 |
cholmod = Extension('cholmod',
|
| 123 |
library_dirs = [ ATLAS_LIB_DIR ],
|
| 124 |
- libraries = ['lapack', 'blas'],
|
| 125 |
- include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
|
| 126 |
- 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
|
| 127 |
- 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
|
| 128 |
+ libraries = ['cholmod','blas'],
|
| 129 |
define_macros = MACROS + [('NPARTITION', '1')],
|
| 130 |
- sources = [ 'C/cholmod.c' ] +
|
| 131 |
- ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
|
| 132 |
- 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
|
| 133 |
- ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
|
| 134 |
- 'colamd_global.c']] +
|
| 135 |
- glob('C/SuiteSparse/CHOLMOD/Core/c*.c') +
|
| 136 |
- glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
|
| 137 |
- ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
|
| 138 |
- glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
|
| 139 |
+ sources = [ 'C/cholmod.c' ])
|
| 140 |
|
| 141 |
amd = Extension('amd',
|
| 142 |
- include_dirs = [ 'C/SuiteSparse/AMD/Include',
|
| 143 |
- 'C/SuiteSparse/UFconfig' ],
|
| 144 |
define_macros = MACROS,
|
| 145 |
- sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
|
| 146 |
+ libraries = [ 'amd' ],
|
| 147 |
+ sources = [ 'C/amd.c' ])
|
| 148 |
|
| 149 |
-misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
|
| 150 |
+misc_solvers = Extension('misc_solvers', libraries = ['lapack'],
|
| 151 |
library_dirs = [ ATLAS_LIB_DIR ],
|
| 152 |
define_macros = MACROS,
|
| 153 |
sources = ['C/misc_solvers.c'] )
|
Parent Directory
| 
Revision Log