Merge pull request numpy#6621 from charris/fix-swig-make_fortran

charris · charris · commit 615e66b19def · 2015-11-04T14:27:54.000-07:00
BUG: Fix swig make_fortran function.
diff --git a/doc/release/1.10.2-notes.rst b/doc/release/1.10.2-notes.rst
@@ -32,6 +32,7 @@ Issues Fixed
 * gh-6575 BUG: Split produces empty arrays with wrong number of dimensions
 * gh-6590 Fortran Array problem in numpy 1.10.
 * gh-6602 Random __all__ missing choice and dirichlet.
+* gh-6618 NPY_FORTRANORDER in make_fortran() in numpy.i
 
 Merged PRs
 ==========
@@ -67,6 +68,7 @@ The following PRs in master have been backported to 1.10.2
 * gh-6596 BUG: Fix swig for relaxed stride checking.
 * gh-6606 DOC: Update 1.10.2 release notes.
 * gh-6614 BUG: Add choice and dirichlet to numpy.random.__all__.
+* gh-6621 BUG: Fix swig make_fortran function.
 
 Initial support for mingwpy was reverted as it was causing problems for
 non-windows builds.
diff --git a/tools/swig/numpy.i b/tools/swig/numpy.i
@@ -295,7 +295,7 @@
       Py_INCREF(array_descr(ary));
       result = (PyArrayObject*) PyArray_FromArray(ary,
                                                   array_descr(ary),
-                                                  NPY_FORTRANORDER);
+                                                  NPY_ARRAY_F_CONTIGUOUS);
       *is_new_object = 1;
     }
     return result;

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@`
`295`	`295`	`Py_INCREF(array_descr(ary));`
`296`	`296`	`result = (PyArrayObject*) PyArray_FromArray(ary,`
`297`	`297`	`array_descr(ary),`
`298`		`- NPY_FORTRANORDER);`
	`298`	`+ NPY_ARRAY_F_CONTIGUOUS);`
`299`	`299`	`*is_new_object = 1;`
`300`	`300`	`}`
`301`	`301`	`return result;`