From 2f98260e62dd26ba76fe30ba1f8c6f5bf4fa4e63 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:52:52 +0100 Subject: [PATCH 1/4] Skip dask rolling --- asv_bench/benchmarks/rolling.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/asv_bench/benchmarks/rolling.py b/asv_bench/benchmarks/rolling.py index a19d17ff09a..f53990c631a 100644 --- a/asv_bench/benchmarks/rolling.py +++ b/asv_bench/benchmarks/rolling.py @@ -77,12 +77,12 @@ def time_rolling_construct(self, center, stride, use_bottleneck): ).sum(dim="window_dim").load() -class RollingDask(Rolling): - def setup(self, *args, **kwargs): - requires_dask() - super().setup(**kwargs) - self.ds = self.ds.chunk({"x": 100, "y": 50, "t": 50}) - self.da_long = self.da_long.chunk({"x": 10000}) +# class RollingDask(Rolling): +# def setup(self, *args, **kwargs): +# requires_dask() +# super().setup(**kwargs) +# self.ds = self.ds.chunk({"x": 100, "y": 50, "t": 50}) +# self.da_long = self.da_long.chunk({"x": 10000}) class RollingMemory: From 5cb25a210c7278fc94b8839aec3629ed215995a2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:53:27 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- asv_bench/benchmarks/rolling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv_bench/benchmarks/rolling.py b/asv_bench/benchmarks/rolling.py index f53990c631a..7237c590067 100644 --- a/asv_bench/benchmarks/rolling.py +++ b/asv_bench/benchmarks/rolling.py @@ -3,7 +3,7 @@ import xarray as xr -from . import parameterized, randn, requires_dask +from . import parameterized, randn nx = 3000 long_nx = 30000 From 17ba51b98d4a5c59d51314c6c3f837ad66025913 Mon Sep 17 00:00:00 2001 From: Illviljan <14371165+Illviljan@users.noreply.github.com> Date: Wed, 18 Dec 2024 23:16:04 +0100 Subject: [PATCH 3/4] Clearer skip --- asv_bench/benchmarks/rolling.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/asv_bench/benchmarks/rolling.py b/asv_bench/benchmarks/rolling.py index 7237c590067..474df3c09e5 100644 --- a/asv_bench/benchmarks/rolling.py +++ b/asv_bench/benchmarks/rolling.py @@ -3,7 +3,7 @@ import xarray as xr -from . import parameterized, randn +from . import parameterized, randn, requires_dask, _skip_slow nx = 3000 long_nx = 30000 @@ -77,12 +77,15 @@ def time_rolling_construct(self, center, stride, use_bottleneck): ).sum(dim="window_dim").load() -# class RollingDask(Rolling): -# def setup(self, *args, **kwargs): -# requires_dask() -# super().setup(**kwargs) -# self.ds = self.ds.chunk({"x": 100, "y": 50, "t": 50}) -# self.da_long = self.da_long.chunk({"x": 10000}) +class RollingDask(Rolling): + def setup(self, *args, **kwargs): + requires_dask() + # TODO: Lazily skipped in CI as it is very demanding and slow. + # Improve times and remove errors. + _skip_slow() + super().setup(**kwargs) + self.ds = self.ds.chunk({"x": 100, "y": 50, "t": 50}) + self.da_long = self.da_long.chunk({"x": 10000}) class RollingMemory: From 23c5ce5f20a43cd0aa11c3d45eb9281226b97e9b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:18:19 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- asv_bench/benchmarks/rolling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv_bench/benchmarks/rolling.py b/asv_bench/benchmarks/rolling.py index 474df3c09e5..4fa2e09c9c0 100644 --- a/asv_bench/benchmarks/rolling.py +++ b/asv_bench/benchmarks/rolling.py @@ -3,7 +3,7 @@ import xarray as xr -from . import parameterized, randn, requires_dask, _skip_slow +from . import _skip_slow, parameterized, randn, requires_dask nx = 3000 long_nx = 30000