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

Jump to bottom

Deprecate Series.applymap #10497

Merged
merged 9 commits into from
Mar 29, 2022
Merged

Deprecate Series.applymap #10497

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2597183
deprecate Series.applymap
brandon-b-miller Mar 22, 2022
847a205
deprecate and filter warnings
brandon-b-miller Mar 23, 2022
89cba8a
copyrights
brandon-b-miller Mar 23, 2022
e0d5203
Apply suggestions from code review
brandon-b-miller Mar 23, 2022
f04b10c
Bugfix
brandon-b-miller Mar 24, 2022
1dde555
Merge branch 'branch-22.06' into deprecate-series-applymap
brandon-b-miller Mar 28, 2022
ad38beb
fix import
brandon-b-miller Mar 28, 2022
4435672
style
brandon-b-miller Mar 28, 2022
1b85370
merge latest and resolve conflicts
brandon-b-miller Mar 28, 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
10 changes: 9 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 @@ -1011,7 +1011,10 @@ def map(self, arg, na_action=None) -> "Series":
result.name = self.name
result.index = self.index
else:
result = self.applymap(arg)
# TODO: switch to `apply`
with warnings.catch_warnings():
warnings.simplefilter("ignore")
brandon-b-miller marked this conversation as resolved.
Show resolved Hide resolved
result = self.applymap(arg)
return result

@_cudf_nvtx_annotate
Expand Down Expand Up @@ -2241,6 +2244,11 @@ def applymap(self, udf, out_dtype=None):
4 105
dtype: int64
"""
warnings.warn(
"Series.applymap is deprecated and will be removed "
"in a future cuDF release. Use Series.apply instead",
brandon-b-miller marked this conversation as resolved.
Show resolved Hide resolved
FutureWarning,
)
if not callable(udf):
raise ValueError("Input UDF must be a callable object.")
return self._from_data({self.name: self._unaryop(udf)}, self._index)
Expand Down
10 changes: 6 additions & 4 deletions python/cudf/cudf/tests/test_applymap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ def test_applymap_round(nelem, masked):
sr = Series(data)

# Call applymap
out = sr.applymap(
lambda x: (floor(x) + 1 if x - floor(x) >= 0.5 else floor(x))
)
with pytest.warns(FutureWarning):
out = sr.applymap(
lambda x: (floor(x) + 1 if x - floor(x) >= 0.5 else floor(x))
)

if masked:
# Fill masked values
Expand All @@ -50,7 +51,8 @@ def test_applymap_change_out_dtype():

sr = Series(data)

out = sr.applymap(lambda x: float(x), out_dtype=float)
with pytest.warns(FutureWarning):
out = sr.applymap(lambda x: float(x), out_dtype=float)

# Check
expect = np.array(data, dtype=float)
Expand Down
3 changes: 2 additions & 1 deletion python/cudf/cudf/tests/test_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def test_applymap_python_lambda(dtype, udf, testfunc):
lhs_arr = np.random.random(size).astype(dtype)
lhs_ser = Series(lhs_arr)

out_ser = lhs_ser.applymap(udf)
with pytest.warns(FutureWarning):
out_ser = lhs_ser.applymap(udf)
result = testfunc(lhs_arr)
np.testing.assert_almost_equal(result, out_ser.to_numpy())
6 changes: 4 additions & 2 deletions python/cudf/cudf/tests/test_udf_masked_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,15 +645,17 @@ def test_masked_udf_caching():

data = cudf.Series([1, 2, 3])
expect = data ** 2
got = data.applymap(lambda x: x ** 2)
with pytest.warns(FutureWarning):
got = data.applymap(lambda x: x ** 2)

assert_eq(expect, got, check_dtype=False)

# update the constant value being used and make sure
# it does not result in a cache hit

expect = data ** 3
got = data.applymap(lambda x: x ** 3)
with pytest.warns(FutureWarning):
got = data.applymap(lambda x: x ** 3)
assert_eq(expect, got, check_dtype=False)

# make sure we get a hit when reapplying
Expand Down