Skip to content

[FIX] Support numpy 1.22 #5760

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

Merged
markotoplak merged 2 commits into from
Jan 4, 2022
Merged

[FIX] Support numpy 1.22 #5760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8a0fd7
Adapt a locking test for changed numpy internals
markotoplak Jan 4, 2022
f928f31
Add casting="unsafe" to np.frompyfunc ufuncs
markotoplak Jan 4, 2022
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
4 changes: 2 additions & 2 deletions Orange/data/io_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def isnastr(arr, out=None):
arr = np.asarray(arr)
if out is None and arr.shape != ():
out = np.empty_like(arr, dtype=bool)
return __isnastr(arr, out=out)
return __isnastr(arr, out=out, casting="unsafe")


def guess_data_type(orig_values, namask=None):
Expand Down Expand Up @@ -182,7 +182,7 @@ def get_number_of_decimals(values):

def mapvalues(arr):
arr = np.asarray(arr, dtype=object)
return mapvalues_(arr, out=np.empty_like(arr, dtype=float))
return mapvalues_(arr, out=np.empty_like(arr, dtype=float), casting="unsafe")

values = mapvalues(orig_values)

Expand Down
4 changes: 0 additions & 4 deletions Orange/data/tests/test_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,7 @@ def test_locking_flag(self):
def test_unpickled_empty_weights(self):
# ensure that unpickled empty arrays could be unlocked
self.assertEqual(0, self.table.W.size)
# flags.owndata asserts touch numpy internals
# feel free to remove when they do not pass
self.assertTrue(self.table.W.flags.owndata)
unpickled = pickle.loads(pickle.dumps(self.table))
self.assertFalse(unpickled.W.flags.owndata)
with unpickled.unlocked():
pass

Expand Down
4 changes: 2 additions & 2 deletions Orange/widgets/data/oweditdomain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2645,7 +2645,7 @@ def mapper(arr, out=None, dtype=dtype, **kwargs):
arr = np.asanyarray(arr)
if out is None and dtype is not None and arr.shape != ():
out = np.empty_like(arr, dtype)
return _vmapper(arr, out, dtype=dtype, **kwargs)
return _vmapper(arr, out, dtype=dtype, casting="unsafe", **kwargs)
return mapper


Expand Down Expand Up @@ -2684,7 +2684,7 @@ def as_float_or_nan(
np.issubdtype(arr.dtype, np.integer):
np.copyto(out, arr, casting="unsafe", where=where)
return out
return _parse_float(arr, out, where=where, **kwargs)
return _parse_float(arr, out, where=where, casting="unsafe", **kwargs)


def copy_attributes(dst: V, src: Orange.data.Variable) -> V:
Expand Down