Merge b20e6e0 into b3cbaad

holoviz · Aug 4, 2018 · e9ea472 · e9ea472
2 parents b3cbaad + b20e6e0
commit e9ea472
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/holoviews/core/data/grid.py b/holoviews/core/data/grid.py
@@ -180,7 +180,7 @@ def shape(cls, dataset, gridded=False):
         if gridded:
             return shape
         else:
-            return (np.product(shape), len(dataset.dimensions()))
+            return (np.product(shape, dtype=np.intp), len(dataset.dimensions()))
 
 
     @classmethod

diff --git a/holoviews/core/data/image.py b/holoviews/core/data/image.py
@@ -79,7 +79,7 @@ def shape(cls, dataset, gridded=False):
 
     @classmethod
     def length(cls, dataset):
-        return np.product(dataset.data.shape[:2])
+        return np.product(dataset.data.shape[:2], dtype=np.intp)
 
 
     @classmethod

diff --git a/holoviews/core/data/iris.py b/holoviews/core/data/iris.py
@@ -280,7 +280,7 @@ def length(cls, dataset):
         """
         Returns the total number of samples in the dataset.
         """
-        return np.product([len(d.points) for d in dataset.data.coords(dim_coords=True)])
+        return np.product([len(d.points) for d in dataset.data.coords(dim_coords=True)], dtype=np.intp)
 
 
     @classmethod

diff --git a/holoviews/core/data/xarray.py b/holoviews/core/data/xarray.py
@@ -50,7 +50,7 @@ def shape(cls, dataset, gridded=False):
         if gridded:
             return shape
         else:
-            return (np.product(shape), len(dataset.dimensions()))
+            return (np.product(shape, dtype=np.intp), len(dataset.dimensions()))
 
 
     @classmethod
@@ -443,7 +443,7 @@ def select(cls, dataset, selection_mask=None, **selection):
 
     @classmethod
     def length(cls, dataset):
-        return np.product([len(dataset.data[d.name]) for d in dataset.kdims])
+        return np.product([len(dataset.data[d.name]) for d in dataset.kdims], dtype=np.intp)
 
     @classmethod
     def dframe(cls, dataset, dimensions):