Add the NPY_NO_DEPRECATED_API and NPY_ARRAY_ENSURECOPY flags due to numpy 1.7 changes.

doc/extending/fibby.txt

@@ -63,7 +63,7 @@ you should check the strides and alignment.
       return """
         Py_XDECREF(%(y)s);
         %(y)s = (PyArrayObject*)PyArray_FromArray(
-                    %(x)s, 0, NPY_ENSURECOPY);
+                    %(x)s, 0, NPY_ARRAY_ENSURECOPY);
         if (!(%y)s) %(fail)s;
         dtype_%(y)s * y = (dtype_%(y)s*)%(y)s->data; 
         dtype_%(x)s * x = (dtype_%(x)s*)%(x)s->data; 
@@ -147,7 +147,7 @@ the correct size for the output. This is essentially simulating the line
 
     Py_XDECREF(%(y)s);
     %(y)s = (PyArrayObject*)PyArray_FromArray(
-        %(x)s, 0, NPY_ENSURECOPY);
+        %(x)s, 0, NPY_ARRAY_ENSURECOPY);
 
 The first line reduces the reference count of the data that y originally
 pointed to. The second line allocates the new data and makes y point to it.

theano/gof/cmodule.py

@@ -1453,6 +1453,12 @@ class GCC_compiler(object):
     @staticmethod
     def compile_args():
         cxxflags = [flag for flag in config.gcc.cxxflags.split(' ') if flag]
+        cxxflags.append("-D NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION")
+        numpy_ver = [int(n) for n in numpy.__version__.split('.')[:2]]
+        # numpy 1.7b1 replaced NPY_ENSURECOPY to NPY_ARRAY_ENSURECOPY
+        # that didn't existed
+        if bool(numpy_ver < [1, 7]):
+            cxxflags.append("-D NPY_ARRAY_ENSURECOPY=NPY_ENSURECOPY")
         return cxxflags
 
     @staticmethod

theano/sandbox/rng_mrg.py

@@ -220,9 +220,9 @@ class mrg_uniform(mrg_uniform_base):
         rstate, size = inp
         o_rstate, o_sample = out
         if self.inplace:
-            o_rstate_requirement = 'NPY_C_CONTIGUOUS|NPY_ALIGNED'
+            o_rstate_requirement = 'NPY_C_CONTIGUOUS|NPY_ARRAY_ALIGNED'
         else:
-            o_rstate_requirement = 'NPY_ENSURECOPY|NPY_C_CONTIGUOUS|NPY_ALIGNED'
+            o_rstate_requirement = 'NPY_ARRAY_ENSURECOPY|NPY_C_CONTIGUOUS|NPY_ARRAY_ALIGNED'
         ndim = self.output_type.ndim
         o_type_num = numpy.asarray(0, dtype=self.output_type.dtype).dtype.num
         fail = sub['fail']

theano/tensor/basic.py

@@ -4504,7 +4504,7 @@ class IncSubtensor(Op):
         {
             if (%(z)s) Py_DECREF(%(z)s);
             %(z)s = (PyArrayObject*)PyArray_FromAny(py_%(x)s, NULL, 0, 0,
-                                                    NPY_ENSURECOPY, NULL);
+                                                    NPY_ARRAY_ENSURECOPY, NULL);
         }
         """ % locals()
 

theano/tensor/elemwise.py

@@ -282,7 +282,7 @@ class DimShuffle(Op):
                 '{ PyArrayObject * %(basename)s = %(input)s', 'Py_INCREF((PyObject*)%(basename)s)']
         else:
             get_base = [('{ PyArrayObject * %(basename)s = (PyArrayObject*)PyArray_FromAny((PyObject*)%(input)s, NULL,'
-                    '0, 0, NPY_ALIGNED|NPY_ENSURECOPY, NULL)')]
+                    '0, 0, NPY_ARRAY_ALIGNED|NPY_ARRAY_ENSURECOPY, NULL)')]
 
         shape_statements = ['npy_intp dimensions[%i]' % nd_out]
         for i, o in enumerate(self.new_order):
@@ -329,9 +329,9 @@ class DimShuffle(Op):
                             'PyArray_DATA(%(basename)s), PyArray_ITEMSIZE(%(basename)s), '
                             #borrow only the writable flag from the base
                             # the NPY_OWNDATA flag will default to 0.
-                            '(NPY_WRITEABLE*PyArray_ISWRITEABLE(%(basename)s)), NULL)'),
+                            '(NPY_ARRAY_WRITEABLE*PyArray_ISWRITEABLE(%(basename)s)), NULL)'),
                 #recalculate flags: CONTIGUOUS, FORTRAN, ALIGNED
-                'PyArray_UpdateFlags(%(res)s, NPY_UPDATE_ALL)',
+                'PyArray_UpdateFlags(%(res)s, NPY_ARRAY_UPDATE_ALL)',
                 #we are making a view in both inplace and non-inplace cases
                 'PyArray_BASE(%(res)s) = (PyObject*)%(basename)s',
                 '}']

theano/tests/test_tutorial.py

@@ -918,7 +918,7 @@ class T_fibby(unittest.TestCase):
                 return """
                     Py_XDECREF(%(y)s);
                     %(y)s = (PyArrayObject*)PyArray_FromArray(
-                            %(x)s, 0, NPY_ENSURECOPY);
+                            %(x)s, 0, NPY_ARRAY_ENSURECOPY);
                     if (!(%y)s) %(fail)s;
                     dtype_%(y)s * y = (dtype_%(y)s*)%(y)s->data;
                     dtype_%(x)s * x = (dtype_%(x)s*)%(x)s->data;