Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce/clean copy usage in Series, reshaping #16080

Merged
merged 5 commits into from
Jun 26, 2024
Merged

Reduce/clean copy usage in Series, reshaping #16080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a16263e
Reduce/clean copy usage in Series, reshaping
mroeschke Jun 25, 2024
04fe1bb
Merge remote-tracking branch 'upstream/branch-24.08' into pref/copies…
mroeschke Jun 26, 2024
dceb252
Fix singleton concat test
mroeschke Jun 26, 2024
4e648d6
Move an unstack shallow copy
mroeschke Jun 26, 2024
b8d4730
Add note about add prefix, suffix
mroeschke Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 21 additions & 41 deletions python/cudf/cudf/core/reshape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,51 +300,31 @@ def concat(objs, axis=0, join="outer", ignore_index=False, sort=None):
obj = objs[0]
if ignore_index:
if axis == 1:
result = cudf.DataFrame._from_data(
data=obj._data.copy(deep=True),
index=obj.index.copy(deep=True),
)
# The DataFrame constructor for dict-like data (such as the
# ColumnAccessor given by obj._data here) will drop any columns
# in the data that are not in `columns`, so we have to rename
# after construction.
result.columns = pd.RangeIndex(len(obj._data.names))
else:
if isinstance(obj, cudf.Series):
result = cudf.Series._from_data(
data=obj._data.copy(deep=True),
index=cudf.RangeIndex(len(obj)),
)
elif isinstance(obj, pd.Series):
result = cudf.Series(
data=obj,
index=cudf.RangeIndex(len(obj)),
)
Comment on lines -318 to -322
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this dead-code? I think we error for this situation above no? Just confirming.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct, this is dead code. We validate the input is a cudf object before we get here

result = obj.to_frame()
else:
result = cudf.DataFrame._from_data(
data=obj._data.copy(deep=True),
index=cudf.RangeIndex(len(obj)),
)
result = obj.copy(deep=True)
result.columns = pd.RangeIndex(len(result._data))
else:
result = type(obj)._from_data(
data=obj._data.copy(deep=True),
index=cudf.RangeIndex(len(obj)),
)
elif axis == 0:
result = obj.copy(deep=True)
else:
if axis == 0:
result = obj.copy()
if isinstance(obj, cudf.Series):
result = obj.to_frame()
else:
data = obj._data.copy(deep=True)
if isinstance(obj, cudf.Series) and obj.name is None:
# If the Series has no name, pandas renames it to 0.
data[0] = data.pop(None)
result = cudf.DataFrame._from_data(
data, index=obj.index.copy(deep=True)
result = obj.copy(deep=True)
if keys is not None and isinstance(result, cudf.DataFrame):
k = keys[0]
result.columns = cudf.MultiIndex.from_tuples(
[
(k, *c) if isinstance(c, tuple) else (k, c)
for c in result._column_names
]
)
if keys is not None:
if isinstance(result, cudf.DataFrame):
k = keys[0]
result.columns = cudf.MultiIndex.from_tuples(
[
(k, *c) if isinstance(c, tuple) else (k, c)
for c in result._column_names
]
)

if isinstance(result, cudf.Series) and axis == 0:
# sort has no effect for series concatted along axis 0
Expand Down Expand Up @@ -1179,7 +1159,6 @@ def unstack(df, level, fill_value=None):
if pd.api.types.is_list_like(level):
if not level:
return df
df = df.copy(deep=False)
if not isinstance(df.index, cudf.MultiIndex):
dtype = df._columns[0].dtype
for col in df._columns:
Expand All @@ -1195,6 +1174,7 @@ def unstack(df, level, fill_value=None):
)
return res
else:
df = df.copy(deep=False)
columns = df.index._poplevels(level)
index = df.index
result = _pivot(df, index, columns)
Expand Down
4 changes: 3 additions & 1 deletion python/cudf/cudf/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ def __init__(
data = {}

if isinstance(data, (pd.Series, pd.Index, BaseIndex, Series)):
if copy:
if copy and not isinstance(data, (pd.Series, pd.Index)):
data = data.copy(deep=True)
name_from_data = data.name
column = as_column(data, nan_as_null=nan_as_null, dtype=dtype)
Expand Down Expand Up @@ -3434,13 +3434,15 @@ def rename(self, index=None, copy=True):
@_cudf_nvtx_annotate
def add_prefix(self, prefix):
return Series._from_data(
# TODO: Change to deep=False when copy-on-write is default
data=self._data.copy(deep=True),
index=prefix + self.index.astype(str),
)

@_cudf_nvtx_annotate
def add_suffix(self, suffix):
return Series._from_data(
# TODO: Change to deep=False when copy-on-write is default
data=self._data.copy(deep=True),
index=self.index.astype(str) + suffix,
)
Expand Down
Loading