Changeset 5b896e0 for src

Timestamp:

Sep 2, 2015, 2:44:22 PM (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, pitchshift, sampler, timestretch, yinfft+

Children:

1dd95c7

Parents:

98d8d2b

Message:

src/fvec.c: Accelerate fvec_set_all, fvec_zeros, fvec_weight, fvec_copy

File:

• src/fvec.c (modified) (6 diffs)

src/fvec.c

@@ -21 +21 @@
 #include "aubio_priv.h"
 #include "fvec.h"
+
+#ifdef HAVE_ACCELERATE
+#include <Accelerate/Accelerate.h>
+#endif
 
 fvec_t * new_fvec( uint_t length) {
@@ -61 +65 @@
 
 void fvec_set_all (fvec_t *s, smpl_t val) {
+#ifndef HAVE_ACCELERATE
   uint_t j;
   for (j=0; j< s->length; j++) {
     s->data[j] = val;
   }
+#else
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_vfill(&val, s->data, 1, s->length);
+#else /* HAVE_AUBIO_DOUBLE */
+  vDSP_vfillD(&val, s->data, 1, s->length);
+#endif /* HAVE_AUBIO_DOUBLE */
+#endif
 }
 
 void fvec_zeros(fvec_t *s) {
+#ifndef HAVE_ACCELERATE
 #if HAVE_MEMCPY_HACKS
   memset(s->data, 0, s->length * sizeof(smpl_t));
 #else
   fvec_set_all (s, 0.);
+#endif
+#else
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_vclr(s->data, 1, s->length);
+#else /* HAVE_AUBIO_DOUBLE */
+  vDSP_vclrD(s->data, 1, s->length);
+#endif /* HAVE_AUBIO_DOUBLE */
 #endif
 }
@@ -87 +107 @@
 
 void fvec_weight(fvec_t *s, fvec_t *weight) {
+#ifndef HAVE_ACCELERATE
   uint_t j;
   uint_t length = MIN(s->length, weight->length);
@@ -92 +113 @@
     s->data[j] *= weight->data[j];
   }
+#else
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_vmul(s->data, 1, weight->data, 1, s->data, 1, s->length);
+#else /* HAVE_AUBIO_DOUBLE */
+  vDSP_vmulD(s->data, 1, weight->data, 1, s->data, 1, s->length);
+#endif /* HAVE_AUBIO_DOUBLE */
+#endif /* HAVE_ACCELERATE */
 }
 
@@ -100 +128 @@
     return;
   }
+#ifndef HAVE_ACCELERATE
 #if HAVE_MEMCPY_HACKS
   memcpy(t->data, s->data, t->length * sizeof(smpl_t));
@@ -108 +137 @@
   }
 #endif
+#else
+#if !HAVE_AUBIO_DOUBLE
+  vDSP_mmov(s->data, t->data, 1, s->length, 1, 1);
+#else /* HAVE_AUBIO_DOUBLE */
+  vDSP_mmovD(s->data, t->data, 1, s->length, 1, 1);
+#endif /* HAVE_AUBIO_DOUBLE */
+#endif /* HAVE_ACCELERATE */
 }