Changeset 4b943729 for src/mathutils.c

Timestamp:

Oct 1, 2017, 3:30:10 PM (7 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

Children:

0ad2e17

Parents:

95f5c83

Message:

src/aubio_priv.h: define ipp aliases for single/double precision, use them in cvec and fvec

File:

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

src/mathutils.c

@@ -161 +161 @@
   smpl_t tmp = 0.0;
 #if defined(HAVE_INTEL_IPP)
-  #if HAVE_AUBIO_DOUBLE
-    ippsMean_64f(s->data, (int)s->length, &tmp);
-  #else
-    ippsMean_32f(s->data, (int)s->length, &tmp, ippAlgHintFast);
-  #endif
-    return tmp;
+  aubio_ippsMean(s->data, (int)s->length, &tmp, ippAlgHintFast);
+  return tmp;
 #elif defined(HAVE_ACCELERATE)
   aubio_vDSP_meanv(s->data, 1, &tmp, s->length);
@@ -184 +180 @@
   smpl_t tmp = 0.0;
 #if defined(HAVE_INTEL_IPP)
-  #if HAVE_AUBIO_DOUBLE
-    ippsSum_64f(s->data, (int)s->length, &tmp);
-  #else
-    ippsSum_32f(s->data, (int)s->length, &tmp, ippAlgHintFast);
-  #endif
+  aubio_ippsSum(s->data, (int)s->length, &tmp, ippAlgHintFast);
 #elif defined(HAVE_ACCELERATE)
   aubio_vDSP_sve(s->data, 1, &tmp, s->length);
@@ -205 +197 @@
 #if defined(HAVE_INTEL_IPP)
   smpl_t tmp = 0.;
-  #if HAVE_AUBIO_DOUBLE
-    ippsMax_64f( s->data, (int)s->length, &tmp);
-  #else
-    ippsMax_32f( s->data, (int)s->length, &tmp);
-#endif
+  aubio_ippsMax( s->data, (int)s->length, &tmp);
 #elif defined(HAVE_ACCELERATE)
   smpl_t tmp = 0.;
@@ -228 +216 @@
 #if defined(HAVE_INTEL_IPP)
   smpl_t tmp = 0.;
-  #if HAVE_AUBIO_DOUBLE
-    ippsMin_64f(s->data, (int)s->length, &tmp);
-  #else
-    ippsMin_32f(s->data, (int)s->length, &tmp);
-#endif
+  aubio_ippsMin(s->data, (int)s->length, &tmp);
 #elif defined(HAVE_ACCELERATE)
   smpl_t tmp = 0.;