Changeset 7c07af2

Timestamp:

Oct 16, 2013, 1:21:29 AM (11 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, pitchshift, sampler, timestretch, yinfft+

Children:

cdd24f0

Parents:

7609f6d

Message:

src/mathutils.c: use vDSP if available

File:

• src/mathutils.c (modified) (9 diffs)

src/mathutils.c

@@ -27 +27 @@
 #include "config.h"
 
+#ifdef HAVE_ACCELERATE
+#include <Accelerate/Accelerate.h>
+#endif
 
 /** Window types */
@@ -170 +173 @@
 fvec_max (fvec_t * s)
 {
+#ifndef HAVE_ACCELERATE
   uint_t j;
   smpl_t tmp = 0.0;
@@ -175 +179 @@
     tmp = (tmp > s->data[j]) ? tmp : s->data[j];
   }
+#else
+  smpl_t tmp = 0.;
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_maxv(s->data, 1, &tmp, s->length);
+#else
+  vDSP_maxvD(s->data, 1, &tmp, s->length);
+#endif
+#endif
   return tmp;
 }
@@ -181 +193 @@
 fvec_min (fvec_t * s)
 {
+#ifndef HAVE_ACCELERATE
   uint_t j;
   smpl_t tmp = s->data[0];
@@ -186 +199 @@
     tmp = (tmp < s->data[j]) ? tmp : s->data[j];
   }
+#else
+  smpl_t tmp = 0.;
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_minv(s->data, 1, &tmp, s->length);
+#else
+  vDSP_minvD(s->data, 1, &tmp, s->length);
+#endif
+#endif
   return tmp;
 }
@@ -192 +213 @@
 fvec_min_elem (fvec_t * s)
 {
+#ifndef HAVE_ACCELERATE
   uint_t j, pos = 0.;
   smpl_t tmp = s->data[0];
@@ -198 +220 @@
     tmp = (tmp < s->data[j]) ? tmp : s->data[j];
   }
+#else
+  smpl_t tmp = 0.;
+  uint_t pos = 0.;
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_minvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#else
+  vDSP_minviD(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#endif
+#endif
   return pos;
 }
@@ -204 +235 @@
 fvec_max_elem (fvec_t * s)
 {
+#ifndef HAVE_ACCELERATE
   uint_t j, pos = 0;
   smpl_t tmp = 0.0;
@@ -210 +242 @@
     tmp = (tmp > s->data[j]) ? tmp : s->data[j];
   }
+#else
+  smpl_t tmp = 0.;
+  uint_t pos = 0.;
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_maxvi(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#else
+  vDSP_maxviD(s->data, 1, &tmp, (vDSP_Length *)&pos, s->length);
+#endif
+#endif
   return pos;
 }