-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
PERF: get_block_type #52109
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
Merged
Merged
PERF: get_block_type #52109
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 |
---|---|---|
|
@@ -2329,7 +2329,7 @@ def maybe_coerce_values(values: ArrayLike) -> ArrayLike: | |
return values | ||
|
||
|
||
def get_block_type(dtype: DtypeObj): | ||
def get_block_type(dtype: DtypeObj) -> type[Block]: | ||
""" | ||
Find the appropriate Block subclass to use for the given values and dtype. | ||
|
||
|
@@ -2341,30 +2341,26 @@ def get_block_type(dtype: DtypeObj): | |
------- | ||
cls : class, subclass of Block | ||
""" | ||
# We use kind checks because it is much more performant | ||
# than is_foo_dtype | ||
kind = dtype.kind | ||
|
||
cls: type[Block] | ||
|
||
if isinstance(dtype, SparseDtype): | ||
# Need this first(ish) so that Sparse[datetime] is sparse | ||
cls = ExtensionBlock | ||
return ExtensionBlock | ||
elif isinstance(dtype, DatetimeTZDtype): | ||
cls = DatetimeTZBlock | ||
return DatetimeTZBlock | ||
elif isinstance(dtype, PeriodDtype): | ||
cls = NDArrayBackedExtensionBlock | ||
return NDArrayBackedExtensionBlock | ||
elif isinstance(dtype, ExtensionDtype): | ||
# Note: need to be sure PandasArray is unwrapped before we get here | ||
cls = ExtensionBlock | ||
return ExtensionBlock | ||
|
||
elif kind in ["M", "m"]: | ||
cls = DatetimeLikeBlock | ||
# We use kind checks because it is much more performant | ||
# than is_foo_dtype | ||
kind = dtype.kind | ||
if kind in ["M", "m"]: | ||
return DatetimeLikeBlock | ||
elif kind in ["f", "c", "i", "u", "b"]: | ||
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. we can improve a little bit here by checking 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. updated |
||
cls = NumericBlock | ||
else: | ||
cls = ObjectBlock | ||
return cls | ||
return NumericBlock | ||
|
||
return ObjectBlock | ||
|
||
|
||
def new_block_2d( | ||
|
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.
i think the SparseDtype check may no longer be needed
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.
removed
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.
your suggested updates give a bit of an improvement to non-EA's as well: