Skip to content
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

Fix some NumPy deprecations in the core tests. #1315

Merged
merged 8 commits into from
Jan 22, 2024
Merged

Fix some NumPy deprecations in the core tests. #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
def253c
changed parameter "interpolation" to "method" in np.percentile
FOsterfeld Jan 2, 2024
9183082
fixed wrong argument for ht.arange
FOsterfeld Jan 2, 2024
9c6e1c4
Merge branch 'main' into bugs/1232-_Bug_Ensure_NumPy-compatibility_of…
FOsterfeld Jan 2, 2024
04a0a6d
changed deprecated np.math to math
FOsterfeld Jan 2, 2024
1b81d26
changed deprecated np.alltrue to np.true
FOsterfeld Jan 2, 2024
dce02a5
Merge branch 'main' into bugs/1232-_Bug_Ensure_NumPy-compatibility_of…
FOsterfeld Jan 3, 2024
b770ab2
Merge branch 'main' into bugs/1232-_Bug_Ensure_NumPy-compatibility_of…
mrfh92 Jan 8, 2024
6a5115c
Merge branch 'main' into bugs/1232-_Bug_Ensure_NumPy-compatibility_of…
mrfh92 Jan 22, 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
5 changes: 3 additions & 2 deletions heat/core/tests/test_arithmetics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import operator
import math

import heat as ht
import numpy as np
Expand Down Expand Up @@ -775,11 +776,11 @@ def test_nanprod(self):
self.assertEqual(shape_noaxis_split_nanprod.dtype, ht.float32)
self.assertEqual(shape_noaxis_split_nanprod.larray.dtype, torch.float32)
self.assertEqual(shape_noaxis_split_nanprod.split, None)
self.assertEqual(shape_noaxis_split_nanprod, np.math.factorial(10))
self.assertEqual(shape_noaxis_split_nanprod, math.factorial(10))

out_noaxis = ht.array(1, dtype=shape_noaxis_split.dtype)
ht.nanprod(shape_noaxis_split, out=out_noaxis)
self.assertEqual(out_noaxis.larray, np.math.factorial(10))
self.assertEqual(out_noaxis.larray, math.factorial(10))

def test_nansum(self):
array_len = 11
Expand Down
2 changes: 1 addition & 1 deletion heat/core/tests/test_factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def test_asarray(self):
arr = np.array([1, 2, 3, 4])
asarr = ht.asarray(arr)

self.assertTrue(np.alltrue(np.equal(asarr.numpy(), arr)))
self.assertTrue(np.all(np.equal(asarr.numpy(), arr)))

asarr[0] = 0
if asarr.device == ht.cpu:
Expand Down
10 changes: 5 additions & 5 deletions heat/core/tests/test_statistics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def test_bincount(self):
res = ht.bincount(a, weights=w)
self.assertEqual(res.size, 4)
self.assertEqual(res.dtype, ht.float64)
self.assertTrue(ht.equal(res, ht.arange((4,), dtype=ht.float64)))
self.assertTrue(ht.equal(res, ht.arange(4, dtype=ht.float64)))

with self.assertRaises(ValueError):
ht.bincount(ht.array([0, 1, 2, 3], split=0), weights=ht.array([1, 2, 3, 4]))
Expand Down Expand Up @@ -1181,25 +1181,25 @@ def test_percentile(self):
# test list q and writing to output buffer
q = [0.1, 2.3, 15.9, 50.0, 84.1, 97.7, 99.9]
axis = 2
p_np = np.percentile(x_np, q, axis=axis, interpolation="lower", keepdims=True)
p_np = np.percentile(x_np, q, axis=axis, method="lower", keepdims=True)
p_ht = ht.percentile(x_ht, q, axis=axis, interpolation="lower", keepdims=True)
out = ht.empty(p_np.shape, dtype=ht.float64, split=None, device=x_ht.device)
ht.percentile(x_ht, q, axis=axis, out=out, interpolation="lower", keepdims=True)
self.assertEqual(p_ht.numpy()[5].all(), p_np[5].all())
self.assertEqual(out.numpy()[2].all(), p_np[2].all())
self.assertTrue(p_ht.shape == p_np.shape)
axis = None
p_np = np.percentile(x_np, q, axis=axis, interpolation="higher")
p_np = np.percentile(x_np, q, axis=axis, method="higher")
p_ht = ht.percentile(x_ht, q, axis=axis, interpolation="higher")
self.assertEqual(p_ht.numpy()[6], p_np[6])
self.assertTrue(p_ht.shape == p_np.shape)
p_np = np.percentile(x_np, q, axis=axis, interpolation="nearest")
p_np = np.percentile(x_np, q, axis=axis, method="nearest")
p_ht = ht.percentile(x_ht, q, axis=axis, interpolation="nearest")
self.assertEqual(p_ht.numpy()[2], p_np[2])

# test split q
q_ht = ht.array(q, split=0, comm=x_ht.comm)
p_np = np.percentile(x_np, q, axis=axis, interpolation="midpoint")
p_np = np.percentile(x_np, q, axis=axis, method="midpoint")
p_ht = ht.percentile(x_ht, q_ht, axis=axis, interpolation="midpoint")
self.assertEqual(p_ht.numpy()[4], p_np[4])

Expand Down
Loading