From 854bcffb1a3e2c29c1413251aadb553622848f91 Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Thu, 6 May 2021 11:35:15 -0500 Subject: [PATCH 1/2] Ensure HighLevelGraph layers are Layer instances --- xarray/core/parallel.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xarray/core/parallel.py b/xarray/core/parallel.py index c2e27a4f339..895e939c505 100644 --- a/xarray/core/parallel.py +++ b/xarray/core/parallel.py @@ -540,10 +540,14 @@ def subset_dataset_to_block( dependencies=[arg for arg in npargs if dask.is_dask_collection(arg)], ) - for gname_l, layer in new_layers.items(): - # This adds in the getitems for each variable in the dataset. - hlg.dependencies[gname_l] = {gname} - hlg.layers[gname_l] = layer + # This adds in the getitems for each variable in the dataset. + hlg = HighLevelGraph( + {**hlg.layers, **new_layers}, + dependencies={ + **hlg.dependencies, + **{name: {gname} for name in new_layers.keys()}, + }, + ) result = Dataset(coords=indexes, attrs=template.attrs) for index in result.indexes: From 57dffd447bafe81e1e72760eeebc4030a972679b Mon Sep 17 00:00:00 2001 From: James Bourbeau Date: Thu, 6 May 2021 11:46:34 -0500 Subject: [PATCH 2/2] [test-upstream]