Skip to content

REF: avoid broadcasting of Series to DataFrame in ops for ArrayManager #40482

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

Closed
wants to merge 7 commits into from
Closed

REF: avoid broadcasting of Series to DataFrame in ops for ArrayManager #40482

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4194e9
REF: avoid broadcasting of Series to DataFrame in ops for ArrayManager
jorisvandenbossche Mar 17, 2021
120010a
hack for NaT
jorisvandenbossche Mar 17, 2021
5816485
Merge remote-tracking branch 'upstream/master' into ops-refactor-broa…
jorisvandenbossche Mar 31, 2021
c59d85e
update for comments
jorisvandenbossche Mar 31, 2021
3f64e43
Merge remote-tracking branch 'upstream/master' into ops-refactor-broa…
jorisvandenbossche Mar 31, 2021
f53bf76
fixes
jorisvandenbossche Mar 31, 2021
60822ce
Merge remote-tracking branch 'upstream/master' into ops-refactor-broa…
jorisvandenbossche Nov 15, 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
8 changes: 7 additions & 1 deletion pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@
)
from pandas.core.array_algos.take import take_2d_multi
from pandas.core.arraylike import OpsMixin
from pandas.core.arrays import ExtensionArray
from pandas.core.arrays import (
ExtensionArray,
TimedeltaArray,
)
from pandas.core.arrays.sparse import SparseFrameAccessor
from pandas.core.construction import (
extract_array,
Expand Down Expand Up @@ -6675,6 +6678,9 @@ def _dispatch_frame_op(self, right, func: Callable, axis: Optional[int] = None):

right = right._values

if isinstance(right, TimedeltaArray):
right = right._data
Copy link
Member

Choose a reason for hiding this comment

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

  1. this is AM-only right?
  2. wont the array_op call just re-wrap this?
  3. if not, will something like DataFrame[int] + Series[timedelta64ns] fail to raise because of this?

Copy link
Member

Choose a reason for hiding this comment

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

  1. if this is a hack as the commit message suggests, then a comment would be worthwhile

Copy link
Member Author

Choose a reason for hiding this comment

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

See #40482 (comment) for the general explanation of in which case this happens. It was not my intention to keep this, I am hoping to find a better solution.

Copy link
Member

Choose a reason for hiding this comment

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

Yah I saw that, thought about commenting, but decided that "last time i handled that by reshaping to 2D" wouldn't be something you'd find that helpful.


arrays = [
array_op(_left, _right)
for _left, _right in zip(self._iter_column_arrays(), right)
Expand Down