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
11 changes: 10 additions & 1 deletion python/tvm/relax/frontend/onnx/onnx_frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ class Unsqueeze(OnnxOpConverter):
"""Converts an onnx Unsqueeze node into an equivalent Relax expression."""

@classmethod
def _impl_v11(cls, bb, inputs, attr, params):
def _impl_v1(cls, bb, inputs, attr, params):
axes = list(attr.get("axes"))
inputs = inputs + [relax.const(axes, "int64")]
return cls._impl_v13(bb, inputs, attr, params)
Expand Down Expand Up @@ -570,6 +570,15 @@ def _impl_v16(cls, bb, inputs, attr, params):
class Clip(OnnxOpConverter):
"""Converts an onnx Clip node into an equivalent Relax expression."""

@classmethod
def _impl_v1(cls, bb, inputs, attr, params):
min = float(attr.get("min", -_np.inf))
max = float(attr.get("max", _np.inf))
results = inputs[0]
results = bb.emit_te(topi.maximum, results, min)
results = bb.emit_te(topi.minimum, results, max)
return results

@classmethod
def _impl_v13(cls, bb, inputs, attr, params):
results = inputs[0]
Expand Down
36 changes: 35 additions & 1 deletion tests/python/relax/test_frontend_onnx.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ def check_correctness(
tvm_num_outputs = 1

# Check that number of outputs match.

assert tvm_num_outputs == len(ort_output), "Unequal number of outputs"

for (tvm_out, ort_out) in zip(tvm_output, ort_output):
Expand Down Expand Up @@ -435,6 +434,22 @@ def test_unsqueeze():
check_correctness(model)


def test_unsqueeze_v1():
# https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Unsqueeze-1
unsqueeze_node = helper.make_node("Unsqueeze", ["a"], ["b"], axes=[0, 2, 3])
graph = helper.make_graph(
[unsqueeze_node],
"unsqueeze_v1",
inputs=[helper.make_tensor_value_info("a", TensorProto.FLOAT, [32, 32])],
outputs=[helper.make_tensor_value_info("b", TensorProto.FLOAT, [1, 32, 1, 1, 32])],
)

model = helper.make_model(
graph, producer_name="unsqueeze_v1_test", opset_imports=[helper.make_opsetid("", 6)]
)
check_correctness(model, opset=10)


def test_gelu():
verify_unary("Gelu", [32, 32], domain="com.microsoft")

Expand Down Expand Up @@ -490,6 +505,25 @@ def test_clip(min, max):
check_correctness(model)


@pytest.mark.parametrize("min", [-6.0, 0.0])
@pytest.mark.parametrize("max", [6.0])
def test_clip_v6(max, min):
# https://github.com/onnx/onnx/blob/main/docs/Changelog.md#Clip-6
clip_node = helper.make_node("Clip", ["input"], ["output"], max=max, min=min)
inputs = [helper.make_tensor_value_info("input", TensorProto.FLOAT, [32, 64])]
graph = helper.make_graph(
[clip_node],
"clip_v6_test",
inputs=inputs,
outputs=[helper.make_tensor_value_info("output", TensorProto.FLOAT, [32, 64])],
)
model = helper.make_model(
graph, producer_name="clip_v6_test", opset_imports=[helper.make_opsetid("", 6)]
)
onnx.save(model, "a.onnx")
check_correctness(model, opset=10)


def test_equal():
equal_node = helper.make_node("Equal", ["a", "b"], ["output"])

Expand Down