8000 PERF: op(frame, series) when series is not EA by jbrockmendel · Pull Request #33600 · pandas-dev/pandas · GitHub
[go: up one dir, main page]

Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b01ff4a
PERF: operate blockwise in Frame + Series
jbrockmendel Apr 15, 2020
43518f1
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 16, 2020
f75ca17
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 16, 2020
3374660
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 16, 2020
9217e7e
benchmark, cleanup special case
jbrockmendel Apr 16, 2020
d0bc914
clean up comments
jbrockmendel Apr 16, 2020
6450b2b
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 17, 2020
6fa2da9
revert unrelated
jbrockmendel Apr 17, 2020
4f4d35a
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 17, 2020
0e31f95
8000 npdev fix
jbrockmendel Apr 17, 2020
574afb9
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 18, 2020
63823f1
troubleshoot asv
jbrockmendel Apr 18, 2020
281807c
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 19, 2020
f8a4ea4
Merge branch 'master' of https://github.com/pandas-dev/pandas into pe…
jbrockmendel Apr 21, 2020
229369b
remove asv to troubleshoot CI
jbrockmendel Apr 21, 2020
711977e
whatsnew, asv
jbrockmendel Apr 21, 2020
86b64be
typo fixup
jbrockmendel Apr 21, 2020
0648cc8
restore asv
jbrockmendel Apr 21, 2020
2a2e9fc
div->truediv
jbrockmendel Apr 21, 2020
5cdf0b5
troubleshoot asvs
jbrockmendel Apr 21, 2020
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
Prev Previous commit
Next Next commit
revert unrelated
  • Loading branch information
jbrockmendel committed Apr 17, 2020
commit 6fa2da9554385dd23ab87c7f45c74f9828a33285
8 changes: 3 additions & 5 deletions pandas/core/ops/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,20 +340,18 @@ def column_op(a, b):
right = np.asarray(right)

def column_op(a, b):
return {i: func(a._ixs(i, axis=1), b[i]) for i in range(len(a.columns))}
return {i: func(a.iloc[:, i], b[i]) for i in range(len(a.columns))}

else:

def column_op(a, b):
return {
i: func(a._ixs(i, axis=1), b.iloc[i]) for i in range(len(a.columns))
}
return {i: func(a.iloc[:, i], b.iloc[i]) for i in range(len(a.columns))}

elif isinstance(right, ABCSeries):
assert right.index.equals(left.index) # Handle other cases later

def column_op(a, b):
return {i: func(a._get_column_array(i), b) for i in range(len(a.columns))}
return {i: func(a.iloc[:, i], b) for i in range(len(a.columns))}

else:
# Remaining cases have less-obvious dispatch rules
Expand Down
0