Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- iff --git a/src/trunk/swig/python/mkpy b/src/trunk/swig/python/mkpy
- index b566697..994cc51 100755
- --- a/src/trunk/swig/python/mkpy
- +++ b/src/trunk/swig/python/mkpy
- @@ -10,8 +10,9 @@ if [ -x /cygdrive/c/MinGW/msys/1.0/bin/bash ]; then
- exec /cygdrive/c/MinGW/msys/1.0/bin/bash $0 $optx $*
- fi
- -INC="-I. -Ispams/linalg -Ispams/prox -Ispams/decomp -Ispams/dictLearn -I/usr/include/python3.5m/"
- -INC_PYTHON=-I/usr/include/python3.5m
- +PY_INC=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
- +INC="-I. -Ispams/linalg -Ispams/prox -Ispams/decomp -Ispams/dictLearn -I${PY_INC}"
- +INC_PYTHON=-I${PY_INC}
- XCCFLAGS=""
- XLINKFLAGS=""
- # on MacOS, use following definition instead.
- @@ -22,7 +23,7 @@ OPTWIN=""
- EXTL=so
- CCFLAGS="-fPIC"
- OMPFLAGS="-fopenmp"
- -if [ -d /System/Library/Frameworks ]; then
- +if [ -d /System/Library/Frameworks ]; then
- # MacOs
- macos=1
- INC_PYTHON="-I/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy/core/include"
- @@ -30,7 +31,7 @@ if [ -d /System/Library/Frameworks ]; then
- XLINKFLAGS="-m32 -framework Python"
- fi
- case `uname` in
- - CYGWIN*|MINGW*)
- + CYGWIN*|MINGW*)
- OPTWIN=-mwindows
- EXTL=pyd
- flg_swig=0
- @@ -40,7 +41,7 @@ case `uname` in
- DBLAS='-LC:/Program Files/R/R-2.15.1/bin/i386'
- BLAS='-lRblas -lRlapack'
- if [ -d C:\Python27 ]; then
- - CCFLAGS="-DWIN32 -fopenmp"
- + CCFLAGS="-DWIN32 -fopenmp"
- INC_PYTHON="-IC:\Python27\include -IC:\Python27\Lib\site-packages\numpy\core\include"
- LIBS=" -LC:\Python27\libs -lpython27"
- fi
- @@ -83,7 +84,7 @@ if [ $debug -eq 0 ]; then
- OPT_DBG=""
- else
- OPT_DBG=-DDEBUG
- -fi
- +fi
- err=0
- for nom in $lst; do
- @@ -105,5 +106,5 @@ for nom in $lst; do
- # /bin/rm -f $nom.o ${nom}_wrap.o
- done
- [ $err -ne 0 ] && die "ERROR"
- -
- +
- exit 0
- diff --git a/src/trunk/swig/python/setup.py.in b/src/trunk/swig/python/setup.py.in
- index 9ed3818..883ce66 100644
- --- a/src/trunk/swig/python/setup.py.in
- +++ b/src/trunk/swig/python/setup.py.in
- @@ -1,13 +1,14 @@
- import os
- #os.environ['DISTUTILS_DEBUG'] = "1"
- from distutils.core import setup, Extension
- +from distutils.sysconfig import get_python_inc
- import distutils.util
- import numpy
- # includes numpy : package numpy.distutils , numpy.get_include()
- # python setup.py build --inplace
- -# python setup.py install --prefix=dist,
- -incs = ['.'] + [os.path.join('spams',x) for x in [ 'linalg', 'prox', 'decomp', 'dictLearn']] + [numpy.get_include()] + ['/usr/include/python3.5m/']
- +# python setup.py install --prefix=dist,
- +incs = ['.'] + [os.path.join('spams',x) for x in [ 'linalg', 'prox', 'decomp', 'dictLearn']] + [numpy.get_include()] + [get_python_inc()]
- osname = distutils.util.get_platform()
- cc_flags = ['-fPIC', '-fopenmp']
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement