-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Add chunks='auto' support for cftime datasets #10527
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
base: main
Are you sure you want to change the base?
Changes from 37 commits
eb1a967
852476d
c921c59
1aba531
9429c3d
3c9d27e
5153d2d
62e71e6
cfdc31b
2f16bc7
ce720fa
4fa58c1
e58d6d7
590e503
f953976
6706524
4e56acd
0d008cd
49c4e9c
4594099
5d00b0a
80421ef
d1f7ad3
1b7de62
4407185
d8f45b2
20226c1
11ac9f0
8485df5
2c27877
0983261
c4ec31f
adbf5b2
6c93bc4
74bc0ea
0b9bbd0
e58322f
dbc6ebd
5680663
b5933ed
5db9225
600c0fd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
from __future__ import annotations | ||
|
||
import importlib | ||
import sys | ||
import warnings | ||
from collections.abc import Hashable, Iterable, Iterator, Mapping | ||
from functools import lru_cache | ||
|
@@ -23,7 +24,9 @@ | |
DaskArray = NDArray # type: ignore[assignment, misc] | ||
DaskCollection: Any = NDArray # type: ignore[no-redef] | ||
|
||
from xarray.core.variable import Variable | ||
from xarray.namedarray._typing import _Dim, duckarray | ||
from xarray.namedarray.parallelcompat import T_ChunkedArray | ||
|
||
|
||
K = TypeVar("K") | ||
|
@@ -195,6 +198,42 @@ def either_dict_or_kwargs( | |
return pos_kwargs | ||
|
||
|
||
def fake_target_chunksize( | ||
data: Variable | T_ChunkedArray, | ||
target_chunksize: int, | ||
no_op: bool = False, | ||
) -> tuple[int, np.dtype[Any]]: | ||
""" | ||
Naughty trick - let's get the ratio of our cftime_nbytes, and then compute | ||
the ratio of that size to a np.float64. Then we can just adjust our target_chunksize | ||
and use the default dask chunking algorithm to get a reasonable chunk size. | ||
|
||
? I don't think T_chunkedArray or Variable should be necessary, but the calls | ||
? to this in daskmanager.py requires it to be that. I still need to wrap my head | ||
? around the typing here a bit more. | ||
dcherian marked this conversation as resolved.
Show resolved
Hide resolved
|
||
""" | ||
|
||
if no_op: | ||
return target_chunksize, data.dtype | ||
|
||
import numpy as np | ||
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. let's move imports to the top if we can; and remove the 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. Can only move numpy to the top - moving 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've removed the 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. What do you mean? 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. Looked this up subsequently and I think I'm talking waffle - the Since arrays can only contain a single dtype, this shouldn't make any difference. TLDR; ignore my previous comment, it was nonsense |
||
|
||
from xarray.core.formatting import first_n_items | ||
|
||
output_dtype = np.dtype(np.float64) | ||
|
||
if data.dtype == object: | ||
nbytes_approx: int = sys.getsizeof(first_n_items(data, 1)) # type: ignore[no-untyped-call] | ||
else: | ||
nbytes_approx = data.dtype.itemsize | ||
|
||
f64_nbytes = output_dtype.itemsize # Should be 8 bytes | ||
|
||
target_chunksize = int(target_chunksize * (f64_nbytes / nbytes_approx)) | ||
|
||
return target_chunksize, output_dtype | ||
|
||
|
||
class ReprObject: | ||
"""Object that prints as the given value, for use with sentinel values.""" | ||
|
||
|
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.
I guess this can be deleted
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.
Had a play and I don't think I can fully get rid of it, I've reused as much of the abstracted logic as possible though.