Changeset 81b3910 for wscript


Ignore:
Timestamp:
Oct 1, 2017, 12:50:15 PM (2 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master
Children:
a6b5bf1
Parents:
16c12a1 (diff), faeec7c (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 'intel_ipp_pull' of https://github.com/emuell/aubio into emuell-intel_ipp_pull

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    r16c12a1 r81b3910  
    5151            help_str = 'compile with fftw3 instead of ooura',
    5252            help_disable_str = 'do not compile with fftw3')
     53    add_option_enable_disable(ctx, 'intelipp', default = None,
     54            help_str = 'use Intel IPP libraries (auto)',
     55            help_disable_str = 'do not use Intel IPP libraries')
    5356    add_option_enable_disable(ctx, 'complex', default = False,
    5457            help_str ='compile with C99 complex',
     
    156159        # configure warnings
    157160        ctx.env.CFLAGS += ['/W4', '/D_CRT_SECURE_NO_WARNINGS']
     161        # ignore "possible loss of data" warnings
     162        ctx.env.CFLAGS += ['/wd4305', '/wd4244', '/wd4245', '/wd4267']
     163        # ignore "unreferenced formal parameter" warnings
     164        ctx.env.CFLAGS += ['/wd4100']
    158165        # set optimization level and runtime libs
    159166        if (ctx.options.build_type == "release"):
     
    283290    else:
    284291        ctx.msg('Checking if complex.h is enabled', 'no')
    285 
     292   
     293    # check for Intel IPP
     294    if (ctx.options.enable_intelipp != False):
     295        if (ctx.check(header_name=['ippcore.h', 'ippvm.h', 'ipps.h'], mandatory = False) and
     296            ctx.check(lib=['ippcore', 'ippvm', 'ipps'], uselib_store='INTEL_IPP', mandatory = False)):
     297            ctx.msg('Checking if Intel IPP is available', 'yes')
     298            ctx.define('HAVE_INTEL_IPP', 1)
     299            if ctx.env.CC_NAME == 'msvc':
     300                # force linking multi-threaded static IPP libraries on Windows with msvc
     301                ctx.define('_IPP_SEQUENTIAL_STATIC', 1)
     302        else:
     303            ctx.msg('Checking if Intel IPP is available', 'no')
     304   
    286305    # check for fftw3
    287306    if (ctx.options.enable_fftw3 != False or ctx.options.enable_fftw3f != False):
     
    307326        ctx.define('HAVE_FFTW3', 1)
    308327
    309     # fftw not enabled, use vDSP or ooura
     328    # fftw not enabled, use vDSP, intelIPP or ooura
    310329    if 'HAVE_FFTW3F' in ctx.env.define_key:
    311330        ctx.msg('Checking for FFT implementation', 'fftw3f')
     
    314333    elif 'HAVE_ACCELERATE' in ctx.env.define_key:
    315334        ctx.msg('Checking for FFT implementation', 'vDSP')
     335    elif 'HAVE_INTEL_IPP' in ctx.env.define_key:
     336        ctx.msg('Checking for FFT implementation', 'Intel IPP')
    316337    else:
    317338        ctx.msg('Checking for FFT implementation', 'ooura')
Note: See TracChangeset for help on using the changeset viewer.