Skip to content

feat: support torch.ops.aten.sum.(default and dim_IntList) dynamo converter #2278

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.

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 3 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
19 changes: 19 additions & 0 deletions py/torch_tensorrt/dynamo/conversion/aten_ops_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,25 @@ def aten_ops_amax(
)


@dynamo_tensorrt_converter(torch.ops.aten.sum.dim_IntList)
def aten_ops_sum(
network: TRTNetwork,
target: Target,
args: Tuple[Argument, ...],
kwargs: Dict[str, Argument],
name: str,
) -> Union[TRTTensor, Sequence[TRTTensor]]:
return impl.reduce.sum_dim_IntList(
network,
target,
SourceIR.ATEN,
name,
args[0],
args_bounds_check(args, 1, replacement=None),
args_bounds_check(args, 2, replacement=False),
)


@dynamo_tensorrt_converter(torch.ops.aten.exp.default) # type: ignore[misc]
def aten_ops_exp(
network: TRTNetwork,
Expand Down
28 changes: 27 additions & 1 deletion py/torch_tensorrt/dynamo/conversion/impl/reduce.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Optional, Tuple, Union
from typing import Optional, Sequence, Tuple, Union

import tensorrt as trt
from torch.fx.node import Target
Expand Down Expand Up @@ -33,3 +33,29 @@ def amax(
)
set_layer_name(layer, target, name, source_ir)
return layer.get_output(0)


def sum_dim_IntList(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems over specialized, what are the other variants of sum? Can we combine the implementations?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@narendasan Thanks for your suggestion! I updated to support both aten.sum.default and aten.sum.dim_IntList.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@narendasan lmk if more changes are needed! thanks!

network: TRTNetwork,
target: Target,
source_ir: Optional[SourceIR],
name: str,
input_val: TRTTensor,
dim: Optional[Union[int, Sequence[int]]] = None,
keepdim: bool = False,
) -> TRTTensor:
if (isinstance(input_val, TRTTensor)) and (
input_val.dtype == trt.int8 or input_val.dtype == trt.int32
):
input_val = cast_trt_tensor(network, input_val, trt.float32, name)

if dim is None:
dim = tuple(range(len(input_val.shape)))
layer = network.add_reduce(
input_val,
trt.ReduceOperation.SUM,
axes=get_axes_for_reduce_op(dim),
keep_dims=keepdim,
)
set_layer_name(layer, target, name, source_ir)
return layer.get_output(0)
94 changes: 94 additions & 0 deletions tests/py/dynamo/conversion/test_sum_aten.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import torch
import torch.nn as nn
from parameterized import parameterized
from torch.testing._internal.common_utils import run_tests

from .harness import DispatchTestCase


class TestSumConverter(DispatchTestCase):
@parameterized.expand(
[
((3, 2, 4), 1, True),
((2, 3, 4, 5), 3, True),
((2, 3, 4, 5), None, False),
((6, 7, 5, 4, 5), 4, False),
]
)
def test_sum_dim_int(self, input_shape, dim, keep_dims):
class Sum(nn.Module):
def forward(self, x):
return torch.sum(x, dim=dim, keepdim=keep_dims)

inputs = [torch.randn(*input_shape)]
self.run_test(
Sum(),
inputs,
expected_ops={torch.ops.aten.sum.dim_IntList},
)

@parameterized.expand(
[
((3, 2, 4), [1], True),
((2, 1, 4, 5), None, True),
((2, 3, 4, 5), [0, 1, 2, 3], False),
((6, 7, 5, 4, 5), [1, 3, 4], False),
]
)
def test_sum_dim_tuple(self, input_shape, dim, keep_dims):
class Sum(nn.Module):
def forward(self, x):
return torch.sum(x, dim=dim, keepdim=keep_dims)

inputs = [torch.randn(*input_shape)]
self.run_test(
Sum(),
inputs,
expected_ops={torch.ops.aten.sum.dim_IntList},
)

@parameterized.expand(
[
((3, 2, 4), 1, True, torch.int, 0, 5),
((2, 3, 4, 5), None, True, torch.int, -10, 10),
((2, 3, 4, 5), 2, False, torch.int32, -5, 0),
((6, 7, 5, 4, 5), 4, False, torch.int32, -5, 5),
]
)
def test_sum_dim_int_int(self, input_shape, dim, keep_dims, dtype, low, high):
class Sum(nn.Module):
def forward(self, x):
return torch.sum(x, dim=dim, keepdim=keep_dims)

inputs = [torch.randint(low, high, input_shape, dtype=dtype)]
self.run_test(
Sum(),
inputs,
expected_ops={torch.ops.aten.sum.dim_IntList},
check_dtype=False,
)

@parameterized.expand(
[
((3, 2, 4), [1], True, torch.int, 0, 5),
((2, 1, 4, 5), [0, 3], True, torch.int, -10, 10),
((2, 3, 4, 5), None, False, torch.int32, -5, 0),
((6, 7, 5, 4, 5), [1, 3, 4], False, torch.int32, -5, 5),
]
)
def test_sum_dim_tuple_int(self, input_shape, dim, keep_dims, dtype, low, high):
class Sum(nn.Module):
def forward(self, x):
return torch.sum(x, dim=dim, keepdim=keep_dims)

inputs = [torch.randint(low, high, input_shape, dtype=dtype)]
self.run_test(
Sum(),
inputs,
expected_ops={torch.ops.aten.sum.dim_IntList},
check_dtype=False,
)


if __name__ == "__main__":
run_tests()