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.

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] Fix inplace update of data and add Series.update #7201

Merged
merged 35 commits into from
Mar 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8bf0dd6
fix inplace updation of data and add Series.update
galipremsagar Jan 23, 2021
8166770
Merge remote-tracking branch 'upstream/branch-0.18' into 7187
galipremsagar Jan 23, 2021
17b4273
Merge remote-tracking branch 'upstream/branch-0.18' into 7187
galipremsagar Jan 25, 2021
30bb38b
Merge remote-tracking branch 'upstream/branch-0.18' into 7187
galipremsagar Jan 28, 2021
73f2cd1
Merge remote-tracking branch 'upstream/branch-0.18' into 7187
galipremsagar Feb 1, 2021
c87de03
fix where type-casting logic and update logic
galipremsagar Feb 2, 2021
17f652e
Merge remote-tracking branch 'upstream/branch-0.18' into 7187
galipremsagar Feb 2, 2021
f05bda4
move where related internal apis
galipremsagar Feb 3, 2021
77c91fd
Merge remote-tracking branch 'upstream/branch-0.19' into 7187
galipremsagar Feb 3, 2021
5e7cf4e
move where core logic to where.py
galipremsagar Feb 4, 2021
8aec382
merge
galipremsagar Mar 24, 2021
d1e0646
Merge remote-tracking branch 'upstream/branch-0.19' into 7187
galipremsagar Mar 25, 2021
8dc1b9e
Apply suggestions from code review
galipremsagar Mar 25, 2021
0328cb7
Merge branch '7187' of https://github.com/galipremsagar/cudf into 7187
galipremsagar Mar 25, 2021
7b4079e
use _column_names instead of columns
galipremsagar Mar 25, 2021
aae8f0b
copyright
galipremsagar Mar 25, 2021
467957c
address reviews
galipremsagar Mar 25, 2021
679ffb4
address reviews
galipremsagar Mar 25, 2021
7a08180
Merge remote-tracking branch 'upstream/branch-0.19' into 7187
galipremsagar Mar 29, 2021
85d7928
return a cudf scalar
galipremsagar Mar 29, 2021
2764a85
add cudf can_cast utility
galipremsagar Mar 30, 2021
9362195
add type annotations
galipremsagar Mar 30, 2021
f7ca268
add typing for _check_and_cast_columns
galipremsagar Mar 30, 2021
21c2ac6
add typing in where
galipremsagar Mar 30, 2021
d770d61
typing
galipremsagar Mar 30, 2021
db25a59
refactor
galipremsagar Mar 30, 2021
ba8b7d5
Merge remote-tracking branch 'upstream/branch-0.19' into 7187
galipremsagar Mar 30, 2021
e5b140a
remove duplicated logic and squash into single method
galipremsagar Mar 30, 2021
95d409b
use _column_names
galipremsagar Mar 30, 2021
349fff5
handle different shape
galipremsagar Mar 30, 2021
17a581e
address reviews
galipremsagar Mar 30, 2021
16f9738
use cudf utility for is_numerical_dtype
galipremsagar Mar 30, 2021
4db4020
Merge remote-tracking branch 'upstream/branch-0.19' into 7187
galipremsagar Mar 31, 2021
4268d65
handle generic types
galipremsagar Mar 31, 2021
05965dd
refactor
galipremsagar Mar 31, 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
6 changes: 3 additions & 3 deletions python/cudf/cudf/_lib/copying.pyx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2020, NVIDIA CORPORATION.
# Copyright (c) 2020-2021, NVIDIA CORPORATION.

import pandas as pd

Expand Down Expand Up @@ -564,11 +564,11 @@ def copy_if_else(object lhs, object rhs, Column boolean_mask):
return _copy_if_else_column_column(lhs, rhs, boolean_mask)
else:
return _copy_if_else_column_scalar(
lhs, as_device_scalar(rhs, lhs.dtype), boolean_mask)
lhs, as_device_scalar(rhs), boolean_mask)
else:
if isinstance(rhs, Column):
return _copy_if_else_scalar_column(
as_device_scalar(lhs, rhs.dtype), rhs, boolean_mask)
as_device_scalar(lhs), rhs, boolean_mask)
else:
if lhs is None and rhs is None:
return lhs
Expand Down
4 changes: 2 additions & 2 deletions python/cudf/cudf/core/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) 2018-2020, NVIDIA CORPORATION.
# Copyright (c) 2018-2021, NVIDIA CORPORATION.

from cudf.core import buffer, column, column_accessor, common
from cudf.core import _internals, buffer, column, column_accessor, common
from cudf.core.buffer import Buffer
from cudf.core.dataframe import DataFrame, from_pandas, merge
from cudf.core.index import (
Expand Down
3 changes: 3 additions & 0 deletions python/cudf/cudf/core/_internals/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Copyright (c) 2021, NVIDIA CORPORATION.

from cudf.core._internals.where import where
Loading