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

Paul Brossier committed 10 years ago

Commit a89ed311 parent 07867cd5 files · +58 −22Browse files

Showing the changes to python (5 of 5 files). Show all

Unified · Split

5 files

python/ext/aubio-types.h +2 −0
python/ext/aubiomodule.c +0 −1
python/lib/gen_external.py +13 −5
python/lib/moresetuptools.py +30 −0
python/setup.py +13 −16

@@ -1,6 +1,8 @@
1	#include <Python.h>	1	#include <Python.h>
2	#include <structmember.h>	2	#include <structmember.h>
3		3
		4	#include "aubio-generated.h"
		5
4	#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION	6	#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
5		7
6	// define numpy unique symbols for aubio	8	// define numpy unique symbols for aubio

python/ext/aubiomodule.c+0−1

@@ -1,6 +1,5 @@
1	#define PY_AUBIO_MODULE_MAIN	1	#define PY_AUBIO_MODULE_MAIN
2	#include "aubio-types.h"	2	#include "aubio-types.h"
3	#include "aubio-generated.h"
4	#include "py-musicutils.h"	3	#include "py-musicutils.h"
5		4
6	static char aubio_module_doc[] = "Python module for the aubio library";	5	static char aubio_module_doc[] = "Python module for the aubio library";

python/lib/gen_external.py+13−5

-import os
+import os, glob
 header = """// this file is generated! do not modify
 #include "aubio-types.h"
     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()
     lib = {}
         sources_list.append(output_file)
     objlist = "".join(["extern PyTypeObject Py_%sType;\n" % p for p in lib])
-    out = """
+    out = """// generated list of objects created with gen_external.py
-// generated list of objects created with gen_external.py
-#include <Python.h>
+#include <Python.h>
+"""
+    if usedouble:
+        out += """
+#ifndef HAVE_AUBIO_DOUBLE
+#define HAVE_AUBIO_DOUBLE 1
+#endif
+"""
+    out += """
 {objlist}
 int generated_objects ( void );
 void add_generated_objects( PyObject *m );

python/lib/moresetuptools.py+30−0

@@ -0,0 +1,30 @@
	1	import distutils, os, subprocess
	2	import setuptools.command.build_py
	3	import distutils.command.clean
	4	from distutils.dir_util import remove_tree
	5
	6	class CleanGenerated(distutils.command.clean.clean):
	7	def run(self):
	8	remove_tree('gen')
	9	distutils.command.clean.clean.run(self)
	10
	11	class GenerateCommand(distutils.cmd.Command):
	12	description = 'generate gen/gen-*.c files from ../src/aubio.h'
	13	user_options = [
	14	# The format is (long option, short option, description).
	15	('enable-double', None, 'use HAVE_AUBIO_DOUBLE=1 (default: 0)'),
	16	]
	17
	18	def initialize_options(self):
	19	self.enable_double = False
	20
	21	def finalize_options(self):
	22	if self.enable_double:
	23	self.announce(
	24	'will generate code for aubio compiled with HAVE_AUBIO_DOUBLE=1',
	25	level=distutils.log.INFO)
	26
	27	def run(self):
	28	self.announce( 'Generating code', level=distutils.log.INFO)
	29	from .gen_external import generate_external
	30	generated_object_files = generate_external('gen', usedouble = self.enable_double)

python/setup.py+13−16

 #! /usr/bin/env python
-from setuptools import setup, Extension
+from setuptools import setup, Extension, Command
+from lib.moresetuptools import CleanGenerated, GenerateCommand
 import sys
 import os.path
         ([str(x) for x in [AUBIO_MAJOR_VERSION, AUBIO_MINOR_VERSION, AUBIO_PATCH_VERSION]]) \
         + AUBIO_VERSION_STATUS
+# function to generate gen/*.{c,h}
+from lib.gen_external import generate_external
+output_path = 'gen'
 include_dirs = []
 library_dirs = []
 define_macros = []
 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'):
     define_macros += [('USE_LOCAL_AUBIO', 1)]
     include_dirs += ['../src'] # aubio.h
     "ext/py-phasevoc.c",
     "ext/py-source.c",
     "ext/py-sink.c",
-    # generated files
+    # generate files if they don't exit
-    ] + generated_object_files,
+    ] + generate_external(output_path, overwrite = False),
     include_dirs = include_dirs,
     library_dirs = library_dirs,
     extra_link_args = extra_link_args,
     platforms = 'any',
     classifiers = classifiers,
     install_requires = ['numpy'],
+    cmdclass = {
+        'clean': CleanGenerated,
+        'generate': GenerateCommand,
+        }
     )

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code