Skip to content
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

Jump to bottom

add dynamic shape support for aten.ops.gt and aten.ops.ge #2883

Merged
merged 2 commits into from
Jun 7, 2024
Merged

add dynamic shape support for aten.ops.gt and aten.ops.ge #2883

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
8bc3987
add dynamic shape support for aten.ops.gt and aten.ops.ge
lanluo-nvidia Jun 4, 2024
83e4ef0
Add supports_dynamic_shapes=True annotation
lanluo-nvidia Jun 4, 2024
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
8 changes: 4 additions & 4 deletions py/torch_tensorrt/dynamo/conversion/aten_ops_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2143,8 +2143,8 @@ def aten_ops_ne(
)


@dynamo_tensorrt_converter(torch.ops.aten.gt.Tensor)
@dynamo_tensorrt_converter(torch.ops.aten.gt.Scalar)
@dynamo_tensorrt_converter(torch.ops.aten.gt.Tensor, supports_dynamic_shapes=True)
@dynamo_tensorrt_converter(torch.ops.aten.gt.Scalar, supports_dynamic_shapes=True)
@enforce_tensor_types(
{
0: (TRTTensor,),
Expand All @@ -2167,8 +2167,8 @@ def aten_ops_gt(
)


@dynamo_tensorrt_converter(torch.ops.aten.ge.Tensor)
@dynamo_tensorrt_converter(torch.ops.aten.ge.Scalar)
@dynamo_tensorrt_converter(torch.ops.aten.ge.Tensor, supports_dynamic_shapes=True)
@dynamo_tensorrt_converter(torch.ops.aten.ge.Scalar, supports_dynamic_shapes=True)
@enforce_tensor_types(
{
0: (TRTTensor,),
Expand Down
51 changes: 51 additions & 0 deletions tests/py/dynamo/conversion/test_ge_aten.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import torch.nn as nn
from parameterized import parameterized
from torch.testing._internal.common_utils import run_tests
from torch_tensorrt import Input

from .harness import DispatchTestCase

Expand Down Expand Up @@ -61,6 +62,56 @@ def forward(self, lhs_val):
inputs,
)

@parameterized.expand(
[
("2d_2d", (5, 3), (5, 1)),
("3d_2d", (5, 3, 2), (3, 1)),
("4d_3d", (5, 3, 4, 1), (3, 1, 1)),
]
)
def test_ge_tensor_broadcast(self, _, lshape, rshape):
class ge(nn.Module):
def forward(self, lhs_val, rhs_val):
return torch.ops.aten.ge.Tensor(lhs_val, rhs_val)

inputs = [
torch.randint(0, 3, lshape, dtype=torch.int32),
torch.randint(0, 3, rshape, dtype=torch.int32),
]
self.run_test(
ge(),
inputs,
)

@parameterized.expand(
[
("2d_2d", (2, 3), (4, 3), (5, 3), (2, 3), (4, 3), (5, 3)),
("3d_2d", (2, 2, 2), (2, 3, 2), (2, 4, 2), (2, 1), (3, 1), (4, 1)),
]
)
def test_ge_dynamic_tensor(self, *args):
class ge(nn.Module):
def forward(self, lhs_val, rhs_val):
return torch.ops.aten.ge.Tensor(lhs_val, rhs_val)

input_specs = [
Input(
min_shape=args[1],
opt_shape=args[2],
max_shape=args[3],
),
Input(
min_shape=args[4],
opt_shape=args[5],
max_shape=args[6],
),
]

self.run_test_with_dynamic_shape(
ge(),
input_specs,
)


if __name__ == "__main__":
run_tests()
51 changes: 51 additions & 0 deletions tests/py/dynamo/conversion/test_gt_aten.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import torch.nn as nn
from parameterized import parameterized
from torch.testing._internal.common_utils import run_tests
from torch_tensorrt import Input

from .harness import DispatchTestCase

Expand Down Expand Up @@ -58,6 +59,56 @@ def forward(self, lhs_val):
inputs,
)

@parameterized.expand(
[
("2d_2d", (5, 3), (5, 1)),
("3d_2d", (5, 3, 2), (3, 1)),
("4d_3d", (5, 3, 4, 1), (3, 1, 1)),
]
)
def test_gt_tensor_broadcast(self, _, lshape, rshape):
class gt(nn.Module):
def forward(self, lhs_val, rhs_val):
return torch.ops.aten.gt.Tensor(lhs_val, rhs_val)

inputs = [
torch.randint(0, 3, lshape, dtype=torch.int32),
torch.randint(0, 3, rshape, dtype=torch.int32),
]
self.run_test(
gt(),
inputs,
)

@parameterized.expand(
[
("2d_2d", (2, 3), (4, 3), (5, 3), (2, 3), (4, 3), (5, 3)),
("3d_2d", (2, 2, 2), (2, 3, 2), (2, 4, 2), (2, 1), (3, 1), (4, 1)),
]
)
def test_gt_dynamic_tensor(self, *args):
class gt(nn.Module):
def forward(self, lhs_val, rhs_val):
return torch.ops.aten.gt.Tensor(lhs_val, rhs_val)

input_specs = [
Input(
min_shape=args[1],
opt_shape=args[2],
max_shape=args[3],
),
Input(
min_shape=args[4],
opt_shape=args[5],
max_shape=args[6],
),
]

self.run_test_with_dynamic_shape(
gt(),
input_specs,
)


if __name__ == "__main__":
run_tests()
Loading