Changeset 3d14829

Timestamp:

Dec 2, 2016, 1:03:41 PM (8 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, sampler, yinfft+

Children:

473ab11

Parents:

bee6e96

Message:

python/lib/moresetuptools.py: also check for HAVE_AUBIO_DOUBLE

Files:

• .travis.yml (modified) (1 diff)
• Makefile (modified) (5 diffs)
• python/lib/gen_external.py (modified) (2 diffs)
• python/lib/moresetuptools.py (modified) (2 diffs)

.travis.yml

@@ -30 +30 @@
       os: linux
       compiler: gcc
-      env: ARCH=x86_64 HAVE_DOUBLE=1 WAFOPTS=--enable-fftw3
+      env: ARCH=x86_64 HAVE_AUBIO_DOUBLE=1 WAFOPTS=--enable-fftw3
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=i386 HAVE_DOUBLE=1
+      env: ARCH=i386 HAVE_AUBIO_DOUBLE=1
     - python: 3.4
       os: linux
       compiler: gcc
-      env: ARCH=x86_64 HAVE_DOUBLE=1
+      env: ARCH=x86_64 HAVE_AUBIO_DOUBLE=1
     - python: 3.4
       os: linux
       compiler: gcc
-      env: ARCH=i386 HAVE_DOUBLE=1
+      env: ARCH=i386 HAVE_AUBIO_DOUBLE=1
     - language: C
       os: osx

Makefile

@@ -9 +9 @@
 # multiple jobs
 WAFOPTS += --jobs 4
+# if HAVE_AUBIO_DOUBLE is defined, pass --enable-double to waf
+# python/lib/moresetuptools.py also checks for HAVE_AUBIO_DOUBLE
+WAFOPTS += $(shell [ -z $(HAVE_AUBIO_DOUBLE) ] || echo --enable-double )
 
 DESTDIR:=$(PWD)/build/dist
@@ -23 +26 @@
 SOX=sox
 
-ENABLE_DOUBLE := $(shell [ -z $(HAVE_DOUBLE) ] || echo --enable-double )
 TESTSOUNDS := python/tests/sounds
 
@@ -45 +47 @@
 
 configure: checkwaf
-        $(WAFCMD) configure $(WAFOPTS) $(ENABLE_DOUBLE)
+        $(WAFCMD) configure $(WAFOPTS)
 
 build: configure
@@ -82 +84 @@
 build_python:
         # build python-aubio, using locally built libaubio if found
-        python ./setup.py build_ext $(ENABLE_DOUBLE)
+        python ./setup.py build
 
 build_python_extlib:
@@ -163 +165 @@
 
 distcheck: checkwaf
-        $(WAFCMD) distcheck $(WAFOPTS) $(ENABLE_DOUBLE)
+        $(WAFCMD) distcheck $(WAFOPTS)
 
 help:

python/lib/gen_external.py

@@ -76 +76 @@
     return cpp_cmd
 
-def get_cpp_objects(header=header):
+def get_cpp_objects(header=header, usedouble=False):
     cpp_cmd = get_preprocessor()
 
     macros = [('AUBIO_UNSTABLE', 1)]
+    if usedouble:
+        macros += [('HAVE_AUBIO_DOUBLE', 1)]
 
     if not os.path.isfile(header):
@@ -177 +179 @@
     elif not overwrite: return sorted(glob.glob(os.path.join(output_path, '*.c')))
 
-    cpp_output, cpp_objects = get_cpp_objects(header)
+    cpp_output, cpp_objects = get_cpp_objects(header, usedouble=usedouble)
 
     lib = analyze_cpp_output(cpp_objects, cpp_output)

python/lib/moresetuptools.py

@@ -152 +152 @@
 
     def build_extension(self, extension):
-        if self.enable_double:
+        if self.enable_double or 'HAVE_AUBIO_DOUBLE' in os.environ:
             extension.define_macros += [('HAVE_AUBIO_DOUBLE', 1)]
+            enable_double = True
+        else:
+            enable_double = False
         # seack for aubio headers and lib in PKG_CONFIG_PATH
         add_system_aubio(extension)
@@ -167 +170 @@
             else:
                 # check for external dependencies
-                add_external_deps(extension, usedouble=self.enable_double)
+                add_external_deps(extension, usedouble=enable_double)
                 # add libaubio sources and look for optional deps with pkg-config
-                add_local_aubio_sources(extension, usedouble=self.enable_double)
+                add_local_aubio_sources(extension, usedouble=enable_double)
         # generate files python/gen/*.c, python/gen/aubio-generated.h
         extension.sources += generate_external(header, output_path, overwrite = False,
-                usedouble=self.enable_double)
+                usedouble=enable_double)
         return _build_ext.build_extension(self, extension)