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
13 changes: 13 additions & 0 deletions python/tvm/relay/frontend/onnx.py
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,18 @@ def _impl_v1(cls, inputs, attr, params):
return _op.power(out, reci_p)


class GlobalLpPool(OnnxOpConverter):
"""Operator converter for GlobalLpPool."""

@classmethod
def _impl_v1(cls, inputs, attr, params):
# TODO: GlobalLpPool does not yet support dynamic shapes
in_shape = infer_shape(inputs[0])
attr["kernel_shape"] = in_shape[2:]

return LpPool._impl_v1(inputs, attr, params)


class Mul(Elemwise):
"""Operator converter for Multiply."""

Expand Down Expand Up @@ -3578,6 +3590,7 @@ def _get_convert_map(opset):
# defs/nn
"AveragePool": AveragePool.get_converter(opset),
"LpPool": LpPool.get_converter(opset),
"GlobalLpPool": GlobalLpPool.get_converter(opset),
"MaxPool": MaxPool.get_converter(opset),
"MaxUnpool": MaxUnpool.get_converter(opset),
"Conv": Conv.get_converter(opset),
Expand Down
44 changes: 44 additions & 0 deletions tests/python/frontend/onnx/test_forward.py
Original file line number Diff line number Diff line change
Expand Up @@ -3298,6 +3298,49 @@ def verify_lppool(x_shape, kernel_shape, p, strides, pads, out_shape, auto_pad="
)


def verify_global_lppool(x_shape, p, out_shape, target, dev):
pool_node = helper.make_node(
"GlobalLpPool",
inputs=["x"],
outputs=["y"],
p=p,
)

graph = helper.make_graph(
[pool_node],
"global_lppool_test",
inputs=[helper.make_tensor_value_info("x", TensorProto.FLOAT, list(x_shape))],
outputs=[helper.make_tensor_value_info("y", TensorProto.FLOAT, list(out_shape))],
)

model = helper.make_model(graph, producer_name="global_lppool_test")
verify_with_ort(
model, [x_shape], out_shape, use_vm=True, convert_to_static=True, target=target, dev=dev
)


@tvm.testing.parametrize_targets
def test_global_lppool(target, dev):

# LpPool1D
verify_global_lppool(x_shape=[1, 15, 16], p=2, out_shape=[1, 15, 1], target=target, dev=dev)

# LpPool2D
verify_global_lppool(
x_shape=[1, 15, 32, 32], p=2, out_shape=[1, 15, 1, 1], target=target, dev=dev
)

# LpPool2D
verify_global_lppool(
x_shape=[1, 15, 32, 32], p=3, out_shape=[1, 15, 1, 1], target=target, dev=dev
)

# LpPool3D
verify_global_lppool(
x_shape=[1, 15, 3, 32, 32], p=2, out_shape=[1, 15, 1, 1, 1], target=target, dev=dev
)


def verify_rnn(
seq_length,
batch_size,
Expand Down Expand Up @@ -5644,3 +5687,4 @@ def repeat(N, D):
test_random_uniform()
test_convinteger()
test_batch_matmul()
test_global_lppool()