From 4a1126b5a7bdbb4e54b3d8409fd6f8eae64533ce Mon Sep 17 00:00:00 2001 From: tr11-sanger <91129052+tr11-sanger@users.noreply.github.com> Date: Fri, 30 Aug 2024 11:17:46 +0100 Subject: [PATCH 1/2] fix np.bool --- dcor/_dcor_internals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dcor/_dcor_internals.py b/dcor/_dcor_internals.py index 21b390d..4ddbf7a 100644 --- a/dcor/_dcor_internals.py +++ b/dcor/_dcor_internals.py @@ -343,7 +343,7 @@ def u_centered(a: Array, *, out: Array | None = None) -> Array: # The diagonal is zero xp = array_namespace(a) - out[xp.eye(dim, dtype=xp.bool)] = 0 + out[xp.eye(dim, dtype=bool)] = 0 return out From 1fe372445e586952508bda4395af419689f9fcc7 Mon Sep 17 00:00:00 2001 From: tr11-sanger <91129052+tr11-sanger@users.noreply.github.com> Date: Fri, 30 Aug 2024 11:32:02 +0100 Subject: [PATCH 2/2] numpy >1.2 compatability --- dcor/_energy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dcor/_energy.py b/dcor/_energy.py index dc4eee7..c935a1f 100644 --- a/dcor/_energy.py +++ b/dcor/_energy.py @@ -78,7 +78,7 @@ def _check_valid_energy_exponent(exponent: float) -> None: def _get_flat_upper_matrix(x: Array, k: int) -> Array: """Get flat upper matrix from diagonal k.""" xp = array_namespace(x) - x_mask = xp.triu(xp.ones_like(x, dtype=xp.bool), k=k) + x_mask = xp.triu(xp.ones_like(x, dtype=bool), k=k) x_mask_flat = xp.reshape(x_mask, -1) x_flat = xp.reshape(x, -1)