Skip to content

ENH: Add CoW optimization to interpolate #51249

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

Merged
phofl merged 13 commits into from
Feb 10, 2023
Merged

ENH: Add CoW optimization to interpolate #51249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2cef799
ENH: Implement CoW for interpolate
phofl Feb 7, 2023
26f3972
Fix and add first test
phofl Feb 7, 2023
27648c6
Add tests
phofl Feb 7, 2023
80c95de
Add tests
phofl Feb 7, 2023
d132161
ENH: Add CoW optimization to interpolate
phofl Feb 8, 2023
644af0c
Remove comment
phofl Feb 8, 2023
425f8f4
Fix
phofl Feb 8, 2023
3119c84
Fix
phofl Feb 8, 2023
58bffc9
Fix tests
phofl Feb 9, 2023
254de7d
Simplify
phofl Feb 9, 2023
30ac5f3
Simplify
phofl Feb 9, 2023
1e82658
Merge branch 'main' into cow_interp
phofl Feb 9, 2023
64b40ce
Update pandas/tests/copy_view/test_interp_fillna.py
phofl Feb 10, 2023
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
Prev Previous commit
Next Next commit
Fix tests
  • Loading branch information
@phofl
phofl committed Feb 9, 2023
commit 58bffc9487ad54adf5a1b33ffa044e0984c8f0b8
5 changes: 3 additions & 2 deletions pandas/tests/copy_view/test_interp_fillna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_interpolate_no_op(using_copy_on_write, method):
tm.assert_frame_equal(df, df_orig)


@pytest.mark.parametrize("func", ["pad", "ffill", "backfill", "bfill"])
@pytest.mark.parametrize("func", ["ffill", "bfill"])
def test_interp_fill_functions(using_copy_on_write, func):
# Check that these takes the same code paths as interpolate
df = DataFrame({"a": [1, 2]})
Expand Down Expand Up @@ -144,7 +144,8 @@ def test_interpolate_downcast(using_copy_on_write):
arr_a = get_array(df, "a")
df.interpolate(method="pad", inplace=True, downcast="infer")

assert df._mgr._has_no_reference(0)
if using_copy_on_write:
assert df._mgr._has_no_reference(0)
assert np.shares_memory(arr_a, get_array(df, "a"))


Expand Down
10 changes: 7 additions & 3 deletions pandas/tests/frame/methods/test_interpolate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def test_interpolate_inplace(self, frame_or_series, using_array_manager, request
assert np.shares_memory(orig, obj.values)
assert orig.squeeze()[1] == 1.5

def test_interp_basic(self):
def test_interp_basic(self, using_copy_on_write):
df = DataFrame(
{
"A": [1, 2, np.nan, 4],
Expand All @@ -75,8 +75,12 @@ def test_interp_basic(self):
# check we didn't operate inplace GH#45791
cvalues = df["C"]._values
dvalues = df["D"].values
assert not np.shares_memory(cvalues, result["C"]._values)
assert not np.shares_memory(dvalues, result["D"]._values)
if using_copy_on_write:
assert np.shares_memory(cvalues, result["C"]._values)
assert np.shares_memory(dvalues, result["D"]._values)
else:
assert not np.shares_memory(cvalues, result["C"]._values)
assert not np.shares_memory(dvalues, result["D"]._values)

res = df.interpolate(inplace=True)
assert res is None
Expand Down