File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,12 @@ def are_values_different(*values):
57
57
# to not recompute over again
58
58
if isinstance (value0 , np .ndarray ):
59
59
try :
60
- value0_nans = np .isnan (value0 )
60
+ # np.asarray for elderly numpys, e.g. 1.7.1 where for
61
+ # degenerate arrays (shape ()) it would return a pure scalar
62
+ value0_nans = np .asanyarray (np .isnan (value0 ))
63
+ value0_nonnans = np .asanyarray (np .logical_not (value0_nans ))
64
+ # if value0_nans.size == 1:
65
+ # import pdb; pdb.set_trace()
61
66
if not np .any (value0_nans ):
62
67
value0_nans = None
63
68
except TypeError as exc :
@@ -80,8 +85,7 @@ def are_values_different(*values):
80
85
value_nans = np .isnan (value )
81
86
if np .any (value0_nans != value_nans ):
82
87
return True
83
- if np .any (value0 [np .logical_not (value0_nans )]
84
- != value [np .logical_not (value0_nans )]):
88
+ if np .any (value0 [value0_nonnans ] != value [value0_nonnans ]):
85
89
return True
86
90
elif np .any (value0 != value ):
87
91
return True
You can’t perform that action at this time.
0 commit comments