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

Fix type casting in Series.__setitem__ #11904

Merged
merged 10 commits into from
Nov 4, 2022
Merged

Fix type casting in Series.__setitem__ #11904

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cdbce51
Fix type casting in Series.__setitem__
wence- Oct 11, 2022
6d264c3
Tighten scope of casting
wence- Oct 12, 2022
0f84c08
astype is no-op for matching dtype
wence- Oct 13, 2022
1a42d59
Fix typo
wence- Oct 13, 2022
5ab0796
Fix test and add status-quo tests for setitem with strings
wence- Oct 13, 2022
70511a3
Fix typo
wence- Oct 19, 2022
eabec20
Use is_XXX_dtype rather than isinstance
wence- Oct 19, 2022
b1d9ed4
Use cudf's dtype.__eq__ in astype
wence- Oct 19, 2022
da31624
Fix some minor issues
wence- Oct 20, 2022
22e3880
Grammar fix
wence- Nov 3, 2022
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
11 changes: 6 additions & 5 deletions python/cudf/cudf/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,12 @@ def __setitem__(self, key, value):
and _is_non_decimal_numeric_dtype(value.dtype)
):
# normalize types if necessary:
if not is_integer(key):
to_dtype = np.result_type(
value.dtype, self._frame._column.dtype
)
value = value.astype(to_dtype)
# In contrast to Column.__setitem__ (which downcasts the value to
# the dtype of the column) here we upcast the series to the
# larger data type mimicing pandas
wence- marked this conversation as resolved.
Show resolved Hide resolved
to_dtype = np.result_type(value.dtype, self._frame._column.dtype)
value = value.astype(to_dtype)
if to_dtype != self._frame._column.dtype:
self._frame._column._mimic_inplace(
self._frame._column.astype(to_dtype), inplace=True
wence- marked this conversation as resolved.
Show resolved Hide resolved
)
Expand Down
16 changes: 16 additions & 0 deletions python/cudf/cudf/tests/test_setitem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,3 +297,19 @@ def test_series_slice_setitem_struct():
actual[0:3] = cudf.Scalar({"a": {"b": 5050}, "b": 101})

assert_eq(actual, expected)


@pytest.mark.parametrize("dtype", [np.int32, np.int64, np.float32, np.float64])
@pytest.mark.parametrize("indices", [0, [1, 2]])
def test_series_setitem_upcasting(dtype, indices):
sr = pd.Series([0, 0, 0], dtype=dtype)
cr = cudf.from_pandas(sr)
assert_eq(sr.values, cr.values)
new_value = np.float64(10.5)
col_ref = cr._column
sr[indices] = new_value
cr[indices] = new_value
assert_eq(sr.values, cr.values)
wence- marked this conversation as resolved.
Show resolved Hide resolved
if dtype == np.float64:
# no-op type cast should not modify backing column
assert col_ref == cr._column