Skip to content

Commit 5a7a575

Browse files
committed
Fix CI build error involving numba 0.41.0
1 parent 081adc2 commit 5a7a575

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

python/cudf/dataframe/index.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,16 +584,14 @@ class StringIndex(GenericIndex):
584584
def __init__(self, values, name=None):
585585
if isinstance(values, StringColumn):
586586
self._values = values.copy()
587-
if name is None:
588-
name = values.name
589587
elif isinstance(values, StringIndex):
590588
if name is None:
591589
name = values.name
592590
self._values = values.values.copy()
593591
else:
594592
self._values = columnops.build_column(nvstrings.to_device(values),
595593
dtype='object')
596-
self.name = name
594+
self.name = name
597595

598596
@property
599597
def codes(self):
@@ -636,8 +634,10 @@ def as_index(arbitrary, name=None):
636634
# This function should probably be moved to Index.__new__
637635
if isinstance(arbitrary, Index):
638636
return arbitrary
639-
elif isinstance(arbitrary, (StringColumn, NumericalColumn)):
637+
elif isinstance(arbitrary, NumericalColumn):
640638
return GenericIndex(arbitrary, name=name)
639+
elif isinstance(arbitrary, StringColumn):
640+
return StringIndex(arbitrary, name=name)
641641
elif isinstance(arbitrary, DatetimeColumn):
642642
return DatetimeIndex(arbitrary, name=name)
643643
elif isinstance(arbitrary, CategoricalColumn):

python/cudf/dataframe/multiindex.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def __init__(self, levels, codes=None, labels=None, names=None):
5353
if not isinstance(codes, cudf.dataframe.dataframe.DataFrame):
5454
self.codes = cudf.dataframe.dataframe.DataFrame()
5555
for idx, code in enumerate(codes):
56+
code = code.view(np.ndarray)
5657
self.codes.add_column(column_names[idx],
5758
columnops.as_column(code))
5859
else:

0 commit comments

Comments
 (0)