Use npg sum_of_squares

Closes #107
xarray-contrib · Aug 16, 2022 · 310797c · 310797c
1 parent e405517
commit 310797c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]