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

[REVIEW] Add __setitem__() #2442

Merged
merged 101 commits into from
Aug 12, 2019
Merged

[REVIEW] Add __setitem__() #2442

merged 101 commits into from
Aug 12, 2019

Conversation

shwina
Copy link
Contributor

@shwina shwina commented Jul 31, 2019 •
edited
Loading

Fixes #1468

Enables setting values of a Series by position or label via s[key] = value, s.iloc[key] = value and s.loc[key] = value. key can be:

  • A scalar value
  • A range of values (utilizes cudf::copy_range)
  • A Series-like of values (utilizes cudf::scatter)
  • A boolean mask (utilizes cudf::scatter)

Adds Series.at and Series.iat as aliases for Series.loc and Series.iloc.

Also enables df.iloc[key] = value and df.loc[key] = value for DataFrames.

Not supported:

  1. Setting rows of a DF
  2. df.loc for dataframes with a MultiIndex

shwina and others added 30 commits July 16, 2019 10:42
@shwina
Use join for series loc indexing - fails on categorical loc test
6134d56
@shwina
black
43976fe
@shwina
Enable conversinon from string to categorical columns
b786286
@shwina
Merge branch 'as-categorical' into slice-loc-improve
b5e0811
@shwina
Add utility to convert from categorical to string columns
7b98c69
@shwina
Fix column.take() for empty input
0a3d823
@shwina
Add test for empty loc
44632d4
@shwina
Handle categorical index in loc correctly
0cec124
@shwina
Restore else statement
020f9be
@shwina
Simplify dtype equality check
0d44b8c
@shwina
Better naming
29db7bc
@shwina
changelog
14d3efe
@shwina
Fix checking for wrong dtype
72c9e89
@shwina
flake8
6a2d664
@shwina
Merge branch 'opt-gather-scatter' of https://github.com/hummingtree/cudf
88795f9 
 into add-setitem
@shwina
Rename selvals to data for consistency
4ba36b5
@shwina
Replace multiple apply_gather* functions with a single one
f9f84bf
Merge branch 'branch-0.9' into loc-perf
0c8ad34
@shwina
Eliminate duplication of __getitem__ logic between Series and Column
336ee22
@shwina
Merge branch 'branch-0.9' of https://github.com/rapidsai/cudf into ad…
daa4ccb 
…d-setitem
@shwina
More work on localizing __getitem__() to Column.__getitem__()
440dfe8
@shwina
Enable apply_gather to handle both Column and list of Column
efced4c
@shwina
Use base implementation of element_indexing() and take() in StringColumn
ec18e9a
@shwina
Remove check for non-zero null count in StringIndex
5ee7f72
@shwina
Merge branch 'branch-0.9' of https://github.com/rapidsai/cudf into lo…
f6687f4 
…c-perf
@shwina
Remove unused import
5fbe16c
@shwina
Restore import
04d589a
@shwina
Merge branch 'branch-0.9' of https://github.com/rapidsai/cudf into ad…
515abe6 
…d-setitem
@shwina
Move indexing/selection tests to new file test_indexing.py
f1e2778
@shwina
Merge branch 'opt-gather-scatter' of https://github.com/hummingtree/cudf
bb448ca 
 into add-setitem
@seunghwak seunghwak mentioned this pull request Aug 9, 2019
Merged
@harrism harrism mentioned this pull request Aug 12, 2019
Closed
4 tasks
@shwina shwina mentioned this pull request Aug 12, 2019
Closed
@kkraus14 kkraus14 added 3 - Ready for Review Ready for review by team 4 - Needs cuDF (Python) Reviewer and removed 2 - In Progress Currently a work in progress labels Aug 12, 2019
kkraus14
kkraus14 approved these changes Aug 12, 2019
View reviewed changes
Copy link
Collaborator

@kkraus14 kkraus14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, had a few minor comments, but they can be dealt with in followups

@kkraus14 kkraus14 added 5 - Ready to Merge Testing and reviews complete, ready to merge and removed 3 - Ready for Review Ready for review by team 4 - Needs cuDF (Python) Reviewer labels Aug 12, 2019
@kkraus14 kkraus14 merged commit 5b3675d into rapidsai:branch-0.9 Aug 12, 2019
@seunghwak seunghwak mentioned this pull request Aug 14, 2019
Merged
@wence- wence- mentioned this pull request Oct 11, 2022
Closed
wence- added a commit to wence-/cudf that referenced this pull request Oct 11, 2022
@wence-
Fix type casting in Series.__setitem__
cdbce51 
To mimic pandas, we must upcast a column to the numpy result_type of
the column itself and the input value dtype. This previously occurred
in all relevant cases except when the index provided to __setitem__
was a single integer (originally introduced in rapidsai#2442). Closes rapidsai#11901.
@wence- wence- mentioned this pull request Oct 11, 2022
Merged
3 tasks
rapids-bot bot pushed a commit that referenced this pull request Nov 4, 2022
@wence-
Fix type casting in Series.__setitem__ (#11904)
11b875b 
To mimic pandas, we must upcast a column to the numpy result_type of the column itself and the input value dtype. This previously occurred in all relevant cases except when the index provided to __setitem__ was a single integer (originally introduced in #2442). Closes #11901.

Authors:
  - Lawrence Mitchell (https://github.com/wence-)

Approvers:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Bradley Dice (https://github.com/bdice)

URL: #11904
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trxcllnt trxcllnt trxcllnt left review comments

@cwharris cwharris cwharris left review comments

@kkraus14 kkraus14 kkraus14 approved these changes

@brandon-b-miller brandon-b-miller brandon-b-miller left review comments

@harrism harrism harrism approved these changes

Assignees

@shwina shwina

Labels
5 - Ready to Merge Testing and reviews complete, ready to merge Python Affects Python cuDF API.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEA] Assignment by index
7 participants
@shwina @randerzander @cwharris @trxcllnt @harrism @kkraus14 @brandon-b-miller