diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | setup.py | 31 | ||||
| -rw-r--r-- | simpl/sms.i (renamed from src/sms/sms.i) | 6 |
3 files changed, 33 insertions, 5 deletions
@@ -46,6 +46,7 @@ Dependencies * Python (>= 2.6.*) * NumPy * SciPy +* GNU Scientific Library (for libsms) * Developers who wish to run the unit tests also need the original open source libraries: * sndobj: http://sndobj.sourceforge.net/ * libsms: http://mtg.upf.edu/static/libsms/ @@ -38,7 +38,6 @@ include_dirs = [numpy_include, '/usr/local/include'] # SndObj Library # ------------------------------------------------------------------------------ -# sources sndobj_sources = """ SndObj.cpp SndIO.cpp FFT.cpp IFFT.cpp PVA.cpp PVS.cpp IFGram.cpp SinAnal.cpp SinSyn.cpp AdSyn.cpp ReSyn.cpp HarmTable.cpp HammingTable.cpp @@ -82,10 +81,38 @@ sndobj = Extension("simpl/_simplsndobj", sources=sndobj_sources, include_dirs=sndobj_include_dirs, define_macros=sndobj_macros, - # libraries=['m', 'fftw3'], swig_opts=sndobj_swig_opts) # ------------------------------------------------------------------------------ +# SMS +# ------------------------------------------------------------------------------ + +sms_sources = """ + OOURA.c cepstrum.c peakContinuation.c soundIO.c tables.c + fileIO.c peakDetection.c spectralApprox.c transforms.c + filters.c residual.c spectrum.c windows.c SFMT.c fixTracks.c + sineSynth.c stocAnalysis.c harmDetection.c sms.c synthesis.c + analysis.c modify.c + """.split() + +sms_sources = map(lambda x: 'src/sms/' + x, sms_sources) +sms_sources.append("simpl/sms.i") + +# sms_macros = [] +# sms_macros.extend(macros) +# sms_swig_opts = [] +# sms_swig_opts.extend(swig_opts) +sms_include_dirs = ['src/sms'] +sms_include_dirs.extend(include_dirs) + +sndobj = Extension("simpl/_simplsms", + sources=sms_sources, + include_dirs=sms_include_dirs, + libraries=['m', 'fftw3', 'gsl', 'gslcblas'], + extra_compile_args=['-DMERSENNE_TWISTER']) + + +# ------------------------------------------------------------------------------ # Package # ------------------------------------------------------------------------------ diff --git a/src/sms/sms.i b/simpl/sms.i index 0b3ee5a..909d417 100644 --- a/src/sms/sms.i +++ b/simpl/sms.i @@ -1,10 +1,10 @@ %module simplsms %{ - #include "sms.h" + #include "../src/sms/sms.h" #define SWIG_FILE_WITH_INIT %} -%include "../common/numpy.i" +%include "numpy.i" %init %{ @@ -56,7 +56,7 @@ (int sizeResidual, double* pResidual) } -%include "sms.h" +%include "../src/sms/sms.h" /* overload the functions that will be wrapped to fit numpy typmaps (defined below) * by renaming the wrapped names back to originals |