UPD: Add NPY_NO_DEPRECATED_API to some more files.

_dotblas needs more work to remove direct access to ndarray internals.
mwhansen · Apr 7, 2012 · c5eee11 · c5eee11
1 parent c993797
commit c5eee11
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/numpy/core/blasdot/_dotblas.c b/numpy/core/blasdot/_dotblas.c
@@ -1,5 +1,8 @@
-static char module_doc[] =
-"This module provides a BLAS optimized\nmatrix multiply, inner product and dot for numpy arrays";
+/*
+ * This module provides a BLAS optimized\nmatrix multiply,
+ * inner product and dot for numpy arrays
+ */
+#define NPY_NO_DEPRECATED_API NPY_API_VERSION
 
 #include "Python.h"
 #include "npy_config.h"
@@ -17,6 +20,9 @@ static char module_doc[] =
 #define Py_SIZE(o)    (((PyVarObject*)(o))->ob_size)
 #endif
 
+static char module_doc[] =
+"This module provides a BLAS optimized\nmatrix multiply, inner product and dot for numpy arrays";
+
 static PyArray_DotFunc *oldFunctions[NPY_NTYPES];
 
 static void

diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c
@@ -9,6 +9,7 @@
  *
  * See LICENSE.txt for the license.
  */
+#define NPY_NO_DEPRECATED_API NPY_API_VERSION
 
 /* Indicate that this .c file is allowed to include the header */
 #define NPY_ITERATOR_IMPLEMENTATION_CODE

diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c
@@ -9,6 +9,7 @@
  *
  * See LICENSE.txt for the license.
  */
+#define NPY_NO_DEPRECATED_API NPY_API_VERSION
 
 /* Indicate that this .c file is allowed to include the header */
 #define NPY_ITERATOR_IMPLEMENTATION_CODE

diff --git a/numpy/random/mtrand/initarray.c b/numpy/random/mtrand/initarray.c
@@ -71,6 +71,7 @@
  *  http://www.math.keio.ac.jp/matumoto/emt.html
  *  email: [email protected]
  */
+#define NPY_NO_DEPRECATED_API NPY_API_VERSION
 
 #include "initarray.h"