* [gentoo-commits] gentoo-x86 commit in dev-python/cvxopt/files: cvxopt-setup.patch
@ 2012-01-06 15:40 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2012-01-06 15:40 UTC (permalink / raw
To: gentoo-commits
bicatali 12/01/06 15:40:31
Added: cvxopt-setup.patch
Log:
Initial import to the main tree. Use system libs for cholmod and umfpack. Added a src_test and a few cleanups.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-python/cvxopt/files/cvxopt-setup.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-setup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-setup.patch?rev=1.1&content-type=text/plain
Index: cvxopt-setup.patch
===================================================================
--- setup.py.orig 2012-01-06 04:59:53.000000000 +0000
+++ setup.py 2012-01-06 06:21:48.000000000 +0000
@@ -2,58 +2,58 @@
from glob import glob
# directory containing libblas and liblapack
-ATLAS_LIB_DIR = '/usr/lib'
+ATLAS_LIB_DIR = ''
# Set to 1 if you are using the random number generators in the GNU
# Scientific Library.
BUILD_GSL = 0
# Directory containing libgsl (used only when BUILD_GSL = 1).
-GSL_LIB_DIR = '/usr/lib'
+GSL_LIB_DIR = ''
# Directory containing the GSL header files (used only when BUILD_GSL = 1).
-GSL_INC_DIR = '/usr/include/gsl'
+GSL_INC_DIR = ''
# Set to 1 if you are installing the fftw module.
BUILD_FFTW = 0
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
-FFTW_LIB_DIR = '/usr/lib'
+FFTW_LIB_DIR = ''
# Directory containing fftw.h (used only when BUILD_FFTW = 1).
-FFTW_INC_DIR = '/usr/include'
+FFTW_INC_DIR = ''
# Set to 1 if you are installing the glpk module.
BUILD_GLPK = 0
# Directory containing libglpk (used only when BUILD_GLPK = 1).
-GLPK_LIB_DIR = '/usr/lib'
+GLPK_LIB_DIR = ''
# Directory containing glpk.h (used only when BUILD_GLPK = 1).
-GLPK_INC_DIR = '/usr/include'
+GLPK_INC_DIR = ''
# Set to 1 if you are installing the DSDP module.
BUILD_DSDP = 0
# Directory containing libdsdp (used only when BUILD_DSDP = 1).
-DSDP_LIB_DIR = '/usr/lib'
+DSDP_LIB_DIR = ''
# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
-DSDP_INC_DIR = '/usr/include'
+DSDP_INC_DIR = ''
extmods = []
# optional modules
if BUILD_GSL:
- gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
+ gsl = Extension('gsl', libraries = ['gsl'],
include_dirs = [ GSL_INC_DIR ],
library_dirs = [ GSL_LIB_DIR ],
sources = ['C/gsl.c'] )
extmods += [gsl];
if BUILD_FFTW:
- fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
+ fftw = Extension('fftw', libraries = ['fftw3'],
include_dirs = [ FFTW_INC_DIR ],
library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
sources = ['C/fftw.c'] )
@@ -67,7 +67,7 @@
extmods += [glpk];
if BUILD_DSDP:
- dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
+ dsdp = Extension('dsdp', libraries = ['dsdp'],
include_dirs = [ DSDP_INC_DIR ],
library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
sources = ['C/dsdp.c'] )
@@ -85,7 +85,7 @@
else:
MACROS = []
-base = Extension('base', libraries = ['m','lapack','blas'],
+base = Extension('base', libraries = ['lapack'],
library_dirs = [ ATLAS_LIB_DIR ],
define_macros = MACROS,
sources = ['C/base.c','C/dense.c','C/sparse.c'])
@@ -95,22 +95,16 @@
define_macros = MACROS,
sources = ['C/blas.c'] )
-lapack = Extension('lapack', libraries = ['lapack','blas'],
+lapack = Extension('lapack', libraries = ['lapack'],
library_dirs = [ ATLAS_LIB_DIR ],
define_macros = MACROS,
sources = ['C/lapack.c'] )
umfpack = Extension('umfpack',
- include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
- 'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source',
- 'C/SuiteSparse/UFconfig' ],
library_dirs = [ ATLAS_LIB_DIR ],
define_macros = MACROS,
- libraries = [ 'blas', 'lapack'],
- sources = [ 'C/umfpack.c',
- 'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
- 'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
- glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
+ libraries = [ 'umfpack' ],
+ sources = [ 'C/umfpack.c' ])
# Build for int or long?
import sys
@@ -118,28 +112,16 @@
cholmod = Extension('cholmod',
library_dirs = [ ATLAS_LIB_DIR ],
- libraries = ['lapack', 'blas'],
- include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
- 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
- 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
+ libraries = ['cholmod' ],
define_macros = MACROS + [('NPARTITION', '1')],
- 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' ],
define_macros = MACROS,
- sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
+ libraries = [ 'amd' ],
+ sources = [ 'C/amd.c' ])
-misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
+misc_solvers = Extension('misc_solvers', libraries = ['lapack'],
library_dirs = [ ATLAS_LIB_DIR ],
define_macros = MACROS,
sources = ['C/misc_solvers.c'] )
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-python/cvxopt/files: cvxopt-setup.patch
@ 2012-01-17 18:28 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2012-01-17 18:28 UTC (permalink / raw
To: gentoo-commits
bicatali 12/01/17 18:28:46
Modified: cvxopt-setup.patch
Log:
Fixed missing components (bug #399029, thanks Francois Bissey), removed useless seds and fixed optional sed's
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-python/cvxopt/files/cvxopt-setup.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-setup.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-setup.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-setup.patch?r1=1.1&r2=1.2
Index: cvxopt-setup.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/cvxopt/files/cvxopt-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvxopt-setup.patch 6 Jan 2012 15:40:31 -0000 1.1
+++ cvxopt-setup.patch 17 Jan 2012 18:28:46 -0000 1.2
@@ -1,6 +1,6 @@
---- setup.py.orig 2012-01-06 04:59:53.000000000 +0000
-+++ setup.py 2012-01-06 06:21:48.000000000 +0000
-@@ -2,58 +2,58 @@
+--- setup.py.orig 2011-12-22 10:53:49.000000000 +1300
++++ setup.py 2012-01-16 11:17:04.207596266 +1300
+@@ -2,73 +2,57 @@
from glob import glob
# directory containing libblas and liblapack
@@ -13,33 +13,30 @@
# Directory containing libgsl (used only when BUILD_GSL = 1).
-GSL_LIB_DIR = '/usr/lib'
-+GSL_LIB_DIR = ''
-
- # Directory containing the GSL header files (used only when BUILD_GSL = 1).
+-
+-# Directory containing the GSL header files (used only when BUILD_GSL = 1).
-GSL_INC_DIR = '/usr/include/gsl'
-+GSL_INC_DIR = ''
++GSL_LIB_DIR = ''
# Set to 1 if you are installing the fftw module.
BUILD_FFTW = 0
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
-FFTW_LIB_DIR = '/usr/lib'
-+FFTW_LIB_DIR = ''
-
- # Directory containing fftw.h (used only when BUILD_FFTW = 1).
+-
+-# Directory containing fftw.h (used only when BUILD_FFTW = 1).
-FFTW_INC_DIR = '/usr/include'
-+FFTW_INC_DIR = ''
++FFTW_LIB_DIR = ''
# Set to 1 if you are installing the glpk module.
BUILD_GLPK = 0
# Directory containing libglpk (used only when BUILD_GLPK = 1).
-GLPK_LIB_DIR = '/usr/lib'
-+GLPK_LIB_DIR = ''
-
- # Directory containing glpk.h (used only when BUILD_GLPK = 1).
+-
+-# Directory containing glpk.h (used only when BUILD_GLPK = 1).
-GLPK_INC_DIR = '/usr/include'
-+GLPK_INC_DIR = ''
++GLPK_LIB_DIR = ''
# Set to 1 if you are installing the DSDP module.
BUILD_DSDP = 0
@@ -48,38 +45,44 @@
-DSDP_LIB_DIR = '/usr/lib'
+DSDP_LIB_DIR = ''
- # Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
+-# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
-DSDP_INC_DIR = '/usr/include'
-+DSDP_INC_DIR = ''
-
+-
extmods = []
# optional modules
if BUILD_GSL:
- gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
+- include_dirs = [ GSL_INC_DIR ],
+ gsl = Extension('gsl', libraries = ['gsl'],
- include_dirs = [ GSL_INC_DIR ],
library_dirs = [ GSL_LIB_DIR ],
sources = ['C/gsl.c'] )
extmods += [gsl];
if BUILD_FFTW:
- fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
+- include_dirs = [ FFTW_INC_DIR ],
+ fftw = Extension('fftw', libraries = ['fftw3'],
- include_dirs = [ FFTW_INC_DIR ],
library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
sources = ['C/fftw.c'] )
-@@ -67,7 +67,7 @@
+ extmods += [fftw];
+
+ if BUILD_GLPK:
+ glpk = Extension('glpk', libraries = ['glpk'],
+- include_dirs = [ GLPK_INC_DIR ],
+ library_dirs = [ GLPK_LIB_DIR ],
+ sources = ['C/glpk.c'] )
extmods += [glpk];
if BUILD_DSDP:
- dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
+- include_dirs = [ DSDP_INC_DIR ],
+ dsdp = Extension('dsdp', libraries = ['dsdp'],
- include_dirs = [ DSDP_INC_DIR ],
library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
sources = ['C/dsdp.c'] )
-@@ -85,7 +85,7 @@
+ extmods += [dsdp];
+@@ -85,7 +69,7 @@
else:
MACROS = []
@@ -88,7 +91,7 @@
library_dirs = [ ATLAS_LIB_DIR ],
define_macros = MACROS,
sources = ['C/base.c','C/dense.c','C/sparse.c'])
-@@ -95,22 +95,16 @@
+@@ -95,22 +79,16 @@
define_macros = MACROS,
sources = ['C/blas.c'] )
@@ -114,7 +117,7 @@
# Build for int or long?
import sys
-@@ -118,28 +112,16 @@
+@@ -118,28 +96,16 @@
cholmod = Extension('cholmod',
library_dirs = [ ATLAS_LIB_DIR ],
@@ -122,7 +125,7 @@
- include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
- 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
- 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
-+ libraries = ['cholmod' ],
++ libraries = ['cholmod','blas'],
define_macros = MACROS + [('NPARTITION', '1')],
- sources = [ 'C/cholmod.c' ] +
- ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-17 18:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-06 15:40 [gentoo-commits] gentoo-x86 commit in dev-python/cvxopt/files: cvxopt-setup.patch Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2012-01-17 18:28 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox