Changeset ad5203c

Timestamp:

Mar 5, 2013, 5:46:48 PM (12 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

63f6c13

Parents:

208336b

Message:

python/: improve build

Files:

• python/README (moved) (moved from python/README.md)
• python/ext/aubio-types.h (modified) (1 diff)
• python/ext/aubiomodule.c (modified) (2 diffs)
• python/ext/ufuncs.c (modified) (2 diffs)
• python/gen_pyobject.py (modified) (1 diff)
• python/generator.py (modified) (4 diffs)
• python/setup.py (modified) (3 diffs)
• tests/demo/localaubio.py (deleted)

python/ext/aubio-types.h

@@ -11 +11 @@
 #ifndef PY_AUBIO_MODULE_MAIN
 #define NO_IMPORT_ARRAY
+#endif
+#include <numpy/arrayobject.h>
+#ifndef PY_AUBIO_MODULE_UFUNC
 #define NO_IMPORT_UFUNC
+#else
+#include <numpy/ufuncobject.h>
 #endif
 
 // import aubio
-#include <numpy/ndarraytypes.h>
-#include <numpy/ufuncobject.h>
-#include <numpy/npy_3kcompat.h>
+//#include <numpy/npy_3kcompat.h>
 
 #define AUBIO_UNSTABLE 1
-#include <aubio.h>
+#include "aubio.h"
 
 #define Py_default_vector_length 1024

python/ext/aubiomodule.c

@@ -1 +1 @@
 #define PY_AUBIO_MODULE_MAIN
 #include "aubio-types.h"
-#include "generated/aubio-generated.h"
+#include "aubio-generated.h"
+
+extern void add_generated_objects ( PyObject *m );
+extern void add_ufuncs ( PyObject *m );
 
 static char Py_alpha_norm_doc[] = "compute alpha normalisation factor";
@@ -262 +265 @@
 
   err = _import_array ();
-
   if (err != 0) {
     fprintf (stderr,
-        "Unable to import Numpy C API from aubio module (error %d)\n", err);
+        "Unable to import Numpy array from aubio module (error %d)\n", err);
   }
 

python/ext/ufuncs.c

@@ +1 @@
+#define PY_AUBIO_MODULE_UFUNC
 #include "aubio-types.h"
 
@@ -61 +62 @@
 void add_ufuncs ( PyObject *m )
 {
-  int err = _import_umath();
+  int err = 0;
 
+  err = _import_umath ();
   if (err != 0) {
     fprintf (stderr,
-            "Unable to import Numpy C API Ufunc from aubio module (error %d)\n", err);
+        "Unable to import Numpy umath from aubio module (error %d)\n", err);
   }
 

python/gen_pyobject.py

@@ -173 +173 @@
 
 // WARNING: if you haven't read the first line yet, please do so
-#include "ext/aubiowraphell.h"
+#include "aubiowraphell.h"
 
 typedef struct

python/generator.py

@@ -28 +28 @@
   return cpp_output, cpp_objects
 
-def generate_object_files():
-  if os.path.isdir('generated'): shutil.rmtree('generated')
-  os.mkdir('generated')
+def generate_object_files(output_path):
+  if os.path.isdir(output_path): shutil.rmtree(output_path)
+  os.mkdir(output_path)
 
   generated_objects = []
@@ -49 +49 @@
   for this_object in cpp_objects:
       lint = 0
-   
+
       if this_object[-2:] == '_t':
           object_name = this_object[:-2]
@@ -127 +127 @@
       if 1: #try:
           s = gen_new_init(new_methods[0], short_name)
-          s += gen_do(do_methods[0], short_name) 
+          s += gen_do(do_methods[0], short_name)
           s += gen_members(new_methods[0], short_name)
           s += gen_methods(get_methods, set_methods, short_name)
           s += gen_finish(short_name)
-          generated_filepath = 'generated/gen-'+short_name+'.c'
+          generated_filepath = os.path.join(output_path,'gen-'+short_name+'.c')
           fd = open(generated_filepath, 'w')
           fd.write(s)
@@ -175 +175 @@
   }"""
 
-  fd = open('generated/aubio-generated.h', 'w')
+  fd = open(os.path.join(output_path,'aubio-generated.h'), 'w')
   fd.write(s)
 
   from os import listdir
-  generated_files = listdir('generated')
+  generated_files = listdir(output_path)
   generated_files = filter(lambda x: x.endswith('.c'), generated_files)
-  generated_files = ['generated/'+f for f in generated_files]
+  generated_files = [output_path+'/'+f for f in generated_files]
   return generated_files
 
 if __name__ == '__main__':
-  generate_object_files() 
+  generate_object_files('gen')

python/setup.py

@@ -2 +2 @@
 
 from distutils.core import setup, Extension
-from generator import generate_object_files
 import sys
 import os.path
@@ -8 +7 @@
 
 # read from VERSION
-for l in open(os.path.join('..','VERSION')).readlines(): exec (l.strip())
+for l in open('VERSION').readlines(): exec (l.strip())
 __version__ = '.'.join \
         ([str(x) for x in [AUBIO_MAJOR_VERSION, AUBIO_MINOR_VERSION, AUBIO_PATCH_VERSION]]) \
         + AUBIO_VERSION_STATUS
 
-library_dirs = ['../build/src', '../src/.libs']
-include_dirs = ['../build/src', '../src', '.' ]
+library_dirs = ['../build/src']
+include_dirs = ['../src'] # aubio.h
+include_dirs += ['../build/src'] # config.h
+include_dirs += ['ext']
+include_dirs += ['gen']
+#include_dirs += ['../build/src', '../src', '.' ]
+
 library_dirs = filter (lambda x: os.path.isdir(x), library_dirs)
 include_dirs = filter (lambda x: os.path.isdir(x), include_dirs)
+
+generated_object_files = []
+
+output_path = 'gen'
+
+if not os.path.isdir(output_path):
+    from generator import generate_object_files
+    generated_object_files = generate_object_files(output_path)
+else:
+    import glob
+    generated_object_files = glob.glob(os.path.join(output_path, '*.c'))
 
 aubio_extension = Extension("aubio._aubio", [
@@ -30 +45 @@
             "ext/py-phasevoc.c",
             # generated files
-            ] + generate_object_files(),
+            ] + generated_object_files,
         include_dirs = include_dirs + [ numpy.get_include() ],
         library_dirs = library_dirs,