Changeset 4a67c12 for python/ext/ufuncs.c

Timestamp:

Mar 6, 2013, 5:26:49 PM (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:

b583c099

Parents:

7606d23

Message:

ext/aubiomodule.c: more ufuncs

File:

• python/ext/ufuncs.c (modified) (7 diffs)

python/ext/ufuncs.c

@@ -2 +2 @@
 #include "aubio-types.h"
 
-static void unwrap2pi(char **args, npy_intp *dimensions,
+typedef smpl_t (*aubio_unary_func_t)(smpl_t input);
+
+static void aubio_PyUFunc_d_d(char **args, npy_intp *dimensions,
                             npy_intp* steps, void* data)
 {
@@ -9 +11 @@
     char *in = args[0], *out = args[1];
     npy_intp in_step = steps[0], out_step = steps[1];
+    aubio_unary_func_t func = (aubio_unary_func_t)(data);
 
     for (i = 0; i < n; i++) {
         /*BEGIN main ufunc computation*/
-        *((double *)out) = aubio_unwrap2pi(*(double *)in);
+        *((double *)out) = func(*(double *)in);
         /*END main ufunc computation*/
 
@@ -20 +23 @@
 }
 
-static void unwrap2pif(char **args, npy_intp *dimensions,
+static void aubio_PyUFunc_f_f_As_d_d(char **args, npy_intp *dimensions,
                             npy_intp* steps, void* data)
 {
@@ -27 +30 @@
     char *in = args[0], *out = args[1];
     npy_intp in_step = steps[0], out_step = steps[1];
+    aubio_unary_func_t func = (aubio_unary_func_t)(data);
 
     for (i = 0; i < n; i++) {
         /*BEGIN main ufunc computation*/
-        *((float *)out) = aubio_unwrap2pi(*(float *)in);
+        *((float *)out) = func(*(float *)in);
         /*END main ufunc computation*/
 
@@ -38 +42 @@
 }
 
-static char Py_unwrap2pi_doc[] = "map angle to unit circle [-pi, pi[";
-
-PyUFuncGenericFunction unwrap2pi_functions[] = {
-  &unwrap2pif, &unwrap2pi,
+static int Py_aubio_unary_n_types = 2;
+static int Py_aubio_unary_n_inputs = 1;
+static int Py_aubio_unary_n_outputs = 1;
+PyUFuncGenericFunction Py_aubio_unary_functions[] = {
+  &aubio_PyUFunc_f_f_As_d_d,
+  &aubio_PyUFunc_d_d,
   //PyUFunc_f_f_As_d_d, PyUFunc_d_d,
   //PyUFunc_g_g, PyUFunc_OO_O_method,
 };
 
-static void* unwrap2pi_data[] = {
+static char Py_aubio_unary_types[] = {
+  NPY_FLOAT, NPY_FLOAT,
+  NPY_DOUBLE, NPY_DOUBLE,
+  //NPY_LONGDOUBLE, NPY_LONGDOUBLE,
+  //NPY_OBJECT, NPY_OBJECT,
+};
+
+static char Py_unwrap2pi_doc[] = "map angle to unit circle [-pi, pi[";
+
+static void* Py_unwrap2pi_data[] = {
   (void *)aubio_unwrap2pi,
   (void *)aubio_unwrap2pi,
@@ -53 +68 @@
 };
 
-static char unwrap2pi_types[] = {
-  NPY_FLOAT, NPY_FLOAT,
-  NPY_DOUBLE, NPY_DOUBLE,
-  //NPY_LONGDOUBLE, NPY_LONGDOUBLE,
-  //NPY_OBJECT, NPY_OBJECT,
+static char Py_freqtomidi_doc[] = "convert frequency to midi";
+
+static void* Py_freqtomidi_data[] = {
+  (void *)aubio_freqtomidi,
+  (void *)aubio_freqtomidi,
+};
+
+static char Py_miditofreq_doc[] = "convert midi to frequency";
+
+static void* Py_miditofreq_data[] = {
+  (void *)aubio_miditofreq,
+  (void *)aubio_miditofreq,
 };
 
@@ -72 +94 @@
   PyObject *f, *dict;
   dict = PyModule_GetDict(m);
-  f = PyUFunc_FromFuncAndData(unwrap2pi_functions,
-          unwrap2pi_data, unwrap2pi_types, 2, 1, 1,
+  f = PyUFunc_FromFuncAndData(Py_aubio_unary_functions, Py_unwrap2pi_data, Py_aubio_unary_types,
+          Py_aubio_unary_n_types, Py_aubio_unary_n_inputs, Py_aubio_unary_n_outputs,
           PyUFunc_None, "unwrap2pi", Py_unwrap2pi_doc, 0);
   PyDict_SetItemString(dict, "unwrap2pi", f);
   Py_DECREF(f);
 
+  PyObject *g;
+  g = PyUFunc_FromFuncAndData(Py_aubio_unary_functions, Py_freqtomidi_data, Py_aubio_unary_types,
+          Py_aubio_unary_n_types, Py_aubio_unary_n_inputs, Py_aubio_unary_n_outputs,
+          PyUFunc_None, "freqtomidi", Py_freqtomidi_doc, 0);
+  PyDict_SetItemString(dict, "freqtomidi", g);
+  Py_DECREF(g);
+
+  PyObject *h;
+  h = PyUFunc_FromFuncAndData(Py_aubio_unary_functions, Py_miditofreq_data, Py_aubio_unary_types,
+          Py_aubio_unary_n_types, Py_aubio_unary_n_inputs, Py_aubio_unary_n_outputs,
+          PyUFunc_None, "miditofreq", Py_miditofreq_doc, 0);
+  PyDict_SetItemString(dict, "miditofreq", h);
+  Py_DECREF(h);
   return;
 }