review changes and resolved circular dependency

rapidsai · Mar 26, 2020 · 4ee660b · 4ee660b
1 parent 36d73f0
commit 4ee660b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/cudf/cudf/_libxx/transpose.pyx b/python/cudf/cudf/_libxx/transpose.pyx
@@ -1,7 +1,6 @@
 # Copyright (c) 2020, NVIDIA CORPORATION.
 
 import cudf
-from cudf.core.column.column import as_column
 from cudf.utils.dtypes import is_categorical_dtype
 
 from libcpp.memory cimport unique_ptr
@@ -57,7 +56,8 @@ def transpose(Table source):
     if cats is not None:
         result = Table(index=result._index, data=[
             (name, cudf.core.column.column.build_categorical_column(
-                codes=as_column(col.base_data, dtype=col.dtype),
+                codes=cudf.core.column.column.as_column(
+                    col.base_data, dtype=col.dtype),
                 mask=col.base_mask,
                 size=col.size,
                 categories=cats

diff --git a/python/cudf/cudf/core/column/categorical.py b/python/cudf/cudf/core/column/categorical.py
@@ -235,7 +235,7 @@ def __init__(self, dtype, mask=None, size=None, offset=0, children=()):
         if size is None:
             for child in children:
                 assert child.offset == 0
-                assert child.mask is None
+                assert child.base_mask is None
             size = children[0].size
             size = size - offset
         if isinstance(dtype, pd.api.types.CategoricalDtype):