Skip to content

[Frontend][Paddle]add take_alone_axis and topk converter for paddle frontend #14170

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
merged 2 commits into from
Mar 12, 2023
Merged

[Frontend][Paddle]add take_alone_axis and topk converter for paddle frontend #14170

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
cb346e3
add take_alone_axis and topk converter for paddle frontend
WhatGhost Mar 2, 2023
68f5489
Merge branch 'main' into dev/add_op
WhatGhost Mar 9, 2023
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
18 changes: 16 additions & 2 deletions python/tvm/relay/frontend/paddlepaddle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,6 +2071,14 @@ def convert_swish(g, op, block):
g.add_node(op.output("Out")[0], out)


def convert_take_along_axis(g, op, block):
x = g.get_node(op.input("Input")[0])
idx = g.get_node(op.input("Index")[0])
axis = op.attr("Axis")
out = _op.gather(x, axis, idx)
g.add_node(op.output("Result")[0], out)


def convert_tile(g, op, block):
"""Operator converter for tile."""

Expand Down Expand Up @@ -2111,9 +2119,13 @@ def convert_topk(g, op, block):
else:
k = op.attr("k")

largest = op.attr("largest")
largest = True
axis = -1
if op.has_attr("axis"):
axis = op.attr("axis")
if op.has_attr("largest"):
largest = op.attr("largest")
is_ascend = not largest
axis = op.attr("axis")

value_names = op.output("Out")
indice_names = op.output("Indices")
Expand Down Expand Up @@ -2317,8 +2329,10 @@ def convert_where_index(g, op, block):
"square": convert_square,
"squeeze2": convert_squeeze,
"swish": convert_swish,
"take_along_axis": convert_take_along_axis,
"tan": convert_unary_op,
"tanh": convert_unary_op,
"top_k": convert_topk,
"tile": convert_tile,
"top_k_v2": convert_topk,
"transpose2": convert_transpose,
Expand Down
23 changes: 23 additions & 0 deletions tests/python/frontend/paddlepaddle/test_forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,13 +1738,25 @@ def topk5(inputs):
def topk6(inputs):
return paddle.topk(inputs, k=1, axis=0)

# paddle.fluid.layers.topk
@paddle.jit.to_static
def topk7(inputs):
return paddle.fluid.layers.topk(inputs, k=1)

@paddle.jit.to_static
def topk8(inputs):
return paddle.fluid.layers.topk(inputs, k=2)

input_data = paddle.to_tensor([[1, 4, 5, 7], [3, 6, 2, 5]], dtype=paddle.int32)
input_data_fp32 = paddle.to_tensor([[1, 4, 5, 7], [3, 6, 2, 5]], dtype=paddle.float32)
verify_model(topk1, input_data=input_data)
# verify_model(topk2, input_data=input_data)
verify_model(topk3, input_data=input_data)
verify_model(topk4, input_data=input_data)
verify_model(topk5, input_data=input_data)
verify_model(topk6, input_data=input_data)
verify_model(topk7, input_data=input_data_fp32)
verify_model(topk8, input_data=input_data_fp32)


@tvm.testing.uses_gpu
Expand Down Expand Up @@ -1783,6 +1795,17 @@ def where_index_1(inputs):
verify_model(where_index_1, input_data=input_data, use_vm=True)


@tvm.testing.uses_gpu
def test_forward_take_along_axis():
@paddle.jit.to_static
def take_along_axis_1(inputs, index):
return paddle.take_along_axis(inputs, index, 0)

input_data = paddle.to_tensor([[1, 2, 3], [4, 5, 6], [7, 8, 9]])
index = paddle.to_tensor([[0]])
verify_model(take_along_axis_1, input_data=[input_data, index])


@tvm.testing.uses_gpu
def test_forward_stack():
class Stack1(nn.Layer):
Expand Down