Merge pull request #4874 from juliantaylor/masked-sort-memory

charris · charris · commit b583637db9c1 · 2014-07-16T18:51:49.000-05:00
ENH: avoid meshgrid and fancy indexing for 1d masked sort, for 1.9
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
@@ -5074,10 +5074,16 @@ def sort(self, axis= -1, kind='quicksort', order=None,
                     filler = maximum_fill_value(self)
             else:
                 filler = fill_value
-            idx = np.meshgrid(*[np.arange(x) for x in self.shape], sparse=True,
-                              indexing='ij')
-            idx[axis] = self.filled(filler).argsort(axis=axis, kind=kind,
-                                                    order=order)
+
+            sidx = self.filled(filler).argsort(axis=axis, kind=kind,
+                                               order=order)
+            # save meshgrid memory for 1d arrays
+            if self.ndim == 1:
+                idx = sidx
+            else:
+                idx = np.meshgrid(*[np.arange(x) for x in self.shape], sparse=True,
+                                  indexing='ij')
+                idx[axis] = sidx
             tmp_mask = self._mask[idx].flat
             tmp_data = self._data[idx].flat
             self._data.flat = tmp_data
@@ -6178,10 +6184,16 @@ def sort(a, axis= -1, kind='quicksort', order=None, endwith=True, fill_value=Non
             filler = maximum_fill_value(a)
     else:
         filler = fill_value
-#    return
-    indx = np.meshgrid(*[np.arange(x) for x in a.shape], sparse=True,
-                       indexing='ij')
-    indx[axis] = filled(a, filler).argsort(axis=axis, kind=kind, order=order)
+
+    sindx = filled(a, filler).argsort(axis=axis, kind=kind, order=order)
+
+    # save meshgrid memory for 1d arrays
+    if a.ndim == 1:
+        indx = sindx
+    else:
+        indx = np.meshgrid(*[np.arange(x) for x in a.shape], sparse=True,
+                           indexing='ij')
+        indx[axis] = sindx
     return a[indx]
 sort.__doc__ = MaskedArray.sort.__doc__
 
