Remove use of old numpy api.

theano/tensor/elemwise.py

@@ -336,7 +336,7 @@ class DimShuffle(Op):
                 'PyArray_UpdateFlags(%(res)s, NPY_ARRAY_UPDATE_ALL)',
                 #we are making a view in both inplace and non-inplace cases
 """
-#if NPY_VERSION <= 0x01000009
+#if NPY_VERSION < 0x01000009
 PyArray_BASE(%(res)s) = (PyObject*)%(basename)s;
 #else
 PyArray_SetBaseObject(%(res)s, (PyObject*)%(basename)s);

theano/tensor/subtensor.py

@@ -849,7 +849,7 @@ class Subtensor(Op):
                 PyArray_DIMS(%(x)s),
                 PyArray_STRIDES(%(x)s),
                 PyArray_DATA(%(x)s),
-                %(x)s->flags,
+                PyArray_FLAGS(%(x)s),
                 NULL);
         if (!xview)
         {
@@ -862,7 +862,11 @@ class Subtensor(Op):
         finish_view = """
         if (%(z)s) Py_DECREF(%(z)s);
         Py_INCREF(py_%(x)s);
+#if NPY_VERSION < 0x01000009
         PyArray_BASE(xview) = py_%(x)s;
+#else
+        PyArray_SetBaseObject(xview, py_%(x)s);
+#endif
         assert(py_%(x)s == (PyObject*)%(x)s);
         %(z)s = xview;
         """ % locals()

theano/tensor/type.py

@@ -446,8 +446,8 @@ class TensorType(Type):
             %(fail)s
         }
         // We expect %(type_num)s
-        type_num_%(name)s = ((PyArrayObject*)py_%(name)s)->descr->type_num;
-        if (!PyArray_ISALIGNED(py_%(name)s)) {
+        type_num_%(name)s = PyArray_TYPE((PyArrayObject*) py_%(name)s);
+        if (!PyArray_ISALIGNED((PyArrayObject*) py_%(name)s)) {
             PyErr_Format(PyExc_NotImplementedError,
                          "expected an aligned array of type %%ld "
                          "(%(type_num)s), got non-aligned array of type %%ld"
@@ -456,19 +456,19 @@ class TensorType(Type):
                          " and 3 last strides %%ld %%ld, %%ld.",
                          (long int) %(type_num)s,
                          (long int) type_num_%(name)s,
-                         (long int) PyArray_NDIM(py_%(name)s),
-                         (long int) PyArray_NDIM(py_%(name)s) >= 3 ?
-        PyArray_DIMS(py_%(name)s)[PyArray_NDIM(py_%(name)s)-3] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 2 ?
-        PyArray_DIMS(py_%(name)s)[PyArray_NDIM(py_%(name)s)-2] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 1 ?
-        PyArray_DIMS(py_%(name)s)[PyArray_NDIM(py_%(name)s)-1] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 3 ?
-        PyArray_STRIDES(py_%(name)s)[PyArray_NDIM(py_%(name)s)-3] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 2 ?
-        PyArray_STRIDES(py_%(name)s)[PyArray_NDIM(py_%(name)s)-2] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 1 ?
-        PyArray_STRIDES(py_%(name)s)[PyArray_NDIM(py_%(name)s)-1] : -1
+                         (long int) PyArray_NDIM(%(name)s),
+                         (long int) PyArray_NDIM(%(name)s) >= 3 ?
+        PyArray_DIMS(%(name)s)[PyArray_NDIM(%(name)s)-3] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 2 ?
+        PyArray_DIMS(%(name)s)[PyArray_NDIM(%(name)s)-2] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 1 ?
+        PyArray_DIMS(%(name)s)[PyArray_NDIM(%(name)s)-1] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 3 ?
+        PyArray_STRIDES(%(name)s)[PyArray_NDIM(%(name)s)-3] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 2 ?
+        PyArray_STRIDES(%(name)s)[PyArray_NDIM(%(name)s)-2] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 1 ?
+        PyArray_STRIDES(%(name)s)[PyArray_NDIM(%(name)s)-1] : -1
         );
             %(fail)s
         }
@@ -508,7 +508,7 @@ class TensorType(Type):
 
         {Py_XINCREF(py_%(name)s);}
 
-        if (!PyArray_ISALIGNED(py_%(name)s)) {
+        if (!PyArray_ISALIGNED((PyArrayObject*) py_%(name)s)) {
             PyErr_Format(PyExc_NotImplementedError,
                          "c_sync: expected an aligned array of type %%ld "
                          "(%(type_num)s), got non-aligned array of type %%ld"
@@ -517,19 +517,19 @@ class TensorType(Type):
                          " and 3 last strides %%ld %%ld, %%ld.",
                          (long int) %(type_num)s,
                          (long int) type_num_%(name)s,
-                         (long int) PyArray_NDIM(py_%(name)s),
-                         (long int) PyArray_NDIM(py_%(name)s) >= 3 ?
-        PyArray_DIMS(py_%(name)s)[PyArray_NDIM(py_%(name)s)-3] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 2 ?
-        PyArray_DIMS(py_%(name)s)[PyArray_NDIM(py_%(name)s)-2] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 1 ?
-        PyArray_DIMS(py_%(name)s)[PyArray_NDIM(py_%(name)s)-1] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 3 ?
-        PyArray_STRIDES(py_%(name)s)[PyArray_NDIM(py_%(name)s)-3] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 2 ?
-        PyArray_STRIDES(py_%(name)s)[PyArray_NDIM(py_%(name)s)-2] : -1,
-                         (long int) PyArray_NDIM(py_%(name)s) >= 1 ?
-        PyArray_STRIDES(py_%(name)s)[PyArray_NDIM(py_%(name)s)-1] : -1
+                         (long int) PyArray_NDIM(%(name)s),
+                         (long int) PyArray_NDIM(%(name)s) >= 3 ?
+        PyArray_DIMS(%(name)s)[PyArray_NDIM(%(name)s)-3] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 2 ?
+        PyArray_DIMS(%(name)s)[PyArray_NDIM(%(name)s)-2] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 1 ?
+        PyArray_DIMS(%(name)s)[PyArray_NDIM(%(name)s)-1] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 3 ?
+        PyArray_STRIDES(%(name)s)[PyArray_NDIM(%(name)s)-3] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 2 ?
+        PyArray_STRIDES(%(name)s)[PyArray_NDIM(%(name)s)-2] : -1,
+                         (long int) PyArray_NDIM(%(name)s) >= 1 ?
+        PyArray_STRIDES(%(name)s)[PyArray_NDIM(%(name)s)-1] : -1
         );
             %(fail)s
         }