Attachment 595492 Details for Bug 832475 – Fixed python-cvxopt-setup.patch

[patch] Fixed python-cvxopt-setup.patch

python-cvxopt-setup.patch (text/plain), 3.94 KB, created by Justin Blanchard on 2012-07-01 01:18:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Blanchard

Created: 2012-07-01 01:18:07 UTC

Size: 3.94 KB

patch

obsolete

>--- ./src/setup.py.orig	2012-03-27 14:05:13.000000000 -0600
>+++ ./src/setup.py	2012-04-02 15:36:07.621568810 -0600
>@@ -2,10 +2,10 @@ from distutils.core import setup, Extens
> 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']
>+BLAS_LIB = ['f77blas']
> LAPACK_LIB = ['lapack']
> BLAS_EXTRA_LINK_ARGS = []
> 
>@@ -15,7 +15,7 @@ BLAS_NOUNDERSCORES = False
> 
> # 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_LIB_DIR = '/usr/lib'
> 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_LIB_DIR = '/usr/lib'
> 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_LIB_DIR = '/usr/lib'
> 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,17 +112,12 @@ lapack = Extension('lapack', libraries =
>     sources = ['C/lapack.c'] )
> 
> umfpack = Extension('umfpack', 
>-    include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
>-        'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source', 
>-        'C/SuiteSparse/UFconfig' ],
>+    include_dirs = [ '/usr/include/suitesparse' ],
>     library_dirs = [ BLAS_LIB_DIR ],
>     define_macros = MACROS,
>-    libraries = LAPACK_LIB + BLAS_LIB,
>+    libraries = LAPACK_LIB + BLAS_LIB + [ 'umfpack' ],
>     extra_link_args = BLAS_EXTRA_LINK_ARGS,
>-    sources = [ 'C/umfpack.c',
>-        'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
>-        'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
>-        glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
>+    sources = [ 'C/umfpack.c' ])
> 
> # Build for int or long? 
> import sys
>@@ -131,26 +126,16 @@ if sys.maxsize > 2**31: MACROS += [('DLO
> cholmod = Extension('cholmod',
>     library_dirs = [ BLAS_LIB_DIR ],
>-    libraries = LAPACK_LIB + BLAS_LIB,
>-    include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
>-        'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
>-        'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
>+    libraries = LAPACK_LIB + BLAS_LIB + [ 'cholmod' ],
>+    include_dirs = [ '/usr/include/suitesparse' ],
>     define_macros = MACROS + [('NPARTITION', '1')],
>     extra_link_args = BLAS_EXTRA_LINK_ARGS,
>-    sources = [ 'C/cholmod.c' ] + 
>-        ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
>-            'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
>-        ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
>-            'colamd_global.c']] +
>-        glob('C/SuiteSparse/CHOLMOD/Core/c*.c') +
>-        glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
>-        ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
>-        glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
>+    sources = [ 'C/cholmod.c' ])
> 
> amd = Extension('amd', 
>-    include_dirs = [ 'C/SuiteSparse/AMD/Include', 
>-        'C/SuiteSparse/UFconfig' ],
>+    include_dirs = [ '/usr/include/suitesparse' ],
>+    libraries = [ 'amd' ],
>     define_macros = MACROS,
>-    sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
>+    sources = [ 'C/amd.c' ])
> 
> misc_solvers = Extension('misc_solvers',
>     libraries = LAPACK_LIB + BLAS_LIB,

Actions: View | Diff

Attachments on bug 832475: 595492