-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
PERF: NDArrayBackedExtensionArray in cython #40840
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
jreback
merged 8 commits into
pandas-dev:master
from
jbrockmendel:perf-ndarray-backed-4
Apr 14, 2021
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5b7eb17
PERF: implement NDArrayBacked in cython
jbrockmendel 9534e92
mix NDArrayBacked into PeriodArray
jbrockmendel cc41634
update import
jbrockmendel f1e48ee
simpler_new->simple_new
jbrockmendel 5d9224b
simpler_new -> simple_new
jbrockmendel 3300dcb
use @cython.freelist
jbrockmendel a271ff9
Merge branch 'master' into perf-ndarray-backed-4
jbrockmendel c5559c4
Merge branch 'master' into perf-ndarray-backed-4
jbrockmendel 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 |
---|---|---|
@@ -0,0 +1,167 @@ | ||
""" | ||
Cython implementations for internal ExtensionArrays. | ||
""" | ||
cimport cython | ||
|
||
import numpy as np | ||
|
||
cimport numpy as cnp | ||
from numpy cimport ndarray | ||
|
||
cnp.import_array() | ||
|
||
|
||
@cython.freelist(16) | ||
cdef class NDArrayBacked: | ||
""" | ||
Implementing these methods in cython improves performance quite a bit. | ||
|
||
import pandas as pd | ||
|
||
from pandas._libs.arrays import NDArrayBacked as cls | ||
|
||
dti = pd.date_range("2016-01-01", periods=3) | ||
dta = dti._data | ||
arr = dta._ndarray | ||
|
||
obj = cls._simple_new(arr, arr.dtype) | ||
|
||
# for foo in [arr, dta, obj]: ... | ||
|
||
%timeit foo.copy() | ||
299 ns ± 30 ns per loop # <-- arr underlying ndarray (for reference) | ||
530 ns ± 9.24 ns per loop # <-- dta with cython NDArrayBacked | ||
1.66 µs ± 46.3 ns per loop # <-- dta without cython NDArrayBacked | ||
328 ns ± 5.29 ns per loop # <-- obj with NDArrayBacked.__cinit__ | ||
371 ns ± 6.97 ns per loop # <-- obj with NDArrayBacked._simple_new | ||
|
||
%timeit foo.T | ||
125 ns ± 6.27 ns per loop # <-- arr underlying ndarray (for reference) | ||
226 ns ± 7.66 ns per loop # <-- dta with cython NDArrayBacked | ||
911 ns ± 16.6 ns per loop # <-- dta without cython NDArrayBacked | ||
215 ns ± 4.54 ns per loop # <-- obj with NDArrayBacked._simple_new | ||
|
||
""" | ||
# TODO: implement take in terms of cnp.PyArray_TakeFrom | ||
# TODO: implement concat_same_type in terms of cnp.PyArray_Concatenate | ||
|
||
cdef: | ||
readonly ndarray _ndarray | ||
readonly object _dtype | ||
|
||
def __init__(self, ndarray values, object dtype): | ||
self._ndarray = values | ||
self._dtype = dtype | ||
|
||
@classmethod | ||
def _simple_new(cls, ndarray values, object dtype): | ||
cdef: | ||
NDArrayBacked obj | ||
obj = NDArrayBacked.__new__(cls) | ||
obj._ndarray = values | ||
obj._dtype = dtype | ||
return obj | ||
|
||
cpdef NDArrayBacked _from_backing_data(self, ndarray values): | ||
""" | ||
Construct a new ExtensionArray `new_array` with `arr` as its _ndarray. | ||
|
||
This should round-trip: | ||
self == self._from_backing_data(self._ndarray) | ||
""" | ||
# TODO: re-reuse simple_new if/when it can be cpdef | ||
cdef: | ||
NDArrayBacked obj | ||
obj = NDArrayBacked.__new__(type(self)) | ||
obj._ndarray = values | ||
obj._dtype = self._dtype | ||
return obj | ||
|
||
cpdef __setstate__(self, state): | ||
if isinstance(state, dict): | ||
if "_data" in state: | ||
data = state.pop("_data") | ||
elif "_ndarray" in state: | ||
data = state.pop("_ndarray") | ||
else: | ||
raise ValueError | ||
self._ndarray = data | ||
self._dtype = state.pop("_dtype") | ||
|
||
for key, val in state.items(): | ||
setattr(self, key, val) | ||
elif isinstance(state, tuple): | ||
if len(state) != 3: | ||
if len(state) == 1 and isinstance(state[0], dict): | ||
self.__setstate__(state[0]) | ||
return | ||
raise NotImplementedError(state) | ||
|
||
data, dtype = state[:2] | ||
if isinstance(dtype, np.ndarray): | ||
dtype, data = data, dtype | ||
self._ndarray = data | ||
self._dtype = dtype | ||
|
||
if isinstance(state[2], dict): | ||
for key, val in state[2].items(): | ||
setattr(self, key, val) | ||
else: | ||
raise NotImplementedError(state) | ||
else: | ||
raise NotImplementedError(state) | ||
|
||
def __len__(self) -> int: | ||
return len(self._ndarray) | ||
|
||
@property | ||
def shape(self): | ||
# object cast bc _ndarray.shape is npy_intp* | ||
return (<object>(self._ndarray)).shape | ||
|
||
@property | ||
def ndim(self) -> int: | ||
return self._ndarray.ndim | ||
|
||
@property | ||
def size(self) -> int: | ||
return self._ndarray.size | ||
|
||
@property | ||
def nbytes(self) -> int: | ||
return self._ndarray.nbytes | ||
|
||
def copy(self): | ||
# NPY_ANYORDER -> same order as self._ndarray | ||
res_values = cnp.PyArray_NewCopy(self._ndarray, cnp.NPY_ANYORDER) | ||
return self._from_backing_data(res_values) | ||
|
||
def delete(self, loc, axis=0): | ||
res_values = np.delete(self._ndarray, loc, axis=axis) | ||
return self._from_backing_data(res_values) | ||
|
||
def swapaxes(self, axis1, axis2): | ||
res_values = cnp.PyArray_SwapAxes(self._ndarray, axis1, axis2) | ||
return self._from_backing_data(res_values) | ||
|
||
# TODO: pass NPY_MAXDIMS equiv to axis=None? | ||
def repeat(self, repeats, axis: int = 0): | ||
if axis is None: | ||
axis = 0 | ||
res_values = cnp.PyArray_Repeat(self._ndarray, repeats, <int>axis) | ||
return self._from_backing_data(res_values) | ||
|
||
def reshape(self, *args, **kwargs): | ||
res_values = self._ndarray.reshape(*args, **kwargs) | ||
return self._from_backing_data(res_values) | ||
|
||
def ravel(self, order="C"): | ||
# cnp.PyArray_OrderConverter(PyObject* obj, NPY_ORDER* order) | ||
# res_values = cnp.PyArray_Ravel(self._ndarray, order) | ||
res_values = self._ndarray.ravel(order) | ||
return self._from_backing_data(res_values) | ||
|
||
@property | ||
def T(self): | ||
res_values = self._ndarray.T | ||
return self._from_backing_data(res_values) |
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
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.
nice, reproducible benchmarks!