Skip to content

Commit

Permalink
Various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Dec 8, 2019
1 parent 53f5de0 commit e46a44f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 4 additions & 11 deletions holoviews/core/data/cudf.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import numpy as np

from .. import util
from ...dimension import dimension_name
from ..dimension import dimension_name
from ..element import Element
from ...ndmapping import NdMapping, item_check, sorted_context
from ..ndmapping import NdMapping, item_check, sorted_context
from .interface import DataError, Interface
from .pandas import PandasInterface

Expand Down Expand Up @@ -126,15 +126,8 @@ def range(cls, dataset, dimension):


@classmethod
def values(
cls,
dataset,
dim,
expanded=True,
flat=True,
compute=True,
keep_index=False,
):
def values(cls, dataset, dim, expanded=True, flat=True, compute=True,
keep_index=False):
dim = dataset.get_dimension(dim, strict=True)
data = dataset.data[dim.name]
if not expanded:
Expand Down
2 changes: 1 addition & 1 deletion holoviews/core/data/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def _perform_getitem(cls, dataset, index):
rows, cols = index
if rows is Ellipsis:
rows = slice(None)
data = dataset.interface.iloc(dataset.dataset, (rows, cols))
data = dataset.interface.iloc(dataset, (rows, cols))
kdims = dataset.kdims
vdims = dataset.vdims
if np.isscalar(data):
Expand Down

0 comments on commit e46a44f

Please sign in to comment.