make nanops work when ndim==1 and axis==0 ( issue #7354 )

Author: toddrjen

doc/source/v0.14.1.txt

@@ -215,6 +215,8 @@ Bug Fixes
 - Bug in ``quantile`` ignoring the axis keyword argument (:issue`7306`)
 - Bug where ``nanops._maybe_null_out`` doesn't work with complex numbers
   (:issue:`7353`)
+- Bug in several ``nanops`` functions when ``axis==0`` for
+  1-dimensional ``nan`` arrays (:issue:`7354`)
 
 
 

pandas/core/nanops.py

@@ -260,7 +260,7 @@ def nanmean(values, axis=None, skipna=True):
     the_sum = _ensure_numeric(values.sum(axis, dtype=dtype_max))
     count = _get_counts(mask, axis)
 
-    if axis is not None:
+    if axis is not None and getattr(the_sum, 'ndim', False):
         the_mean = the_sum / count
         ct_mask = count == 0
         if ct_mask.any():
@@ -517,7 +517,7 @@ def nanprod(values, axis=None, skipna=True):
 
 def _maybe_arg_null_out(result, axis, mask, skipna):
     # helper function for nanargmin/nanargmax
-    if axis is None:
+    if axis is None or not getattr(result, 'ndim', False):
         if skipna:
             if mask.all():
                 result = -1
@@ -544,7 +544,7 @@ def _get_counts(mask, axis):
 
 
 def _maybe_null_out(result, axis, mask):
-    if axis is not None:
+    if axis is not None and getattr(result, 'ndim', False):
         null_mask = (mask.shape[axis] - mask.sum(axis)) == 0
         if null_mask.any():
             if np.iscomplexobj(result):

pandas/tests/test_nanops.py

@@ -145,7 +145,7 @@ def check_fun_data(self, testfunc, targfunc,
                                  'kwargs: %s' % kwargs)
                     raise
 
-        if testarval.ndim <= 2:
+        if testarval.ndim <= 1:
             return
 
         try:
@@ -245,7 +245,7 @@ def _nanmean_wrap(self, value, *args, **kwargs):
         dtype = value.dtype
         res = nanops.nanmean(value, *args, **kwargs)
         if dtype.kind == 'O':
-            res = np.round(res, decimals=15)
+            res = np.round(res, decimals=13)
         return res
 
     def _mean_wrap(self, value, *args, **kwargs):
@@ -254,7 +254,7 @@ def _mean_wrap(self, value, *args, **kwargs):
             value = value.astype('c16')
         res = np.mean(value, *args, **kwargs)
         if dtype.kind == 'O':
-            res = np.round(res, decimals=15)
+            res = np.round(res, decimals=13)
         return res
 
     def test_nanmean(self):