Skip to content

numpy >1.2 compatability #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tr11-sanger wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

numpy >1.2 compatability #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a1126b
fix np.bool
tr11-sanger Aug 30, 2024
1fe3724
numpy >1.2 compatability
tr11-sanger Aug 30, 2024
ab85de9
Merge branch 'develop' into develop
vnmabus Aug 31, 2024
aeb00ee
Merge branch 'develop' into develop
vnmabus Aug 31, 2024
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
2 changes: 1 addition & 1 deletion dcor/_dcor_internals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dcor/_energy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down