-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: don't assume series is length > 0 #19438
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
Closed
Closed
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
6bd6ddd
BUG: don't assume series is length > 0
hexgnu 7fdd03e
Take out comment and use product
hexgnu 27df317
Merge remote-tracking branch 'upstream/master' into segfault_memory_u…
hexgnu e251587
Fix failing test with indexing
hexgnu 5e59e9c
Use range over 0 <= for loops
hexgnu 3f52a44
Ah ha I think I got it
hexgnu 21ae147
FIX: revert change to lib.pyx
hexgnu 207bc74
Define memory_usage on SparseArray
hexgnu 93a0c3d
Merge remote-tracking branch 'upstream/master' into segfault_memory_u…
hexgnu cdd4141
Fix linting error
hexgnu ae9f74d
Revert base.py
hexgnu 4ead141
Move whatsnew doc to Sparse
hexgnu f9433d8
Use shared docstring and get rid of if condition
hexgnu 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ | |
from pandas.core.base import PandasObject | ||
|
||
from pandas import compat | ||
from pandas.compat import range | ||
from pandas.compat import range, PYPY | ||
from pandas.compat.numpy import function as nv | ||
|
||
from pandas.core.dtypes.generic import ABCSparseSeries | ||
|
@@ -30,6 +30,7 @@ | |
from pandas.core.dtypes.missing import isna, notna, na_value_for_dtype | ||
|
||
import pandas._libs.sparse as splib | ||
import pandas._libs.lib as lib | ||
from pandas._libs.sparse import SparseIndex, BlockIndex, IntIndex | ||
from pandas._libs import index as libindex | ||
import pandas.core.algorithms as algos | ||
|
@@ -238,6 +239,41 @@ def kind(self): | |
elif isinstance(self.sp_index, IntIndex): | ||
return 'integer' | ||
|
||
def memory_usage(self, deep=False): | ||
"""Memory usage of SparseArray | ||
|
||
Parameters | ||
---------- | ||
deep : bool | ||
Introspect the data deeply, interrogate | ||
`object` dtypes for system-level memory consumption | ||
|
||
Returns | ||
------- | ||
scalar bytes of memory consumed | ||
|
||
Notes | ||
----- | ||
Memory usage does not include memory of empty cells filled by | ||
fill_value. And it does not include memory consumed by | ||
elements that are not components of the array if deep=False | ||
|
||
See also | ||
-------- | ||
Series.memory_usage | ||
""" | ||
|
||
values = self.sp_values | ||
if hasattr(values, 'memory_usage'): | ||
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 think you need this here as the values are always an ndarray |
||
return values.memory_usage(deep=deep) | ||
|
||
v = values.nbytes | ||
|
||
if deep and is_object_dtype(self) and not PYPY: | ||
v += lib.memory_usage_of_objects(values) | ||
|
||
return v | ||
|
||
def __array_wrap__(self, out_arr, context=None): | ||
""" | ||
NumPy calls this method when ufunc is applied | ||
|
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.
can you make the doc-string generic in base and use a shared one here?