-
Notifications
You must be signed in to change notification settings - Fork 362
feat: support amax dynamo converter #2241
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Changes from all commits
8cf6492
e73ceae
8c580d5
cbe8ff2
9a1c426
ecb2316
9e232d5
53931d4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ | |
matmul, | ||
normalization, | ||
permutation, | ||
reduce, | ||
select, | ||
shape, | ||
slice, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
from typing import Optional, Tuple, Union | ||
|
||
import tensorrt as trt | ||
from torch.fx.node import Target | ||
from torch_tensorrt.dynamo._SourceIR import SourceIR | ||
from torch_tensorrt.dynamo.conversion.converter_utils import ( | ||
cast_trt_tensor, | ||
get_axes_for_reduce_op, | ||
) | ||
from torch_tensorrt.fx.converters.converter_utils import set_layer_name | ||
from torch_tensorrt.fx.types import TRTNetwork, TRTTensor | ||
|
||
|
||
def amax( | ||
network: TRTNetwork, | ||
target: Target, | ||
source_ir: Optional[SourceIR], | ||
name: str, | ||
input_val: TRTTensor, | ||
dim: Union[int, Tuple[int]], | ||
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) | ||
Comment on lines
+23
to
+26
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this required for the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, it's required because |
||
|
||
layer = network.add_reduce( | ||
input_val, | ||
trt.ReduceOperation.MAX, | ||
axes=get_axes_for_reduce_op(dim), | ||
keep_dims=keepdim, | ||
) | ||
set_layer_name(layer, target, name, source_ir) | ||
return layer.get_output(0) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
import torch | ||
import torch.nn as nn | ||
from harness import DispatchTestCase | ||
from parameterized import parameterized | ||
from torch.testing._internal.common_utils import run_tests | ||
|
||
|
||
class TestAmaxConverter(DispatchTestCase): | ||
@parameterized.expand( | ||
[ | ||
((3, 2, 4), 1, True), | ||
((2, 3, 4, 5), 3, True), | ||
((2, 3, 4, 5), 2, False), | ||
((6, 7, 5, 4, 5), 4, False), | ||
] | ||
) | ||
def test_amax_dim_int_default(self, input_shape, dim, keep_dims): | ||
class Amax(nn.Module): | ||
def forward(self, x): | ||
return torch.amax(x, dim=dim, keepdim=keep_dims) | ||
|
||
inputs = [torch.randn(*input_shape)] | ||
self.run_test( | ||
Amax(), | ||
inputs, | ||
expected_ops={torch.ops.aten.amax.default}, | ||
) | ||
|
||
@parameterized.expand( | ||
[ | ||
((3, 2, 4), [1], True), | ||
((2, 1, 4, 5), [0, 3], True), | ||
((2, 3, 4, 5), [0, 1, 2, 3], False), | ||
((6, 7, 5, 4, 5), [1, 3, 4], False), | ||
] | ||
) | ||
def test_amax_dim_tuple_default(self, input_shape, dim, keep_dims): | ||
class Amax(nn.Module): | ||
def forward(self, x): | ||
return torch.amax(x, dim=dim, keepdim=keep_dims) | ||
|
||
inputs = [torch.randn(*input_shape)] | ||
self.run_test( | ||
Amax(), | ||
inputs, | ||
expected_ops={torch.ops.aten.amax.default}, | ||
) | ||
|
||
@parameterized.expand( | ||
[ | ||
((3, 2, 4), 1, True, torch.int, 0, 5), | ||
((2, 3, 4, 5), 3, 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_amax_dim_int_int(self, input_shape, dim, keep_dims, dtype, low, high): | ||
class Amax(nn.Module): | ||
def forward(self, x): | ||
return torch.amax(x, dim=dim, keepdim=keep_dims) | ||
|
||
inputs = [torch.randint(low, high, input_shape, dtype=dtype)] | ||
self.run_test( | ||
Amax(), | ||
inputs, | ||
expected_ops={torch.ops.aten.amax.default}, | ||
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), [0, 1, 2, 3], False, torch.int32, -5, 0), | ||
((6, 7, 5, 4, 5), [1, 3, 4], False, torch.int32, -5, 5), | ||
] | ||
) | ||
def test_amax_dim_tuple_int(self, input_shape, dim, keep_dims, dtype, low, high): | ||
class Amax(nn.Module): | ||
def forward(self, x): | ||
return torch.amax(x, dim=dim, keepdim=keep_dims) | ||
|
||
inputs = [torch.randint(low, high, input_shape, dtype=dtype)] | ||
self.run_test( | ||
Amax(), | ||
inputs, | ||
expected_ops={torch.ops.aten.amax.default}, | ||
check_dtype=False, | ||
) | ||
|
||
|
||
if __name__ == "__main__": | ||
run_tests() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gs-olive can this check be done in a validator?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This check can be done in a validator, but in this context it would make the most sense for it to be done here, since we can support cases where this argument is both present and absent.