-
Notifications
You must be signed in to change notification settings - Fork 915
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
Allow None
when nan_as_null=False
in column constructor
#15709
Merged
+49
−34
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
4beec73
allow None values when nan_as_null=False
galipremsagar d737cd2
Merge branch 'branch-24.06' into 15708
galipremsagar 8499dac
Update column.py
galipremsagar 8106317
Update column.py
galipremsagar 4ed3f05
Update column.py
galipremsagar 1142972
improve if condition
galipremsagar 383ea3d
Merge remote-tracking branch 'upstream/branch-24.06' into 15708
galipremsagar aeba17b
Update python/cudf/cudf/core/column/column.py
galipremsagar a1d11a2
Update column.py
galipremsagar dffae45
Merge remote-tracking branch 'upstream/branch-24.06' into 15708
galipremsagar e881370
Merge remote-tracking branch 'upstream/branch-24.06' into 15708
galipremsagar 6570322
separate booleans
galipremsagar d88c23a
Simplify
galipremsagar 1d46749
Merge branch 'branch-24.06' into 15708
galipremsagar dd60e3e
Apply suggestions from code review
galipremsagar 61e95bc
Simplify
galipremsagar a4dce14
Merge branch 'branch-24.06' into 15708
galipremsagar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -1411,6 +1411,13 @@ def column_empty_like( | |||||
return column_empty(row_count, dtype, masked) | ||||||
|
||||||
|
||||||
def _has_any_nan(arbitrary): | ||||||
return any( | ||||||
((isinstance(x, float) or isinstance(x, np.floating)) and np.isnan(x)) | ||||||
for x in np.asarray(arbitrary) | ||||||
) | ||||||
|
||||||
|
||||||
def column_empty_like_same_mask( | ||||||
column: ColumnBase, dtype: Dtype | ||||||
) -> ColumnBase: | ||||||
|
@@ -1948,9 +1955,20 @@ def as_column( | |||||
raise TypeError( | ||||||
f"Cannot convert a {inferred_dtype} of object type" | ||||||
) | ||||||
elif nan_as_null is False and ( | ||||||
pd.isna(arbitrary).any() | ||||||
elif inferred_dtype == "boolean": | ||||||
if cudf.get_option("mode.pandas_compatible"): | ||||||
if dtype != np.dtype("bool") or pd.isna(arbitrary).any(): | ||||||
raise MixedTypeError( | ||||||
f"Cannot have mixed values with {inferred_dtype}" | ||||||
) | ||||||
elif nan_as_null is False and _has_any_nan(arbitrary): | ||||||
raise MixedTypeError( | ||||||
f"Cannot have mixed values with {inferred_dtype}" | ||||||
) | ||||||
elif ( | ||||||
nan_as_null is False | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't compare to booleans with
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||||||
and inferred_dtype not in ("decimal", "empty") | ||||||
and _has_any_nan(arbitrary) | ||||||
): | ||||||
# Decimal can hold float("nan") | ||||||
# All np.nan is not restricted by type | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need this comparison because
None
is also a supported parameter and it is similar toTrue
behavior.