-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: Interchange object data buffer has the wrong dtype / from_dataframe incorrect #57570
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
mroeschke
merged 1 commit into
pandas-dev:main
from
MarcoGorelli:breaking-interchange-fixes
Feb 23, 2024
+68
−11
Merged
Changes from all commits
Commits
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
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
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 |
---|---|---|
|
@@ -278,20 +278,28 @@ def _get_data_buffer( | |
""" | ||
Return the buffer containing the data and the buffer's associated dtype. | ||
""" | ||
if self.dtype[0] in ( | ||
DtypeKind.INT, | ||
DtypeKind.UINT, | ||
DtypeKind.FLOAT, | ||
DtypeKind.BOOL, | ||
DtypeKind.DATETIME, | ||
): | ||
if self.dtype[0] == DtypeKind.DATETIME: | ||
# self.dtype[2] is an ArrowCTypes.TIMESTAMP where the tz will make | ||
# it longer than 4 characters | ||
if self.dtype[0] == DtypeKind.DATETIME and len(self.dtype[2]) > 4: | ||
if len(self.dtype[2]) > 4: | ||
WillAyd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
np_arr = self._col.dt.tz_convert(None).to_numpy() | ||
else: | ||
np_arr = self._col.to_numpy() | ||
buffer = PandasBuffer(np_arr, allow_copy=self._allow_copy) | ||
dtype = ( | ||
DtypeKind.INT, | ||
64, | ||
ArrowCTypes.INT64, | ||
Endianness.NATIVE, | ||
) | ||
elif self.dtype[0] in ( | ||
DtypeKind.INT, | ||
DtypeKind.UINT, | ||
DtypeKind.FLOAT, | ||
DtypeKind.BOOL, | ||
): | ||
np_arr = self._col.to_numpy() | ||
buffer = PandasBuffer(np_arr, allow_copy=self._allow_copy) | ||
dtype = self.dtype | ||
elif self.dtype[0] == DtypeKind.CATEGORICAL: | ||
codes = self._col.values._codes | ||
|
@@ -314,7 +322,12 @@ def _get_data_buffer( | |
# Define the dtype for the returned buffer | ||
# TODO: this will need correcting | ||
# https://github.com/pandas-dev/pandas/issues/54781 | ||
dtype = self.dtype | ||
dtype = ( | ||
DtypeKind.UINT, | ||
8, | ||
ArrowCTypes.UINT8, | ||
Endianness.NATIVE, | ||
) # note: currently only support native endianness | ||
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. Are we planning to ever support anything but that as an exporter? 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. I don't know tbh cc @jorisvandenbossche in case you have comments on this |
||
else: | ||
raise NotImplementedError(f"Data type {self._col.dtype} not handled yet") | ||
|
||
|
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
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.
drive-by: these are already covered by
ruff
😎