Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 python/tvm/_ffi/runtime_ctypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class DataType(ctypes.Structure):
np.dtype(np.float32): "float32",
np.dtype(np.float64): "float64",
}
if np.__version__.startswith("1."):
if hasattr(np, "float_"):
NUMPY2STR[np.dtype(np.float_)] = "float64"
STR2DTYPE = {
"void": {"type_code": DataTypeCode.HANDLE, "bits": 0, "lanes": 0},
Expand Down
2 changes: 1 addition & 1 deletion python/tvm/relay/frontend/paddlepaddle.py
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ def convert_dist(g, op, block):
p = op.attr("p")
if p == np.inf:
out = _op.reduce.max(z)
elif p == np.NINF:
elif p == -np.inf:
out = _op.reduce.min(z)
elif p == 0.0:
out = _op.reduce.sum(_op.sign(z))
Expand Down
4 changes: 2 additions & 2 deletions python/tvm/relay/frontend/pytorch.py
Original file line number Diff line number Diff line change
Expand Up @@ -1864,7 +1864,7 @@ def norm(self, inputs, input_types):
order = inputs[1]
if order == np.inf:
return _op.reduce.max(_op.abs(data), axis=axis, keepdims=keepdims)
elif order == np.NINF:
elif order == -np.inf:
return _op.reduce.min(_op.abs(data), axis=axis, keepdims=keepdims)
else:
reci_order = _expr.const(1.0 / order, dtype=dtype)
Expand Down Expand Up @@ -3910,7 +3910,7 @@ def linalg_vector_norm(self, inputs, input_types):
)
elif ord == np.inf:
return _op.reduce.max(_op.abs(data), axis=dim, keepdims=keepdim)
elif ord == np.NINF:
elif ord == -np.inf:
return _op.reduce.min(_op.abs(data), axis=dim, keepdims=keepdim)
reci_ord = _expr.const(1.0 / ord, dtype=dtype)
ord = _expr.const(ord, dtype=dtype)
Expand Down
2 changes: 1 addition & 1 deletion tests/python/contrib/test_msc/test_translate_tensorflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ def _test_infinity(tf_op, name):
for tf_dtype in tf_dtypes:
shape = (8, 8)
data = np.random.uniform(size=shape).astype(tf_dtype)
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.infty
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.inf
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.nan

tf.reset_default_graph()
Expand Down
4 changes: 2 additions & 2 deletions tests/python/frontend/pytorch/test_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -5544,15 +5544,15 @@ def test_fn(order):
verify_model(test_fn(order=2), input_data=input_data)
verify_model(test_fn(order=3.5), input_data=input_data)
verify_model(test_fn(order=np.inf), input_data=input_data)
verify_model(test_fn(order=np.NINF), input_data=input_data)
verify_model(test_fn(order=-np.inf), input_data=input_data)
verify_model(test_fn(order=0), input_data=input_data)

# Also test on double
input_data = torch.rand(input_shape).double()
verify_model(test_fn(order=2), input_data=input_data)
verify_model(test_fn(order=3.5), input_data=input_data)
verify_model(test_fn(order=np.inf), input_data=input_data)
verify_model(test_fn(order=np.NINF), input_data=input_data)
verify_model(test_fn(order=-np.inf), input_data=input_data)
verify_model(test_fn(order=0), input_data=input_data)


Expand Down
2 changes: 1 addition & 1 deletion tests/python/frontend/tensorflow/test_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -5191,7 +5191,7 @@ def _verify_infiniteness_ops(tf_op, name):
for tf_dtype in tf_dtypes:
shape = (8, 8)
data = np.random.uniform(size=shape).astype(tf_dtype)
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.infty
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.inf
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.nan

tf.reset_default_graph()
Expand Down
4 changes: 1 addition & 3 deletions tests/python/relay/test_op_level3.py
Original file line number Diff line number Diff line change
Expand Up @@ -1359,9 +1359,7 @@ def _verify_infiniteness_ops(relay_op, ref_op, target="llvm", dev=None):

data = np.random.uniform(size=shape).astype(dtype)
if dtype.startswith("float"):
data.ravel()[
np.random.choice(data.size, int(data.size * 0.5), replace=False)
] = np.infty
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.inf
data.ravel()[np.random.choice(data.size, int(data.size * 0.5), replace=False)] = np.nan

op_res = create_executor(target=target, device=dev).evaluate(y, {x: data})
Expand Down
4 changes: 1 addition & 3 deletions tests/python/topi/test_topi_math.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ def ewise_ref_data(topi_name, dtype):
if config.get("replace_with_nan", False):
a_np.ravel()[np.random.choice(a_np.size, int(a_np.size * 0.5), replace=False)] = np.nan
if config.get("replace_with_inf", False):
a_np.ravel()[
np.random.choice(a_np.size, int(a_np.size * 0.5), replace=False)
] = np.infty
a_np.ravel()[np.random.choice(a_np.size, int(a_np.size * 0.5), replace=False)] = np.inf

# avoid round check too close to boundary
if topi_name == "round":
Expand Down