Skip to content

Commit

Permalink
Mark DataFrame.columns as external only and remove all usage required…
Browse files Browse the repository at this point in the history
… for dataframe,series,index,and multiindex tests to pass.
  • Loading branch information
vyasr committed Feb 22, 2022
1 parent c163886 commit 10fac9e
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 96 deletions.
4 changes: 3 additions & 1 deletion python/cudf/cudf/core/_base_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,9 @@ def _union(self, other, sort=None):
self_df["order"] = self_df.index
other_df["order"] = other_df.index
res = self_df.merge(other_df, on=[0], how="outer")
res = res.sort_values(by=res.columns[1:], ignore_index=True)
res = res.sort_values(
by=res._data.to_pandas_index()[1:], ignore_index=True
)
union_result = cudf.core.index._index_from_data({0: res._data[0]})

if sort is None and len(other):
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/cudf/core/_internals/where.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def where(
)
# Setting `frame` column names to `cond`
# as `cond` has no column names.
cond.columns = frame.columns
cond.columns = frame._data.to_pandas_index()

(source_df, others,) = _normalize_columns_and_scalars_type(
frame, other
Expand Down
Loading

0 comments on commit 10fac9e

Please sign in to comment.