Changeset a89ed31 for python

Timestamp:

Apr 25, 2016, 11:33:11 PM (9 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:

c31b589

Parents:

07867cd

Message:

python/setup.py: add command 'generate' with option '--enable-double'

Location:

python

Files:

• ext/aubio-types.h (modified) (1 diff)
• ext/aubiomodule.c (modified) (1 diff)
• lib/gen_external.py (modified) (3 diffs)
• lib/moresetuptools.py (added)
• setup.py (modified) (5 diffs)

python/ext/aubio-types.h

@@ -1 +1 @@
 #include <Python.h>
 #include <structmember.h>
+
+#include "aubio-generated.h"
 
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION

python/ext/aubiomodule.c

@@ -1 +1 @@
 #define PY_AUBIO_MODULE_MAIN
 #include "aubio-types.h"
-#include "aubio-generated.h"
 #include "py-musicutils.h"
 

python/lib/gen_external.py

@@ -1 @@
-import os
+import os, glob
 
 header = """// this file is generated! do not modify
@@ -67 +67 @@
     return cpp_output, cpp_objects
 
-def generate_external(output_path, usedouble = False):
+def generate_external(output_path, usedouble = False, overwrite = True):
     if not os.path.isdir(output_path): os.mkdir(output_path)
+    elif overwrite == False: return glob.glob(os.path.join(output_path, '*.c'))
     sources_list = []
     cpp_output, cpp_objects = get_cpp_objects()
@@ -161 +162 @@
 
     objlist = "".join(["extern PyTypeObject Py_%sType;\n" % p for p in lib])
-    out = """
-// generated list of objects created with gen_external.py
+    out = """// generated list of objects created with gen_external.py
+
 #include <Python.h>
-
+"""
+    if usedouble:
+        out += """
+#ifndef HAVE_AUBIO_DOUBLE
+#define HAVE_AUBIO_DOUBLE 1
+#endif
+"""
+    out += """
 {objlist}
 int generated_objects ( void );

python/setup.py

@@ -1 +1 @@
 #! /usr/bin/env python
 
-from setuptools import setup, Extension
+from setuptools import setup, Extension, Command
+from lib.moresetuptools import CleanGenerated, GenerateCommand
 
 import sys
@@ -13 +14 @@
         + AUBIO_VERSION_STATUS
 
+# function to generate gen/*.{c,h}
+from lib.gen_external import generate_external
+output_path = 'gen'
 
 include_dirs = []
@@ -19 +23 @@
 extra_link_args = []
 
-include_dirs += ['ext']
+include_dirs += [ 'ext' ]
+include_dirs += [ output_path ] # aubio-generated.h
 include_dirs += [ numpy.get_include() ]
 
 if sys.platform.startswith('darwin'):
     extra_link_args += ['-framework','CoreFoundation', '-framework','AudioToolbox']
-
-output_path = 'gen'
-generated_object_files = []
-
-if not os.path.isdir(output_path):
-    from lib.gen_external import generate_external
-    generated_object_files = generate_external(output_path)
-    # define include dirs
-else:
-    import glob
-    generated_object_files = glob.glob(os.path.join(output_path, '*.c'))
-include_dirs += [output_path]
 
 if os.path.isfile('../src/aubio.h'):
@@ -57 +50 @@
     "ext/py-source.c",
     "ext/py-sink.c",
-    # generated files
-    ] + generated_object_files,
+    # generate files if they don't exit
+    ] + generate_external(output_path, overwrite = False),
     include_dirs = include_dirs,
     library_dirs = library_dirs,
@@ -97 +90 @@
     classifiers = classifiers,
     install_requires = ['numpy'],
+    cmdclass = {
+        'clean': CleanGenerated,
+        'generate': GenerateCommand,
+        }
     )