Changeset c6388f4

Timestamp:

Apr 24, 2016, 11:45:45 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:

fbcee4f

Parents:

81984a7

Message:

python/{ext,lib}: prepare for double precision

Location:

python

Files:

• ext/aubio-types.h (modified) (1 diff)
• ext/aubiomodule.c (modified) (8 diffs)
• ext/aubioproxy.c (modified) (3 diffs)
• ext/py-cvec.c (modified) (2 diffs)
• ext/py-musicutils.c (modified) (5 diffs)
• lib/gen_code.py (modified) (1 diff)

python/ext/aubio-types.h

@@ -34 +34 @@
 
 #if HAVE_AUBIO_DOUBLE
-#error "Ouch! Python interface for aubio has not been much tested yet."
+#warning "double mode needs love"
 #define AUBIO_NPY_SMPL NPY_DOUBLE
+#define AUBIO_NPY_SMPL_STR "float64"
+#define AUBIO_NPY_SMPL_CHR "d"
 #else
 #define AUBIO_NPY_SMPL NPY_FLOAT
+#define AUBIO_NPY_SMPL_STR "float32"
+#define AUBIO_NPY_SMPL_CHR "f"
 #endif
 

python/ext/aubiomodule.c

@@ -88 +88 @@
   PyObject *result;
 
-  if (!PyArg_ParseTuple (args, "Of:alpha_norm", &input, &alpha)) {
+  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR ":alpha_norm", &input, &alpha)) {
     return NULL;
   }
@@ -101 +101 @@
 
   // compute the function
-  result = Py_BuildValue ("f", fvec_alpha_norm (&vec, alpha));
+  result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, fvec_alpha_norm (&vec, alpha));
   if (result == NULL) {
     return NULL;
@@ -115 +115 @@
   smpl_t output;
 
-  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+  if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR , &input, &samplerate, &fftsize)) {
     return NULL;
   }
@@ -130 +130 @@
   smpl_t output;
 
-  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+  if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR , &input, &samplerate, &fftsize)) {
     return NULL;
   }
@@ -145 +145 @@
   smpl_t output;
 
-  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+  if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR, &input, &samplerate, &fftsize)) {
     return NULL;
   }
@@ -160 +160 @@
   smpl_t output;
 
-  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+  if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR, &input, &samplerate, &fftsize)) {
     return NULL;
   }
@@ -189 +189 @@
 
   // compute the function
-  result = Py_BuildValue ("f", aubio_zero_crossing_rate (&vec));
+  result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, aubio_zero_crossing_rate (&vec));
   if (result == NULL) {
     return NULL;
@@ -309 +309 @@
   PyModule_AddObject (m, "sink", (PyObject *) & Py_sinkType);
 
+  PyModule_AddStringConstant(m, "float_type", AUBIO_NPY_SMPL_STR);
+
   // add generated objects
   add_generated_objects(m);

python/ext/aubioproxy.c

@@ -31 +31 @@
       return 0;
     } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
-      PyErr_SetString (PyExc_ValueError, "input array should be float32");
+      PyErr_SetString (PyExc_ValueError, "input array should be " AUBIO_NPY_SMPL_STR);
       return 0;
     }
@@ -74 +74 @@
       return 1;
   } else {
-      PyErr_SetString (PyExc_ValueError, "input array should be float32");
+      PyErr_SetString (PyExc_ValueError, "input array should be aubio.cvec");
       return 0;
   }
@@ -120 +120 @@
       return 0;
     } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
-      PyErr_SetString (PyExc_ValueError, "input array should be float32");
+      PyErr_SetString (PyExc_ValueError, "input array should be " AUBIO_NPY_SMPL_STR);
       return 0;
     }

python/ext/py-cvec.c

@@ -94 +94 @@
 {
   npy_intp dims[] = { self->o->length, 1 };
-  return PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->norm);
+  return PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->o->norm);
 }
 
@@ -102 +102 @@
 {
   npy_intp dims[] = { self->o->length, 1 };
-  return PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->phas);
+  return PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->o->phas);
 }
 

python/ext/py-musicutils.c

@@ -42 +42 @@
   }
 
-  level_lin = Py_BuildValue("f", aubio_level_lin(&vec));
+  level_lin = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_lin(&vec));
   if (level_lin == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing level_lin");
@@ -71 +71 @@
   }
 
-  db_spl = Py_BuildValue("f", aubio_db_spl(&vec));
+  db_spl = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_db_spl(&vec));
   if (db_spl == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing db_spl");
@@ -88 +88 @@
   smpl_t threshold;
 
-  if (!PyArg_ParseTuple (args, "Of:silence_detection", &input, &threshold)) {
+  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR ":silence_detection", &input, &threshold)) {
     PyErr_SetString (PyExc_ValueError, "failed parsing arguments");
     return NULL;
@@ -118 +118 @@
   smpl_t threshold;
 
-  if (!PyArg_ParseTuple (args, "Of:level_detection", &input, &threshold)) {
+  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR ":level_detection", &input, &threshold)) {
     PyErr_SetString (PyExc_ValueError, "failed parsing arguments");
     return NULL;
@@ -131 +131 @@
   }
 
-  level_detection = Py_BuildValue("f", aubio_level_detection(&vec, threshold));
+  level_detection = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_detection(&vec, threshold));
   if (level_detection == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing level_detection");

python/lib/gen_code.py

@@ -26 +26 @@
         'char_t*': 'T_STRING',
         'uint_t': 'T_INT',
-        'smpl_t': 'T_FLOAT',
+        'smpl_t': 'AUBIO_NPY_SMPL',
         }