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

[REVIEW] Reindex in DataFrame.__setitem__ #7957

Merged
merged 2 commits into from
Apr 16, 2021
+27 −19
Merged

[REVIEW] Reindex in DataFrame.__setitem__ #7957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f451fd6
Reindex in `DataFrame.__setitem__` (#7948)
galipremsagar Apr 13, 2021
f1c48cd
pin max pandas to 1.2.4
galipremsagar Apr 14, 2021
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
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.7,<3.9
- numba>=0.49.0,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.4
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.7,<3.9
- numba>=0.49,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.4
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.7,<3.9
- numba>=0.49,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.4
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.7,<3.9
- numba>=0.49,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.4
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- python>=3.7,<3.9
- numba>=0.49,!=0.51.0
- numpy
- pandas>=1.0,<1.3.0dev0
- pandas>=1.0,<=1.2.4
- pyarrow=1.0.1
- fastavro>=0.22.9
- notebook>=0.5.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ requirements:
- protobuf
- python
- typing_extensions
- pandas >=1.0,<1.3.0dev0
- pandas >=1.0,<=1.2.4
- cupy >7.1.0,<9.0.0a0
- numba >=0.49.0
- numpy
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/cudf/core/_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
PANDAS_GE_100 = PANDAS_VERSION >= version.parse("1.0")
PANDAS_GE_110 = PANDAS_VERSION >= version.parse("1.1")
PANDAS_GE_120 = PANDAS_VERSION >= version.parse("1.2")
PANDAS_EQ_123 = PANDAS_VERSION == version.parse("1.2.3")
PANDAS_LE_122 = PANDAS_VERSION <= version.parse("1.2.2")
10 changes: 9 additions & 1 deletion python/cudf/cudf/core/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7931,7 +7931,12 @@ def _align_indices(lhs, rhs):
return lhs_out, rhs_out


def _setitem_with_dataframe(input_df, replace_df, input_cols=None, mask=None):
def _setitem_with_dataframe(
input_df: DataFrame,
replace_df: DataFrame,
input_cols: Any = None,
mask: Optional[cudf.core.column.ColumnBase] = None,
):
"""
This function sets item dataframes relevant columns with replacement df
:param input_df: Dataframe to be modified inplace
Expand All @@ -7948,6 +7953,9 @@ def _setitem_with_dataframe(input_df, replace_df, input_cols=None, mask=None):
"Number of Input Columns must be same replacement Dataframe"
)

if not input_df.index.equals(replace_df.index):
replace_df = replace_df.reindex(input_df.index)

for col_1, col_2 in zip(input_cols, replace_df.columns):
if col_1 in input_df.columns:
if mask is not None:
Expand Down
4 changes: 2 additions & 2 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 @@ -5,7 +5,7 @@
import pytest

import cudf
from cudf.core._compat import PANDAS_EQ_123, PANDAS_GE_120
from cudf.core._compat import PANDAS_GE_120, PANDAS_LE_122
from cudf.tests.utils import assert_eq, assert_exceptions_equal


Expand All @@ -21,7 +21,7 @@ def test_dataframe_setitem_bool_mask_scaler(df, arg, value):


@pytest.mark.xfail(
condition=PANDAS_EQ_123 or not PANDAS_GE_120,
condition=PANDAS_GE_120 and PANDAS_LE_122,
reason="https://github.com/pandas-dev/pandas/issues/40204",
)
def test_dataframe_setitem_scaler_bool():
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/requirements/cuda-10.1/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ numpy
numpydoc
nvtx>=0.2.1
packaging
pandas>=1.0,<1.3.0dev0
pandas>=1.0,<=1.2.4
pandoc==2.0a4
protobuf
pyorc
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/requirements/cuda-10.2/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ numpy
numpydoc
nvtx>=0.2.1
packaging
pandas>=1.0,<1.3.0dev0
pandas>=1.0,<=1.2.4
pandoc==2.0a4
protobuf
pyorc
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/requirements/cuda-11.0/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ numpy
numpydoc
nvtx>=0.2.1
packaging
pandas>=1.0,<1.3.0dev0
pandas>=1.0,<=1.2.4
pandoc==2.0a4
protobuf
pyorc
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/requirements/cuda-11.1/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ numpy
numpydoc
nvtx>=0.2.1
packaging
pandas>=1.0,<1.3.0dev0
pandas>=1.0,<=1.2.4
pandoc==2.0a4
protobuf
pyorc
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/requirements/cuda-11.2/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ numpy
numpydoc
nvtx>=0.2.1
packaging
pandas>=1.0,<1.3.0dev0
pandas>=1.0,<=1.2.4
pandoc==2.0a4
protobuf
pyorc
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"fastavro>=0.22.9",
"fsspec>=0.6.0",
"numpy",
"pandas>=1.0,<1.3.0dev0",
"pandas>=1.0,<=1.2.4",
"typing_extensions",
"protobuf",
"nvtx>=0.2.1",
Expand Down
2 changes: 1 addition & 1 deletion python/dask_cudf/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ distributed>=2.22.0,<=2021.4.0
fsspec>=0.6.0
numba>=0.49.0,!=0.51.0
numpy
pandas>=1.0,<1.3.0dev0
pandas>=1.0,<=1.2.4
pytest
setuptools
wheel
Expand Down
4 changes: 2 additions & 2 deletions python/dask_cudf/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"distributed>=2.22.0,<=2021.4.0",
"fsspec>=0.6.0",
"numpy",
"pandas>=1.0,<1.3.0dev0",
"pandas>=1.0,<=1.2.4",
]

extras_require = {
"test": [
"numpy",
"pandas>=1.0,<1.3.0dev0",
"pandas>=1.0,<=1.2.4",
"pytest",
"numba>=0.49.0,!=0.51.0",
"dask==2021.4.0",
Expand Down