Changeset 451b05d

Timestamp:

Jul 11, 2012, 5:25:25 AM (13 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:

b84c0c2

Parents:

c71e405 (diff), 0ed517b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'numpy-1.8' into develop

Location:

interfaces/python

Files:

• aubio-types.h (modified) (1 diff)
• aubiomodule.c (modified) (3 diffs)
• aubioproxy.c (modified) (3 diffs)
• build_linux (added)
• build_osx (added)
• demo_filterbank.py (modified) (1 diff)
• py-cvec.c (modified) (8 diffs)
• setup.py (modified) (1 diff)

interfaces/python/aubio-types.h

@@ -2 +2 @@
 #include <structmember.h>
 #define NO_IMPORT_ARRAY
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
 #define AUBIO_UNSTABLE 1

interfaces/python/aubiomodule.c

@@ -1 +1 @@
 #include <Python.h>
 #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
 
@@ -132 +133 @@
   }
 
+  m = Py_InitModule3 ("_aubio", aubio_methods, aubio_module_doc);
+
+  if (m == NULL) {
+    return;
+  }
+
   err = _import_array ();
 
@@ -137 +144 @@
     fprintf (stderr,
         "Unable to import Numpy C API from aubio module (error %d)\n", err);
-  }
-
-  m = Py_InitModule3 ("_aubio", aubio_methods, aubio_module_doc);
-
-  if (m == NULL) {
-    return;
   }
 

interfaces/python/aubioproxy.c

@@ -13 +13 @@
 
     // we got an array, convert it to an fvec 
-    if (PyArray_NDIM (input) == 0) {
+    if (PyArray_NDIM ((PyArrayObject *)input) == 0) {
       PyErr_SetString (PyExc_ValueError, "input array is a scalar");
       goto fail;
-    } else if (PyArray_NDIM (input) > 1) {
+    } else if (PyArray_NDIM ((PyArrayObject *)input) > 1) {
       PyErr_SetString (PyExc_ValueError,
           "input array has more than one dimensions");
@@ -22 +22 @@
     }
 
-    if (!PyArray_ISFLOAT (input)) {
+    if (!PyArray_ISFLOAT ((PyArrayObject *)input)) {
       PyErr_SetString (PyExc_ValueError, "input array should be float");
       goto fail;
-    } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {
+    } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
       PyErr_SetString (PyExc_ValueError, "input array should be float32");
       goto fail;
@@ -36 +36 @@
     // no need to really allocate fvec, just its struct member 
     vec = (fvec_t *)malloc(sizeof(fvec_t));
-    vec->length = PyArray_SIZE (array);
-    vec->data = (smpl_t *) PyArray_GETPTR1 (array, 0);
+    vec->length = PyArray_SIZE ((PyArrayObject *)array);
+    vec->data = (smpl_t *) PyArray_GETPTR1 ((PyArrayObject *)array, 0);
 
   } else if (PyObject_TypeCheck (input, &PyList_Type)) {

interfaces/python/demo_filterbank.py

@@ -4 +4 @@
 freq_list = [60, 80, 200, 400, 800, 1600, 3200, 6400, 12800, 15000, 24000]
 freqs = fvec(freq_list)
-f.set_triangle_bands(freq_list, 48000)
+f.set_triangle_bands(freqs, 48000)
 f.get_coeffs().T
 

interfaces/python/py-cvec.c

@@ -126 +126 @@
 Py_cvec_set_norm (Py_cvec * vec, PyObject *input, void * closure)
 {
-  PyObject * array;
+  PyArrayObject * array;
   if (input == NULL) {
     PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -134 +134 @@
 
     // we got an array, convert it to a cvec.norm 
-    if (PyArray_NDIM (input) == 0) {
+    if (PyArray_NDIM ((PyArrayObject *)input) == 0) {
       PyErr_SetString (PyExc_ValueError, "input array is a scalar");
       goto fail;
-    } else if (PyArray_NDIM (input) > 2) {
+    } else if (PyArray_NDIM ((PyArrayObject *)input) > 2) {
       PyErr_SetString (PyExc_ValueError,
           "input array has more than two dimensions");
@@ -143 +143 @@
     }
 
-    if (!PyArray_ISFLOAT (input)) {
+    if (!PyArray_ISFLOAT ((PyArrayObject *)input)) {
       PyErr_SetString (PyExc_ValueError, "input array should be float");
       goto fail;
-    } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {
+    } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
       PyErr_SetString (PyExc_ValueError, "input array should be float32");
       goto fail;
     }
-    array = input;
+    array = (PyArrayObject *)input;
 
     // check input array dimensions
@@ -162 +162 @@
           PyErr_Format (PyExc_ValueError,
                   "input array has length %d, but cvec has length %d",
-                  PyArray_SIZE (array), vec->o->length);
+                  (int)PyArray_SIZE (array), vec->o->length);
           goto fail;
       }
@@ -184 +184 @@
 Py_cvec_set_phas (Py_cvec * vec, PyObject *input, void * closure)
 {
-  PyObject * array;
+  PyArrayObject * array;
   if (input == NULL) {
     PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -192 +192 @@
 
     // we got an array, convert it to a cvec.phas
-    if (PyArray_NDIM (input) == 0) {
+    if (PyArray_NDIM ((PyArrayObject *)input) == 0) {
       PyErr_SetString (PyExc_ValueError, "input array is a scalar");
       goto fail;
-    } else if (PyArray_NDIM (input) > 2) {
+    } else if (PyArray_NDIM ((PyArrayObject *)input) > 2) {
       PyErr_SetString (PyExc_ValueError,
           "input array has more than two dimensions");
@@ -201 +201 @@
     }
 
-    if (!PyArray_ISFLOAT (input)) {
+    if (!PyArray_ISFLOAT ((PyArrayObject *)input)) {
       PyErr_SetString (PyExc_ValueError, "input array should be float");
       goto fail;
-    } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {
+    } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
       PyErr_SetString (PyExc_ValueError, "input array should be float32");
       goto fail;
     }
-    array = input;
+    array = (PyArrayObject *)input;
 
     // check input array dimensions
@@ -220 +220 @@
           PyErr_Format (PyExc_ValueError,
                   "input array has length %d, but cvec has length %d",
-                  PyArray_SIZE (array), vec->o->length);
+                  (int)PyArray_SIZE (array), vec->o->length);
           goto fail;
       }

interfaces/python/setup.py

@@ -5 +5 @@
 from generator import generate_object_files
 
-setup(name="_aubio", version="1.0",
+setup(name='aubio',
+      version = '0.4.0alpha',
       packages = ['aubio'],
+      description = 'interface to the aubio library',
+      long_description = 'interface to the aubio library',
+      license = 'GNU/GPL version 3',
+      author = 'Paul Brossier',
+      author_email = 'piem@aubio.org',
+      maintainer = 'Paul Brossier',
+      maintainer_email = 'piem@aubio.org',
+      url = 'http://aubio.org/',
       ext_modules = [ 
         Extension("_aubio",