From 310797c026e56c3f8a94d0a9f3323108fd433e6d Mon Sep 17 00:00:00 2001 From: dcherian Date: Mon, 15 Aug 2022 21:33:09 -0600 Subject: [PATCH] Use npg sum_of_squares Closes #107 --- ci/docs.yml | 2 +- ci/environment.yml | 2 +- ci/minimal-requirements.yml | 2 +- ci/no-dask.yml | 2 +- ci/no-xarray.yml | 2 +- flox/aggregate_npg.py | 14 +++++++++++--- setup.cfg | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ci/docs.yml b/ci/docs.yml index b11768282..dc2dbec2d 100644 --- a/ci/docs.yml +++ b/ci/docs.yml @@ -6,7 +6,7 @@ dependencies: - pip - xarray - numpydoc - - numpy_groupies + - numpy_groupies>=0.9.19 - toolz - matplotlib-base - myst-parser diff --git a/ci/environment.yml b/ci/environment.yml index bbaf5ded6..2414943d3 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -13,7 +13,7 @@ dependencies: - pytest-xdist - xarray - pre-commit - - numpy_groupies>=0.9.15 + - numpy_groupies>=0.9.19 - pooch - toolz - numba diff --git a/ci/minimal-requirements.yml b/ci/minimal-requirements.yml index 81b483e74..9359d11a9 100644 --- a/ci/minimal-requirements.yml +++ b/ci/minimal-requirements.yml @@ -8,7 +8,7 @@ dependencies: - pytest - pytest-cov - pytest-xdist - - numpy_groupies>=0.9.15 + - numpy_groupies==0.9.19 - pandas - pooch - toolz diff --git a/ci/no-dask.yml b/ci/no-dask.yml index 698297918..a9ae2e440 100644 --- a/ci/no-dask.yml +++ b/ci/no-dask.yml @@ -12,7 +12,7 @@ dependencies: - xarray - numpydoc - pre-commit - - numpy_groupies>=0.9.15 + - numpy_groupies>=0.9.19 - pooch - toolz - numba diff --git a/ci/no-xarray.yml b/ci/no-xarray.yml index 6e54d8f4b..c5805113b 100644 --- a/ci/no-xarray.yml +++ b/ci/no-xarray.yml @@ -12,7 +12,7 @@ dependencies: - dask-core - numpydoc - pre-commit - - numpy_groupies>=0.9.15 + - numpy_groupies>=0.9.19 - pooch - toolz - numba diff --git a/flox/aggregate_npg.py b/flox/aggregate_npg.py index 8015f67b5..f7894ef82 100644 --- a/flox/aggregate_npg.py +++ b/flox/aggregate_npg.py @@ -9,12 +9,20 @@ def _get_aggregate(engine): def sum_of_squares( - group_idx, array, engine, *, axis=-1, func="sum", size=None, fill_value=None, dtype=None + group_idx, + array, + engine, + *, + axis=-1, + func="sumofsquares", + size=None, + fill_value=None, + dtype=None, ): return _get_aggregate(engine).aggregate( group_idx, - array**2, + array, axis=axis, func=func, size=size, @@ -60,7 +68,7 @@ def nansum_of_squares(group_idx, array, engine, *, axis=-1, size=None, fill_valu group_idx, array, engine=engine, - func="nansum", + func="nansumofsquares", size=size, fill_value=fill_value, axis=axis, diff --git a/setup.cfg b/setup.cfg index e99882db4..a4978b3ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ include_package_data = True python_requires = >=3.8 install_requires = pandas - numpy_groupies >= '0.9.15' + numpy_groupies >= '0.9.19' toolz [options.extras_require]