Merge branch 'master' into tocsr

Author: mrocklin

sparse/core.py

@@ -2,7 +2,7 @@
 
 from collections import Iterable, deque, defaultdict
 from functools import reduce
-from numbers import Number
+import numbers
 import operator
 
 import numpy as np
@@ -131,7 +131,7 @@ def __init__(self, coords, data=None, shape=None, has_duplicates=True,
             self.coords = self.coords[None, :]
 
         if shape and not np.prod(self.coords.shape):
-            self.coords = np.zeros((len(shape), 0), dtype=int)
+            self.coords = np.zeros((len(shape), 0), dtype=np.uint64)
 
         if shape is None:
             if self.coords.nbytes:
@@ -152,11 +152,14 @@ def __init__(self, coords, data=None, shape=None, has_duplicates=True,
 
     @classmethod
     def from_numpy(cls, x):
-        coords = np.where(x)
-        data = x[coords]
-        coords = np.vstack(coords)
-        return cls(coords, data, shape=x.shape, has_duplicates=False,
-                   sorted=True)
+        if x.shape:
+            coords = np.where(x)
+            data = x[coords]
+            coords = np.vstack(coords)
+        else:
+            coords = []
+            data = x
+        return cls(coords, data, shape=x.shape, has_duplicates=False, sorted=True)
 
     def todense(self):
         self = self.sum_duplicates()
@@ -198,7 +201,7 @@ def __sizeof__(self):
     def __getitem__(self, index):
         if not isinstance(index, tuple):
             index = (index,)
-        index = tuple(ind + self.shape[i] if isinstance(ind, int) and ind < 0 else ind
+        index = tuple(ind + self.shape[i] if isinstance(ind, numbers.Integral) and ind < 0 else ind
                       for i, ind in enumerate(index))
         if (all(ind == slice(None) or ind == slice(0, d)
                 for ind, d in zip(index, self.shape))):
@@ -214,7 +217,7 @@ def __getitem__(self, index):
         shape = []
         i = 0
         for ind in index:
-            if isinstance(ind, int):
+            if isinstance(ind, numbers.Integral):
                 i += 1
                 continue
             elif isinstance(ind, slice):
@@ -262,7 +265,7 @@ def reduction(self, method, axis=None, keepdims=False, dtype=None):
         if dtype:
             kwargs['dtype'] = dtype
 
-        if isinstance(axis, int):
+        if isinstance(axis, numbers.Integral):
             axis = (axis,)
 
         if set(axis) == set(range(self.ndim)):
@@ -361,8 +364,8 @@ def reshape(self, shape):
         if self.shape == shape:
             return self
         if any(d == -1 for d in shape):
-            extra = int(np.prod(self.shape) /
-                        np.prod([d for d in shape if d != -1]))
+            extra = np.uint64(np.prod(self.shape) /
+                              np.prod([d for d in shape if d != -1]))
             shape = tuple([d if d != -1 else extra for d in shape])
 
         if self.shape == shape:
@@ -487,7 +490,7 @@ def sum_duplicates(self):
         return self
 
     def __add__(self, other):
-        if isinstance(other, Number) and other == 0:
+        if isinstance(other, numbers.Number) and other == 0:
             return self
         if not isinstance(other, COO):
             return self.maybe_densify() + other
@@ -655,15 +658,15 @@ def astype(self, dtype, out=None):
         return self.elemwise(np.ndarray.astype, dtype, check=False)
 
     def __gt__(self, other):
-        if not isinstance(other, Number):
+        if not isinstance(other, numbers.Number):
             raise NotImplementedError("Only scalars supported")
         if other < 0:
             raise ValueError("Comparison with negative number would produce "
                              "dense result")
         return self.elemwise(operator.gt, other)
 
     def __ge__(self, other):
-        if not isinstance(other, Number):
+        if not isinstance(other, numbers.Number):
             raise NotImplementedError("Only scalars supported")
         if other <= 0:
             raise ValueError("Comparison with negative number would produce "
@@ -780,7 +783,7 @@ def _keepdims(original, new, axis):
 
 
 def _mask(coords, idx):
-    if isinstance(idx, int):
+    if isinstance(idx, numbers.Integral):
         return coords == idx
     elif isinstance(idx, slice):
         if idx.step not in (1, None):

sparse/tests/test_core.py

@@ -55,6 +55,7 @@ def test_transpose(axis):
     [(2, 3, 4, 5), (8, 15)],
     [(2, 3, 4, 5), (24, 5)],
     [(2, 3, 4, 5), (20, 6)],
+    [(), ()],
 ])
 def test_reshape(a, b):
     x = random_x(a)