Merge pull request #420 from seberg/contig

njsmith · njsmith · commit fd63e8f7dcba · 2012-09-21T07:46:37.000-07:00
Reset flags when Axes are removed. Array might now be 1D, or removed axe...
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
@@ -1186,4 +1186,7 @@ PyArray_RemoveAxesInPlace(PyArrayObject *arr, npy_bool *flags)
 
     /* The final number of dimensions */
     fa->nd = idim_out;
+    
+    /* Update contiguous flags */
+    PyArray_UpdateFlags(arr, NPY_ARRAY_C_CONTIGUOUS | NPY_ARRAY_F_CONTIGUOUS);
 }
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
@@ -1528,6 +1528,22 @@ def test_array_scalar_contiguous(self):
         assert_(np.array(np.float32(1.0)).flags.c_contiguous)
         assert_(np.array(np.float32(1.0)).flags.f_contiguous)
 
+    def test_squeeze_contiguous(self):
+        """Similar to GitHub issue #387"""
+        a = np.zeros((1,2)).squeeze()
+        b = np.zeros((2,2,2), order='F')[:,:,::2].squeeze()
+        assert_(a.flags.c_contiguous)
+        assert_(a.flags.f_contiguous)
+        assert_(b.flags.f_contiguous)
+
+    def test_reduce_contiguous(self):
+        """GitHub issue #387"""
+        a = np.add.reduce(np.zeros((2,1,2)), (0,1))
+        b = np.add.reduce(np.zeros((2,1,2)), 1)
+        assert_(a.flags.c_contiguous)
+        assert_(a.flags.f_contiguous)
+        assert_(b.flags.c_contiguous)
+
     def test_object_array_self_reference(self):
         # Object arrays with references to themselves can cause problems
         a = np.array(0, dtype=object)

Original file line number	Diff line number	Diff line change
`@@ -1186,4 +1186,7 @@ PyArray_RemoveAxesInPlace(PyArrayObject arr, npy_bool flags)`
`1186`	`1186`
`1187`	`1187`	`/* The final number of dimensions */`
`1188`	`1188`	`fa->nd = idim_out;`
	`1189`	`+`
	`1190`	`+ /* Update contiguous flags */`
	`1191`	`+ PyArray_UpdateFlags(arr, NPY_ARRAY_C_CONTIGUOUS \| NPY_ARRAY_F_CONTIGUOUS);`
`1189`	`1192`	`}`