From 9aecadf0216fb6f9d3279dac9a23c54f6cb2d2f3 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Fri, 30 Jun 2023 15:59:32 +1000 Subject: [PATCH 1/2] remove hardcoded single-threaded scheduler for dataset combine --- intake_esm/source.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/intake_esm/source.py b/intake_esm/source.py index f6dc526e..14de8e9f 100644 --- a/intake_esm/source.py +++ b/intake_esm/source.py @@ -252,16 +252,13 @@ def _open_dataset(self): for agg in self.aggregations ), ) - with dask.config.set( - {'scheduler': 'single-threaded', 'array.slicing.split_large_chunks': True} - ): # Use single-threaded scheduler - datasets = [ - ds.set_coords(set(ds.variables) - set(ds.attrs[OPTIONS['vars_key']])) - for ds in datasets - ] - self._ds = xr.combine_by_coords( - datasets, **self.xarray_combine_by_coords_kwargs - ) + datasets = [ + ds.set_coords(set(ds.variables) - set(ds.attrs[OPTIONS['vars_key']])) + for ds in datasets + ] + self._ds = xr.combine_by_coords( + datasets, **self.xarray_combine_by_coords_kwargs + ) self._ds.attrs[OPTIONS['dataset_key']] = self.key From d2778791f13b5e55f13aad0d5d2ccf32b214f7a0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 06:26:09 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- intake_esm/source.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/intake_esm/source.py b/intake_esm/source.py index 14de8e9f..b7bef525 100644 --- a/intake_esm/source.py +++ b/intake_esm/source.py @@ -256,9 +256,7 @@ def _open_dataset(self): ds.set_coords(set(ds.variables) - set(ds.attrs[OPTIONS['vars_key']])) for ds in datasets ] - self._ds = xr.combine_by_coords( - datasets, **self.xarray_combine_by_coords_kwargs - ) + self._ds = xr.combine_by_coords(datasets, **self.xarray_combine_by_coords_kwargs) self._ds.attrs[OPTIONS['dataset_key']] = self.key