--- setup.py.orig 2013-04-22 00:44:28.000000000 -0600
+++ setup.py 2013-09-23 08:23:37.288245909 -0600
@@ -2,11 +2,11 @@
from glob import glob
# Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
-BLAS_LIB_DIR = '/usr/lib'
+BLAS_LIB_DIR = '/usr/lib/atlas'
# Default names of BLAS and LAPACK libraries
-BLAS_LIB = ['blas']
-LAPACK_LIB = ['lapack']
+BLAS_LIB = ['satlas']
+LAPACK_LIB = ['satlas']
BLAS_EXTRA_LINK_ARGS = []
# Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do
@@ -15,7 +15,7 @@
# Set to 1 if you are using the random number generators in the GNU
# Scientific Library.
-BUILD_GSL = 0
+BUILD_GSL = 1
# Directory containing libgsl (used only when BUILD_GSL = 1).
GSL_LIB_DIR = '/usr/lib'
@@ -24,7 +24,7 @@
GSL_INC_DIR = '/usr/include/gsl'
# Set to 1 if you are installing the fftw module.
-BUILD_FFTW = 0
+BUILD_FFTW = 1
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
FFTW_LIB_DIR = '/usr/lib'
@@ -33,7 +33,7 @@
FFTW_INC_DIR = '/usr/include'
# Set to 1 if you are installing the glpk module.
-BUILD_GLPK = 0
+BUILD_GLPK = 1
# Directory containing libglpk (used only when BUILD_GLPK = 1).
GLPK_LIB_DIR = '/usr/lib'
@@ -42,13 +42,13 @@
GLPK_INC_DIR = '/usr/include'
# Set to 1 if you are installing the DSDP module.
-BUILD_DSDP = 0
+BUILD_DSDP = 1
# Directory containing libdsdp (used only when BUILD_DSDP = 1).
DSDP_LIB_DIR = '/usr/lib'
# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
-DSDP_INC_DIR = '/usr/include/dsdp'
+DSDP_INC_DIR = '/usr/include/DSDP'
# No modifications should be needed below this line.
@@ -112,20 +112,13 @@
sources = ['src/C/lapack.c'] )
umfpack = Extension('umfpack',
- include_dirs = [ 'src/C/SuiteSparse/UMFPACK/Include',
- 'src/C/SuiteSparse/AMD/Include',
- 'src/C/SuiteSparse/AMD/Source',
- 'src/C/SuiteSparse/SuiteSparse_config' ],
+ include_dirs = [ '/usr/include/suitesparse' ],
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS + [('NTIMER', '1'), ('NCHOLMOD', '1')],
- libraries = LAPACK_LIB + BLAS_LIB,
+ libraries = LAPACK_LIB + BLAS_LIB + [ 'umfpack' ],
extra_compile_args = ['-Wno-unknown-pragmas'],
extra_link_args = BLAS_EXTRA_LINK_ARGS,
- sources = [ 'src/C/umfpack.c',
- 'src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
- 'src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
- ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
- glob('src/C/SuiteSparse_cvxopt_extra/umfpack/*'))
+ sources = [ 'src/C/umfpack.c' ])
# Build for int or long?
import sys
@@ -133,30 +126,17 @@
cholmod = Extension('cholmod',
library_dirs = [ BLAS_LIB_DIR ],
- libraries = LAPACK_LIB + BLAS_LIB,
- include_dirs = [ 'src/C/SuiteSparse/CHOLMOD/Include',
- 'src/C/SuiteSparse/COLAMD',
- 'src/C/SuiteSparse/AMD/Include',
- 'src/C/SuiteSparse/COLAMD/Include',
- 'src/C/SuiteSparse/SuiteSparse_config' ],
+ libraries = LAPACK_LIB + BLAS_LIB + [ 'cholmod' ],
+ include_dirs = [ '/usr/include/suitesparse' ],
define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
extra_link_args = BLAS_EXTRA_LINK_ARGS,
- sources = [ 'src/C/cholmod.c' ] +
- ['src/C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
- 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
- ['src/C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
- 'colamd_global.c']] +
- ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
- glob('src/C/SuiteSparse/CHOLMOD/Core/c*.c') +
- glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
- ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
- glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
+ sources = [ 'src/C/cholmod.c' ])
amd = Extension('amd',
- include_dirs = [ 'src/C/SuiteSparse/AMD/Include',
- 'src/C/SuiteSparse/SuiteSparse_config' ],
+ include_dirs = [ '/usr/include/suitesparse' ],
+ libraries = [ 'amd' ],
define_macros = MACROS,
- sources = [ 'src/C/amd.c' ] + glob('src/C/SuiteSparse/AMD/Source/*.c') )
+ sources = [ 'src/C/amd.c' ] )
misc_solvers = Extension('misc_solvers',
libraries = LAPACK_LIB + BLAS_LIB,