Changeset 630191c


Ignore:
Timestamp:
Sep 21, 2018, 5:50:03 PM (10 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master
Children:
fe05d1f
Parents:
5447a26
Message:

src/aubio_priv.h: split BLAS and ATLAS support

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/aubio_priv.h

    r5447a26 r630191c  
    7171#endif
    7272
    73 #ifdef HAVE_ACCELERATE
     73#if defined(HAVE_ACCELERATE)
    7474#define HAVE_ATLAS 1
     75#define HAVE_BLAS 1
    7576#include <Accelerate/Accelerate.h>
    7677#elif defined(HAVE_ATLAS_CBLAS_H)
     78#elif defined(HAVE_BLAS)
     79#if defined(HAVE_ATLAS_CBLAS_H)
    7780#define HAVE_ATLAS 1
    7881#include <atlas/cblas.h>
     82#elif defined(HAVE_OPENBLAS_CBLAS_H)
     83#include <openblas/cblas.h>
     84#elif defined(HAVE_CBLAS_H)
     85#include <cblas.h>
     86#endif
    7987#endif
    8088
     
    112120#endif /* HAVE_ACCELERATE */
    113121
     122#if defined(HAVE_BLAS)
     123#ifndef HAVE_AUBIO_DOUBLE
    114124#ifdef HAVE_ATLAS
    115 #ifndef HAVE_AUBIO_DOUBLE
    116125#define aubio_catlas_set      catlas_sset
     126#endif /* HAVE_ATLAS */
    117127#define aubio_cblas_copy      cblas_scopy
    118128#define aubio_cblas_swap      cblas_sswap
    119129#define aubio_cblas_dot       cblas_sdot
    120130#else /* HAVE_AUBIO_DOUBLE */
     131#ifdef HAVE_ATLAS
    121132#define aubio_catlas_set      catlas_dset
     133#endif /* HAVE_ATLAS */
    122134#define aubio_cblas_copy      cblas_dcopy
    123135#define aubio_cblas_swap      cblas_dswap
    124136#define aubio_cblas_dot       cblas_ddot
    125137#endif /* HAVE_AUBIO_DOUBLE */
    126 #endif /* HAVE_ATLAS */
     138#endif /* HAVE_BLAS */
    127139
    128140#if defined HAVE_INTEL_IPP
  • src/fmat.c

    r5447a26 r630191c  
    161161  assert(s->length == scale->length);
    162162#endif
    163 #if !defined(HAVE_ACCELERATE) && !defined(HAVE_ATLAS)
     163#if !defined(HAVE_ACCELERATE) && !defined(HAVE_BLAS)
    164164  uint_t j;
    165165  fvec_zeros(output);
  • src/fvec.c

    r5447a26 r630191c  
    135135#if defined(HAVE_INTEL_IPP)
    136136  aubio_ippsCopy(s->data, t->data, (int)s->length);
    137 #elif defined(HAVE_ATLAS)
     137#elif defined(HAVE_BLAS)
    138138  aubio_cblas_copy(s->length, s->data, 1, t->data, 1);
    139139#elif defined(HAVE_ACCELERATE)
  • src/mathutils.c

    r5447a26 r630191c  
    272272  // if length is odd, middle element is moved to the end
    273273  if (2 * half < s->length) start ++;
    274 #ifndef HAVE_ATLAS
     274#ifndef HAVE_BLAS
    275275  for (j = 0; j < half; j++) {
    276276    ELEM_SWAP (s->data[j], s->data[j + start]);
     
    292292  // if length is odd, middle element is moved to the beginning
    293293  if (2 * half < s->length) start ++;
    294 #ifndef HAVE_ATLAS
     294#ifndef HAVE_BLAS
    295295  for (j = 0; j < half; j++) {
    296296    ELEM_SWAP (s->data[j], s->data[j + start]);
     
    329329{
    330330  smpl_t energy = 0.;
    331 #ifndef HAVE_ATLAS
     331#ifndef HAVE_BLAS
    332332  uint_t j;
    333333  for (j = 0; j < f->length; j++) {
Note: See TracChangeset for help on using the changeset viewer.