Changeset 3d30b90

Timestamp:

Sep 6, 2015, 10:48:24 AM (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, sampler

Children:

34e505f

Parents:

695e171 (diff), f0ce36a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into awhitening

Files:

• examples/wscript_build (modified) (1 diff)
• src/wscript_build (modified) (1 diff)
• tests/wscript_build (modified) (1 diff)
• wscript (modified) (2 diffs)

examples/wscript_build

@@ -10 +10 @@
 uselib += ['AVUTIL']
 uselib += ['JACK']
+uselib += ['BLAS']
 
 utils_source = ['utils.c', 'jackio.c']

src/wscript_build

@@ -9 +9 @@
 uselib += ['AVRESAMPLE']
 uselib += ['AVUTIL']
+uselib += ['BLAS']
 
 # build each source files

tests/wscript_build

@@ -11 +11 @@
     uselib += ['AVUTIL']
     uselib += ['JACK']
+    uselib += ['BLAS']
     includes = ['../src', '.']
     extra_source = []

wscript

@@ -82 +82 @@
             help_str = 'use CoreFoundation (darwin only) (auto)',
             help_disable_str = 'do not use CoreFoundation framework')
+    add_option_enable_disable(ctx, 'atlas', default = None,
+            help_str = 'use Atlas library (auto)',
+            help_disable_str = 'do not use Atlas library')
 
     ctx.add_option('--with-target-platform', type='string',
@@ -260 +263 @@
     ctx.define('HAVE_WAVWRITE', 1)
 
+    # use ATLAS
+    if (ctx.options.enable_atlas != False):
+        ctx.check(header_name = 'atlas/cblas.h', mandatory = ctx.options.enable_atlas)
+        #ctx.check(lib = 'lapack', uselib_store = 'LAPACK', mandatory = ctx.options.enable_atlas)
+        ctx.check(lib = 'cblas', uselib_store = 'BLAS', mandatory = ctx.options.enable_atlas)
+
     # use memcpy hacks
     if (ctx.options.enable_memcpy == True):