Skip to content

Commit 1c956a4

Browse files
authored
Merge pull request #653 from blooop/feature/agg_mean
aggregate defaults to mean
2 parents 186a748 + b4363ec commit 1c956a4

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

bencher/results/bench_result.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def to(
7272
reduce: ReduceType | None = None,
7373
# Aggregation controls (applied in filter())
7474
agg_over_dims: list[str] | None = None,
75-
agg_fn: Literal["sum", "mean", "max", "min", "median"] = "sum",
75+
agg_fn: Literal["mean", "sum", "max", "min", "median"] = "mean",
7676
**kwargs: Any,
7777
) -> BenchResult:
7878
"""Return the current instance of BenchResult.

bencher/results/bench_result_base.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def to_hv_dataset(
151151
result_var: ResultVar = None,
152152
level: int = None,
153153
agg_over_dims: list[str] | None = None,
154-
agg_fn: Literal["sum", "mean", "max", "min", "median"] | None = None,
154+
agg_fn: Literal["mean", "sum", "max", "min", "median"] | None = None,
155155
) -> hv.Dataset:
156156
"""Generate a holoviews dataset from the xarray dataset.
157157
@@ -190,7 +190,7 @@ def to_dataset(
190190
result_var: ResultVar | str = None,
191191
level: int = None,
192192
agg_over_dims: list[str] | None = None,
193-
agg_fn: Literal["sum", "mean", "max", "min", "median"] | None = None,
193+
agg_fn: Literal["mean", "sum", "max", "min", "median"] | None = None,
194194
) -> xr.Dataset:
195195
"""Generate a summarised xarray dataset.
196196
@@ -258,8 +258,8 @@ def rename_ds(dataset: xr.Dataset, suffix: str):
258258
list(ds_out.dims),
259259
)
260260

261-
# Support basic aggregations; default to sum
262-
fn = (agg_fn or "sum").lower()
261+
# Support basic aggregations; default to mean
262+
fn = (agg_fn or "mean").lower()
263263
if fn == "sum":
264264
ds_out = ds_out.sum(dim=dims_present, skipna=True)
265265
elif fn == "mean":
@@ -271,8 +271,8 @@ def rename_ds(dataset: xr.Dataset, suffix: str):
271271
elif fn == "median":
272272
ds_out = ds_out.median(dim=dims_present, skipna=True)
273273
else:
274-
# Fall back to sum if unknown string provided
275-
ds_out = ds_out.sum(dim=dims_present, skipna=True)
274+
# Fall back to mean if unknown string provided
275+
ds_out = ds_out.mean(dim=dims_present, skipna=True)
276276
else:
277277
logging.warning(
278278
"Aggregation requested for dims %s but none were found in dataset dims %s; returning unaggregated dataset",
@@ -514,7 +514,7 @@ def filter(
514514
override=False,
515515
hv_dataset: hv.Dataset | None = None,
516516
agg_over_dims: list[str] | None = None,
517-
agg_fn: Literal["sum", "mean", "max", "min", "median"] = "sum",
517+
agg_fn: Literal["mean", "sum", "max", "min", "median"] = "mean",
518518
**kwargs,
519519
) -> Optional[pn.panel]:
520520
# Initialize default filters if not provided to avoid shared mutable defaults

pixi.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "holobench"
3-
version = "1.56.0"
3+
version = "1.56.1"
44

55
authors = [{ name = "Austin Gregg-Smith", email = "blooop@gmail.com" }]
66
description = "A package for benchmarking the performance of arbitrary functions"

0 commit comments

Comments
 (0)