Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
eb1a967
All works, just need to satisfy mypy and whatnot now
charles-turner-1 Jul 13, 2025
852476d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 13, 2025
c921c59
Merge branch 'main' into autochunk-cftime
charles-turner-1 Jul 13, 2025
1aba531
Fix moving import to be optional
charles-turner-1 Jul 13, 2025
9429c3d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 13, 2025
3c9d27e
Make mypy happy
charles-turner-1 Jul 13, 2025
5153d2d
Add some clarifying comments about what we need to do to optimise this
charles-turner-1 Jul 13, 2025
62e71e6
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Jul 14, 2025
cfdc31b
@dcherian's suggestions. Just need to update chunking strategy to res…
charles-turner-1 Jul 14, 2025
2f16bc7
Merge branch 'main' of https://github.com/charles-turner-1/xarray
charles-turner-1 Jul 14, 2025
ce720fa
Merge branch 'main' into autochunk-cftime
charles-turner-1 Jul 14, 2025
4fa58c1
Merge branch 'main' into autochunk-cftime
charles-turner-1 Jul 23, 2025
e58d6d7
Can now load cftime arrays with auto-chunking. Implementation still k…
charles-turner-1 Jul 23, 2025
590e503
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Jul 23, 2025
f953976
Test for autochunking when reading from disk
charles-turner-1 Jul 25, 2025
6706524
replace `build_chunkspec` with faking the dtype of a cftime array & a…
charles-turner-1 Jul 25, 2025
4e56acd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 25, 2025
0d008cd
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Jul 25, 2025
49c4e9c
Merge branch 'main' into autochunk-cftime
charles-turner-1 Jul 25, 2025
4594099
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Jul 25, 2025
5d00b0a
Remove redundant comments, rename things to make them clearer, add mo…
charles-turner-1 Jul 25, 2025
80421ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 25, 2025
d1f7ad3
Refactor to move most of the changes into the DaskManager
charles-turner-1 Jul 25, 2025
1b7de62
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Jul 25, 2025
4407185
bare-min tests should pass now?
charles-turner-1 Jul 25, 2025
d8f45b2
Deepak's suggestions (think mypy is still going to be angry for now)
charles-turner-1 Jul 28, 2025
20226c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 28, 2025
11ac9f0
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Jul 28, 2025
8485df5
Fix errant line
charles-turner-1 Jul 28, 2025
2c27877
Clean up `DaskManager.rechunk` a bit - maybe possible to remove more …
charles-turner-1 Jul 28, 2025
0983261
Remove unused import
charles-turner-1 Jul 28, 2025
c4ec31f
Merge branch 'main' into autochunk-cftime
charles-turner-1 Aug 8, 2025
adbf5b2
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Aug 8, 2025
6c93bc4
Fix a couple of type errors
charles-turner-1 Aug 8, 2025
74bc0ea
Mypy & tests passing locally
charles-turner-1 Aug 8, 2025
0b9bbd0
Merge branch 'main' into autochunk-cftime
charles-turner-1 Aug 12, 2025
e58322f
Merge branch 'main' into autochunk-cftime
charles-turner-1 Aug 20, 2025
dbc6ebd
Merge branch 'main' into autochunk-cftime
charles-turner-1 Aug 24, 2025
5680663
Merge branch 'autochunk-cftime' of https://github.com/charles-turner-…
charles-turner-1 Aug 24, 2025
b5933ed
Deepak's comments
charles-turner-1 Aug 25, 2025
5db9225
Merge branch 'main' into autochunk-cftime
charles-turner-1 Aug 26, 2025
600c0fd
Merge branch 'main' into autochunk-cftime
charles-turner-1 Sep 3, 2025
9fcc6eb
Merge branch 'main' into autochunk-cftime
charles-turner-1 Sep 8, 2025
dc83692
Merge branch 'main' into autochunk-cftime
charles-turner-1 Sep 10, 2025
1e1bbf3
Merge branch 'main' into autochunk-cftime
charles-turner-1 Sep 11, 2025
9443815
Edits
dcherian Sep 18, 2025
db52c62
Merge branch 'pydata:main' into autochunk-cftime
charles-turner-1 Sep 22, 2025
85ebafd
Start refactoring `get_chunk` into named_array - xfail marker on the …
charles-turner-1 Sep 23, 2025
e2627c6
Optimise `fake_target_chunksize` (@dcherian suggestion)
charles-turner-1 Sep 23, 2025
0bca828
WIP
charles-turner-1 Sep 23, 2025
a930a65
Everything seems to be working - some type issues though I think
charles-turner-1 Sep 23, 2025
cbcb640
object => cftime - zarr failures...
charles-turner-1 Sep 23, 2025
70208e0
Merge branch 'main' into autochunk-cftime
charles-turner-1 Sep 23, 2025
3f0d3aa
Fix typing
charles-turner-1 Sep 23, 2025
e944eb4
Don't just import Variable in typing clause
charles-turner-1 Sep 23, 2025
1393351
Merge branch 'main' into autochunk-cftime
charles-turner-1 Oct 2, 2025
90242d1
Merge branch 'main' into autochunk-cftime
charles-turner-1 Oct 9, 2025
92bb538
Cleanup
dcherian Oct 13, 2025
1e3a015
Remove Variable handling
dcherian Oct 13, 2025
861cc57
Try more
dcherian Oct 13, 2025
16ccc78
bugfix
dcherian Oct 13, 2025
1bd2f32
typing
dcherian Oct 13, 2025
9dead77
Merge branch 'main' into autochunk-cftime
dcherian Oct 13, 2025
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
49 changes: 49 additions & 0 deletions xarray/namedarray/daskmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import numpy as np

