Skip to content

Commit 643e89e

Browse files
authored
Rename map_blocks tasks. (#5007)
1 parent 8452120 commit 643e89e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

xarray/core/dataarray.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3714,7 +3714,7 @@ def map_blocks(
37143714
... calculate_anomaly, kwargs={"groupby_type": "time.year"}, template=array
37153715
... ) # doctest: +ELLIPSIS
37163716
<xarray.DataArray (time: 24)>
3717-
dask.array<calculate_anomaly-...-<this, shape=(24,), dtype=float64, chunksize=(24,), chunktype=numpy.ndarray>
3717+
dask.array<<this-array>-calculate_anomaly, shape=(24,), dtype=float64, chunksize=(24,), chunktype=numpy.ndarray>
37183718
Coordinates:
37193719
* time (time) object 1990-01-31 00:00:00 ... 1991-12-31 00:00:00
37203720
month (time) int64 dask.array<chunksize=(24,), meta=np.ndarray>

xarray/core/parallel.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def make_meta(obj):
102102
"""
103103
if isinstance(obj, DataArray):
104104
obj_array = obj
105-
obj = obj._to_temp_dataset()
105+
obj = dataarray_to_dataset(obj)
106106
elif isinstance(obj, Dataset):
107107
obj_array = None
108108
else:
@@ -116,7 +116,7 @@ def make_meta(obj):
116116
meta = meta.set_coords(obj.coords)
117117

118118
if obj_array is not None:
119-
return obj_array._from_temp_dataset(meta)
119+
return dataset_to_dataarray(meta)
120120
return meta
121121

122122

@@ -258,7 +258,7 @@ def map_blocks(
258258
... template=array,
259259
... ) # doctest: +ELLIPSIS
260260
<xarray.DataArray (time: 24)>
261-
dask.array<calculate_anomaly-...-<this, shape=(24,), dtype=float64, chunksize=(24,), chunktype=numpy.ndarray>
261+
dask.array<<this-array>-calculate_anomaly, shape=(24,), dtype=float64, chunksize=(24,), chunktype=numpy.ndarray>
262262
Coordinates:
263263
* time (time) object 1990-01-31 00:00:00 ... 1991-12-31 00:00:00
264264
month (time) int64 dask.array<chunksize=(24,), meta=np.ndarray>
@@ -448,7 +448,7 @@ def subset_dataset_to_block(
448448
for dim in variable.dims:
449449
chunk = chunk[chunk_index[dim]]
450450

451-
chunk_variable_task = (f"{gname}-{name}-{chunk[0]}",) + chunk_tuple
451+
chunk_variable_task = (f"{name}-{gname}-{chunk[0]}",) + chunk_tuple
452452
graph[chunk_variable_task] = (
453453
tuple,
454454
[variable.dims, chunk, variable.attrs],
@@ -462,7 +462,7 @@ def subset_dataset_to_block(
462462
}
463463
subset = variable.isel(subsetter)
464464
chunk_variable_task = (
465-
"{}-{}".format(gname, dask.base.tokenize(subset)),
465+
f"{name}-{gname}-{dask.base.tokenize(subset)}",
466466
) + chunk_tuple
467467
graph[chunk_variable_task] = (
468468
tuple,
@@ -512,7 +512,7 @@ def subset_dataset_to_block(
512512
for name, variable in template.variables.items():
513513
if name in indexes:
514514
continue
515-
gname_l = f"{gname}-{name}"
515+
gname_l = f"{name}-{gname}"
516516
var_key_map[name] = gname_l
517517

518518
key: Tuple[Any, ...] = (gname_l,)

0 commit comments

Comments
 (0)