Changes in / [057ecee:65a4fb4]

Files:

• python/lib/moresetuptools.py (modified) (2 diffs)
• scripts/get_crepe.sh (deleted)
• src/ai/batchnorm.c (deleted)
• src/ai/batchnorm.h (deleted)
• src/ai/conv1d.c (deleted)
• src/ai/conv1d.h (deleted)
• src/ai/conv2d.c (deleted)
• src/ai/conv2d.h (deleted)
• src/ai/dense.c (deleted)
• src/ai/dense.h (deleted)
• src/ai/maxpool1d.c (deleted)
• src/ai/maxpool1d.h (deleted)
• src/ai/maxpool2d.c (deleted)
• src/ai/maxpool2d.h (deleted)
• src/ai/tensor.c (deleted)
• src/ai/tensor.h (deleted)
• src/aubio_priv.h (modified) (3 diffs)
• src/fmat.c (modified) (6 diffs)
• src/fmat.h (modified) (1 diff)
• src/fvec.c (modified) (1 diff)
• src/fvec.h (modified) (1 diff)
• src/io/file_hdf5.c (deleted)
• src/io/file_hdf5.h (deleted)
• src/pitch/pitch.c (modified) (9 diffs)
• src/pitch/pitch_crepe.c (deleted)
• src/wscript_build (modified) (1 diff)
• tests/src/ai/test-tensor.c (deleted)
• wscript (modified) (2 diffs)

python/lib/moresetuptools.py

@@ -80 +80 @@
                 'libswresample', 'libavresample',
                 'sndfile',
-                'hdf5',
                 #'fftw3f',
                ]
@@ -105 +104 @@
         ext.define_macros += [('HAVE_FFTW3F', 1)]
         ext.define_macros += [('HAVE_FFTW3', 1)]
-    if 'hdf5' in ext.libraries:
-        ext.libraries += ['hdf5_hl']
-        ext.define_macros += [('HAVE_HDF5', 1)]
 
     # add accelerate on darwin

src/aubio_priv.h

@@ -134 +134 @@
 #define aubio_cblas_swap      cblas_sswap
 #define aubio_cblas_dot       cblas_sdot
-#define aubio_cblas__gemv     cblas_sgemv
 #else /* HAVE_AUBIO_DOUBLE */
 #ifdef HAVE_ATLAS
@@ -142 +141 @@
 #define aubio_cblas_swap      cblas_dswap
 #define aubio_cblas_dot       cblas_ddot
-#define aubio_cblas__gemv     cblas_dgemv
 #endif /* HAVE_AUBIO_DOUBLE */
 #endif /* HAVE_BLAS */
@@ -401 +399 @@
 #endif /* DEBUG */
 
-// goto to failure if condition x is not true
-#define AUBIO_GOTO_FAILURE(x) if (!(x)) goto failure
-
-#define AUBIO_ASSERT_EQUAL_SHAPE(t1, t2) { \
-    AUBIO_ASSERT(t1 && t2); \
-    AUBIO_ASSERT(t1->ndim == t2->ndim); \
-    uint_t nn; \
-    for (nn = 0; nn < t1->ndim; nn++) \
-      AUBIO_ASSERT(t1->shape[nn] == t2->shape[nn]); \
-    }
-
 #endif /* AUBIO_PRIV_H */

src/fmat.c