from xarray.core.common import _contains_cftime_datetimes
from xarray.core.indexing import ImplicitToExplicitIndexingAdapter
from xarray.namedarray.parallelcompat import ChunkManagerEntrypoint, T_ChunkedArray
from xarray.namedarray.utils import is_duck_dask_array, module_available
Expand All @@ -16,6 +17,7 @@
_NormalizedChunks,
duckarray,
)
from xarray.namedarray.parallelcompat import _Chunks

try:
from dask.array import Array as DaskArray
Expand Down Expand Up @@ -264,3 +266,50 @@ def shuffle(
if chunks != "auto":
raise NotImplementedError("Only chunks='auto' is supported at present.")
return dask.array.shuffle(x, indexer, axis, chunks="auto")

def rechunk( # type: ignore[override]
self,
data: T_ChunkedArray,
chunks: _NormalizedChunks | tuple[int, ...] | _Chunks,
**kwargs: Any,
) -> Any:
"""
Changes the chunking pattern of the given array.

Called when the .chunk method is called on an xarray object that is already chunked.

Parameters
----------
data : dask array
Array to be rechunked.
chunks : int, tuple, dict or str, optional
The new block dimensions to create. -1 indicates the full size of the
corresponding dimension. Default is "auto" which automatically
determines chunk sizes.

Returns
-------
chunked array

See Also
--------
dask.array.Array.rechunk
cubed.Array.rechunk
"""

if _contains_cftime_datetimes(data):
Comment thread
dcherian marked this conversation as resolved.
Outdated
# Preprocess chunks if they're cftime

from dask import config as dask_config
from dask.utils import parse_bytes

from xarray.namedarray.utils import build_chunkspec

target_chunksize = parse_bytes(dask_config.get("array.chunk-size"))
Comment thread
dcherian marked this conversation as resolved.
Outdated

chunks = build_chunkspec(
data,
target_chunksize=target_chunksize,
)

return data.rechunk(chunks, **kwargs)
27 changes: 27 additions & 0 deletions xarray/namedarray/utils.py
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
Expand All @@ -16,6 +17,8 @@

from numpy.typing import NDArray

from xarray.namedarray.parallelcompat import T_ChunkedArray

try:
from dask.array.core import Array as DaskArray
from dask.typing import DaskCollection
Expand Down Expand Up @@ -195,6 +198,30 @@ def either_dict_or_kwargs(
return pos_kwargs


def build_chunkspec(
data: T_ChunkedArray,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

should be "duck array"

target_chunksize: int,
) -> tuple[int, ...]:
"""
Try to make chunks roughly cubic. This needs to be a bit smarter, it
really ought to account for xr.structure.chunks._getchunk and try to
use the default encoding to set the chunk size.
"""
from xarray.core.formatting import first_n_items

cftime_nbytes_approx: int = sys.getsizeof(first_n_items(data, 1)) # type: ignore[no-untyped-call]
elements_per_chunk = target_chunksize // cftime_nbytes_approx
ndim = data.ndim # type:ignore[attr-defined]
shape = data.shape # type:ignore[attr-defined]
if ndim > 0:
chunk_size_per_dim = int(elements_per_chunk ** (1.0 / ndim))
chunks = tuple(min(chunk_size_per_dim, dim_size) for dim_size in shape)
else:
chunks = ()

return chunks


class ReprObject:
"""Object that prints as the given value, for use with sentinel values."""

Expand Down
25 changes: 22 additions & 3 deletions xarray/structure/chunks.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from typing import TYPE_CHECKING, Any, Literal, TypeVar, Union, overload

from xarray.core import utils
from xarray.core.common import _contains_cftime_datetimes
from xarray.core.utils import emit_user_level_warning
from xarray.core.variable import IndexVariable, Variable
from xarray.namedarray.parallelcompat import (
Expand Down Expand Up @@ -83,9 +84,27 @@ def _get_chunk(var: Variable, chunks, chunkmanager: ChunkManagerEntrypoint):
for dim, preferred_chunk_sizes in zip(dims, preferred_chunk_shape, strict=True)
)

chunk_shape = chunkmanager.normalize_chunks(
chunk_shape, shape=shape, dtype=var.dtype, previous_chunks=preferred_chunk_shape
)
if _contains_cftime_datetimes(var):
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
if _contains_cftime_datetimes(var):
if _contains_cftime_datetimes(var) and chunks == "auto":

# If we have cftime datetimes, need to preprocess them - we can't pass
# an object dtype into DaskManager.normalize_chunks.
from dask import config as dask_config
from dask.utils import parse_bytes

from xarray.namedarray.utils import build_chunkspec

target_chunksize = parse_bytes(dask_config.get("array.chunk-size"))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

How about adding get_auto_chunk_size to the ChunkManager class; and put the dask-specific stuff in the DaskManager.

cc @TomNicholas

chunk_shape = build_chunkspec(var, target_chunksize=target_chunksize)

chunk_shape = chunkmanager.normalize_chunks(
chunk_shape, shape=shape, previous_chunks=preferred_chunk_shape
)
else:
chunk_shape = chunkmanager.normalize_chunks(
chunk_shape,
shape=shape,
dtype=var.dtype,
previous_chunks=preferred_chunk_shape,
)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
chunk_shape = chunkmanager.normalize_chunks(
chunk_shape, shape=shape, previous_chunks=preferred_chunk_shape
)
else:
chunk_shape = chunkmanager.normalize_chunks(
chunk_shape,
shape=shape,
dtype=var.dtype,
previous_chunks=preferred_chunk_shape,
)
chunk_shape = chunkmanager.normalize_chunks(
chunk_shape,
shape=shape,
dtype=var.dtype,
previous_chunks=preferred_chunk_shape,
)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

There's no dtype=var.dtype in the if _contains_cftime_datetimes(var) clause. We could do this:

if _contains_cftime_datetimes(var):
    ...
    chunk_shape = build_chunkspec(...)
    var_dtype = None
else:
    var_dtype = var.dtype

chunk_shape = chunkmanager.normalize_chunks(
            chunk_shape,
            shape=shape,
            dtype=var_dtype,
            previous_chunks=preferred_chunk_shape,
        )

which seems cleaner than what I've currently got?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ignore that, I've changed how this works to allow us to use the dask native chunk normalization - by computing a ratio of sizes to a np.float64 and then adjusting our limit by that so we get the correct size chunks.


# Warn where requested chunks break preferred chunks, provided that the variable
# contains data.
Expand Down
31 changes: 31 additions & 0 deletions xarray/tests/test_dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,29 @@ def make_da():
return da


def make_da_cftime():
yrs = np.arange(2000, 2120)
cftime_dates = xr.date_range(
start=f"{yrs[0]}-01-01",
end=f"{yrs[-1]}-12-31",
freq="1YE",
use_cftime=True,
)
yr_array = np.tile(cftime_dates.values, (10, 1))
da = xr.DataArray(
yr_array,
dims=["x", "t"],
coords={"x": np.arange(10), "t": cftime_dates},
name="a",
).chunk({"x": 4, "t": 5})
da.x.attrs["long_name"] = "x"
da.attrs["test"] = "test"
da.coords["c2"] = 0.5
da.coords["ndcoord"] = da.x * 2

return da


def make_ds():
map_ds = xr.Dataset()
map_ds["a"] = make_da()
Expand Down Expand Up @@ -1141,6 +1164,14 @@ def test_auto_chunk_da(obj):
assert actual.chunks == expected.chunks


@pytest.mark.parametrize("obj", [make_da_cftime()])
def test_auto_chunk_da_cftime(obj):
Comment thread
dcherian marked this conversation as resolved.
Outdated
actual = obj.chunk("auto").data
expected = obj.data.rechunk({0: 10, 1: 120})
np.testing.assert_array_equal(actual, expected)
assert actual.chunks == expected.chunks


def test_map_blocks_error(map_da, map_ds):
def bad_func(darray):
return (darray * darray.x + 5 * darray.y)[:1, :1]
Expand Down