Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ test-min = [
]
typecheck = [
"array-api-compat!=1.15", # https://github.com/data-apis/array-api-compat/issues/436
"cupy-stubs",
"mypy",
"scipy-stubs",
"sphinx",
Expand Down
2 changes: 1 addition & 1 deletion src/fast_array_utils/stats/_power.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _power_array_api[A: AArray[object, object]](x: A, n: int, /, dtype: DTypeLik
@_power.register(types.CSBase | types.CupyCSMatrix)
def _power_cs[Mat: types.CSBase | types.CupyCSMatrix](x: Mat, n: int, /, dtype: DTypeLike | None = None) -> Mat:
new_data = power(x.data, n, dtype=dtype)
return type(x)((new_data, x.indices, x.indptr), shape=x.shape, dtype=new_data.dtype) # type: ignore[call-overload]
return type(x)((new_data, x.indices, x.indptr), shape=x.shape, dtype=new_data.dtype) # type: ignore[arg-type]


@_power.register(types.DaskArray)
Expand Down
8 changes: 4 additions & 4 deletions tests/test_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,13 @@ def test_mean_var(
mean, var = stats.mean_var(arr, axis=axis, correction=1)
if isinstance(mean, types.DaskArray) and isinstance(var, types.DaskArray):
mean, var = mean.compute(), var.compute() # type: ignore[assignment]
if isinstance(mean, types.CupyArray) and isinstance(var, types.CupyArray):
mean, var = mean.get(), var.get()
# new names: `.get()` returns a less specific dtype than `mean` and `var` have
mean_np, var_np = (mean.get(), var.get()) if isinstance(mean, types.CupyArray) and isinstance(var, types.CupyArray) else (mean, var)

mean_expected = np.mean(np_arr, axis=axis)
var_expected = np.var(np_arr, axis=axis, ddof=1)
np.testing.assert_array_equal(mean, mean_expected)
np.testing.assert_array_almost_equal(var, var_expected) # type: ignore[arg-type]
np.testing.assert_array_equal(mean_np, mean_expected)
np.testing.assert_array_almost_equal(var_np, var_expected) # type: ignore[arg-type]


@pytest.mark.skipif(not find_spec("sklearn"), reason="sklearn not installed")
Expand Down
3 changes: 0 additions & 3 deletions typings/cupy/__init__.pyi

This file was deleted.

3 changes: 0 additions & 3 deletions typings/cupy/_core/__init__.pyi

This file was deleted.

62 changes: 0 additions & 62 deletions typings/cupy/_core/core.pyi

This file was deleted.

16 changes: 0 additions & 16 deletions typings/cupy/_creation/from_data.pyi

This file was deleted.

3 changes: 0 additions & 3 deletions typings/cupy/cuda.pyi

This file was deleted.

5 changes: 0 additions & 5 deletions typings/cupyx/scipy/sparse/__init__.pyi

This file was deleted.

16 changes: 0 additions & 16 deletions typings/cupyx/scipy/sparse/_base.pyi

This file was deleted.

27 changes: 0 additions & 27 deletions typings/cupyx/scipy/sparse/_compressed.pyi

This file was deleted.

11 changes: 0 additions & 11 deletions typings/cupyx/scipy/sparse/_coo.pyi

This file was deleted.

11 changes: 0 additions & 11 deletions typings/cupyx/scipy/sparse/_csc.pyi

This file was deleted.

11 changes: 0 additions & 11 deletions typings/cupyx/scipy/sparse/_csr.pyi

This file was deleted.

Loading