@@ -24 +24 @@
 fmat_t * new_fmat (uint_t height, uint_t length) {
   fmat_t * s;
-  uint_t i;
+  uint_t i,j;
   if ((sint_t)length <= 0 || (sint_t)height <= 0 ) {
     return NULL;
@@ -32 +32 @@
   s->length = length;
   s->data = AUBIO_ARRAY(smpl_t*,s->height);
-  s->data[0] = AUBIO_ARRAY(smpl_t, s->length * s->height);
-  for (i=1; i< s->height; i++) {
-    s->data[i] = s->data[0] + i * s->length;
+  for (i=0; i< s->height; i++) {
+    s->data[i] = AUBIO_ARRAY(smpl_t, s->length);
+    for (j=0; j< s->length; j++) {
+      s->data[i][j]=0.;
+    }
   }
   return s;
@@ -40 +42 @@
 
 void del_fmat (fmat_t *s) {
-  AUBIO_ASSERT(s);
-  if (s->data[0])
-    AUBIO_FREE(s->data[0]);
-  if (s->data)
-    AUBIO_FREE(s->data);
+  uint_t i;
+  for (i=0; i<s->height; i++) {
+    AUBIO_FREE(s->data[i]);
+  }
+  AUBIO_FREE(s->data);
   AUBIO_FREE(s);
 }
@@ -154 +156 @@
 
 void fmat_vecmul(const fmat_t *s, const fvec_t *scale, fvec_t *output) {
+  uint_t k;
+#if 0
+  assert(s->height == output->length);
+  assert(s->length == scale->length);
+#endif
 #if !defined(HAVE_ACCELERATE) && !defined(HAVE_BLAS)
-  uint_t j, k;
-  AUBIO_ASSERT(s->height == output->length);
-  AUBIO_ASSERT(s->length == scale->length);
+  uint_t j;
   fvec_zeros(output);
   for (j = 0; j < s->length; j++) {
     for (k = 0; k < s->height; k++) {
-      output->data[k] += scale->data[j] * s->data[k][j];
+      output->data[k] += scale->data[j]
+          * s->data[k][j];
     }
   }
 #elif defined(HAVE_BLAS)
-#if 0
   for (k = 0; k < s->height; k++) {
     output->data[k] = aubio_cblas_dot( s->length, scale->data, 1, s->data[k], 1);
   }
-#else
-  aubio_cblas__gemv(CblasColMajor, CblasTrans,
-      s->length, s->height, 1.,
-      s->data[0], s->length,
-      scale->data, 1, 0.,
-      output->data, 1);
-#endif
 #elif defined(HAVE_ACCELERATE)
 #if 0
@@ -181 +179 @@
   vDSP_mmul (s->data[0], 1, scale->data, 1, output->data, 1, s->height, 1, s->length);
 #else
-  uint_t k;
   for (k = 0; k < s->height; k++) {
     aubio_vDSP_dotpr( scale->data, 1, s->data[k], 1, &(output->data[k]), s->length);
@@ -188 +185 @@
 #endif
 }
-
-void fvec_matmul(const fvec_t *scale, const fmat_t *s, fvec_t *output) {
-  AUBIO_ASSERT(s->height == scale->length);
-  AUBIO_ASSERT(s->length == output->length);
-#if !defined(HAVE_ACCELERATE) && !defined(HAVE_BLAS)
-  uint_t j, k;
-  fvec_zeros(output);
-  for (k = 0; k < s->height; k++) {
-    for (j = 0; j < s->length; j++) {
-      output->data[j] += s->data[k][j] * scale->data[k];
-    }
-  }
-#elif defined(HAVE_BLAS)
-#if 0
-  for (k = 0; k < s->length; k++) {
-    output->data[k] = aubio_cblas_dot( scale->length, scale->data, 1,
-        &s->data[0][0] + k, s->length);
-  }
-#else
-  aubio_cblas__gemv(CblasColMajor, CblasNoTrans,
-      s->length, s->height, 1.,
-      s->data[0], s->length,
-      scale->data, 1, 0.,
-      output->data, 1);
-#endif
-#elif defined(HAVE_ACCELERATE)
-#if 0
-  // seems slower and less precise (and dangerous?)
-  vDSP_mmul (s->data[0], 1, scale->data, 1, output->data, 1, s->height, 1, s->length);
-#else
-  uint_t k;
-  for (k = 0; k < s->height; k++) {
-    aubio_vDSP_dotpr( scale->data, 1, s->data[k], 1, &(output->data[k]), scale->length);
-  }
-#endif
-#endif
-}

src/fmat.h

@@ -161 +161 @@
    \param s matrix to compute product with
    \param scale vector to compute product with
-   \param output vector of results
-
+   \param output vector to store restults in
 
 */
 void fmat_vecmul(const fmat_t *s, const fvec_t *scale, fvec_t *output);
-
-/** compute the product of a vector by a matrix
-
-   \param s matrix to compute product with
-   \param scale input to compute product with
-   \param output vector of results
-
-*/
-void fvec_matmul(const fvec_t *scale, const fmat_t *s, fvec_t *output);
 
 #ifdef __cplusplus

src/fvec.c

@@ -99 +99 @@
 }
 
-void fvec_vecadd(fvec_t *s, const fvec_t *bias) {
-  uint_t j;
-  uint_t length = MIN(s->length, bias->length);
-  for (j = 0; j < length; j++) {
-    s->data[j] += bias->data[j];
-  }
-}
-
 void fvec_weight(fvec_t *s, const fvec_t *weight) {
   uint_t length = MIN(s->length, weight->length);

src/fvec.h

@@ -144 +144 @@
 void fvec_rev(fvec_t *s);
 
-/** add a vector b to vector a, modifying a
-
-  \param a  input vector to add b to
-  \param b  input vector of the values to be added to a
-
-  Upon return, he content of a[i] will be set to a[i] + b[i].
-
-*/
-void fvec_vecadd(fvec_t *a, const fvec_t *b);
-
 /** apply weight to vector
 

src/pitch/pitch.c

@@ -49 +49 @@
   aubio_pitcht_yinfast,    /**< `yinfast`, YIN fast */
   aubio_pitcht_specacf,    /**< `specacf`, Spectral autocorrelation */
-  aubio_pitcht_crepe,      /**< `crepe`, convolutional neural network */
   aubio_pitcht_default
     = aubio_pitcht_yinfft, /**< `default` */
@@ -100 +99 @@
 static void aubio_pitch_do_yinfast (aubio_pitch_t * p, const fvec_t * ibuf, fvec_t * obuf);
 static void aubio_pitch_do_specacf (aubio_pitch_t * p, const fvec_t * ibuf, fvec_t * obuf);
-static void aubio_pitch_do_crepe (aubio_pitch_t * p, const fvec_t * ibuf, fvec_t * obuf);
 
 /* internal functions for frequency conversion */
@@ -106 +104 @@
 static smpl_t freqconvmidi (smpl_t f, uint_t samplerate, uint_t bufsize);
 static smpl_t freqconvpass (smpl_t f, uint_t samplerate, uint_t bufsize);
-
-typedef struct _aubio_pitch_crepe_t aubio_pitch_crepe_t;
-extern aubio_pitch_crepe_t *new_aubio_pitch_crepe(void);
-extern void aubio_pitch_crepe_do(aubio_pitch_crepe_t *t, fvec_t *input, fvec_t *out);
-extern void del_aubio_pitch_crepe(aubio_pitch_crepe_t *t);
-extern smpl_t aubio_pitch_crepe_get_confidence (aubio_pitch_crepe_t * o);
-uint_t aubio_pitch_crepe_set_tolerance(aubio_pitch_crepe_t * o, smpl_t
-    tolerance);
-smpl_t aubio_pitch_crepe_get_tolerance (aubio_pitch_crepe_t * o);
 
 /* adapter to stack ibuf new samples at the end of buf, and trim `buf` to `bufsize` */
@@ -144 +133 @@
   else if (strcmp (pitch_mode, "specacf") == 0)
     pitch_type = aubio_pitcht_specacf;
-  else if (strcmp (pitch_mode, "crepe") == 0)
-    pitch_type = aubio_pitcht_crepe;
   else if (strcmp (pitch_mode, "default") == 0)
     pitch_type = aubio_pitcht_default;
@@ -227 +214 @@
       aubio_pitchspecacf_set_tolerance (p->p_object, 0.85);
       break;
-    case aubio_pitcht_crepe:
-      // TODO add resampling and blocking
-      if (samplerate != 16000) {
-        AUBIO_ERROR("pitch: crepe samplerate must be 16000Hz, got %d\n",
-            samplerate);
-        goto beach;
-      }
-      if (bufsize != 1024) {
-        AUBIO_ERROR("pitch: crepe buffer size must be 1024, got %d\n",
-            bufsize);
-        goto beach;
-      }
-      p->buf = new_fvec (bufsize);
-      p->p_object = new_aubio_pitch_crepe();
-      if (!p->p_object) goto beach;
-      p->detect_cb = aubio_pitch_do_crepe;
-      p->conf_cb = (aubio_pitch_get_conf_t)aubio_pitch_crepe_get_confidence;
-      //aubio_pitch_crepe_set_tolerance (p->p_object, 0.85);
-      break;
     default:
       break;
@@ -292 +260 @@
       del_fvec (p->buf);
       del_aubio_pitchspecacf (p->p_object);
-      break;
-    case aubio_pitcht_crepe:
-      del_fvec (p->buf);
-      del_aubio_pitch_crepe (p->p_object);
       break;
     default:
@@ -386 +350 @@
       aubio_pitchyinfast_set_tolerance (p->p_object, tol);
       break;
-    case aubio_pitcht_crepe:
-      aubio_pitch_crepe_set_tolerance (p->p_object, tol);
-      break;
     default:
       break;
@@ -408 +369 @@
     case aubio_pitcht_yinfast:
       tolerance = aubio_pitchyinfast_get_tolerance (p->p_object);
-      break;
-    case aubio_pitcht_crepe:
-      tolerance = aubio_pitch_crepe_get_tolerance (p->p_object);
       break;
     default:
@@ -521 +479 @@
 
 void
-aubio_pitch_do_crepe (aubio_pitch_t * p, const fvec_t * ibuf, fvec_t * out)
-{
-  //smpl_t pitch = 0., period;
-  aubio_pitch_slideblock (p, ibuf);
-  aubio_pitch_crepe_do(p->p_object, p->buf, out);
-  out->data[0] = aubio_miditofreq(out->data[0]);
-}
-
-void
 aubio_pitch_do_fcomb (aubio_pitch_t * p, const fvec_t * ibuf, fvec_t * out)
 {

src/wscript_build

@@ -13 +13 @@
 uselib += ['AVUTIL']
 uselib += ['BLAS']
-uselib += ['HDF5', 'HDF5_HL']
 
 source = ctx.path.ant_glob('*.c **/*.c')

wscript

@@ -98 +98 @@
             help_disable_str = 'do not compile source_wavwrite')
 
-    add_option_enable_disable(ctx, 'hdf5', default = None,
-            help_str = 'use libhdf5 (default)',
-            help_disable_str = 'do not use libhdf5')
-
     add_option_enable_disable(ctx, 'docs', default = None,
             help_str = 'build documentation (auto)',
@@ -464 +460 @@
     if (ctx.options.enable_memcpy == True):
         ctx.define('HAVE_MEMCPY_HACKS', 1)
-
-    if (ctx.options.enable_hdf5 != True):
-        ctx.check_cfg(package='hdf5', args='--cflags --libs',
-                uselib_store='HDF5', mandatory=ctx.options.enable_hdf5)
-        ctx.check(lib=['hdf5_hl'], use = ['HDF5'],
-                uselib_store='HDF5_HL', mandatory=ctx.options.enable_hdf5)
 
     # write configuration header