Skip to content

Arm backend: fix incorrect output shapes for var and expand #7414

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 1 commit into from
Jan 9, 2025
Merged

Arm backend: fix incorrect output shapes for var and expand #7414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions backends/arm/_passes/convert_expand_copy_to_repeat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

from typing import cast

from executorch.backends.arm.tosa_mapping import extract_tensor_meta
from executorch.exir.dialects._ops import ops as exir_ops
from executorch.exir.pass_base import ExportPass

Expand All @@ -25,14 +24,14 @@ def call_operator(self, op, args, kwargs, meta):
if op != self.expand_copy:
return super().call_operator(op, args, kwargs, meta)

_, shape, _ = extract_tensor_meta(meta.data)
input_shape = args[0].data.shape
multiples = cast(list[int], args[1])
expanded_rank = len(multiples)

# Expanded shape is 'shape' front-padded with ones.
padding = expanded_rank - len(shape)
# Expanded shape is 'input_shape' front-padded with ones.
padding = expanded_rank - len(input_shape)
extended_shape = [
shape[i] if i >= 0 else 1 for i in range(-padding, len(shape))
input_shape[i] if i >= 0 else 1 for i in range(-padding, len(input_shape))
]

# To convert expand arg to repeat arg, non-repeated dims should have
Expand Down
2 changes: 1 addition & 1 deletion backends/arm/_passes/decompose_var_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def call_operator(self, op, args, kwargs, meta):
sum = super().call_operator(sum_op, (squared_diff, dim, keepdim), {}, meta)
full = super().call_operator(
full_op,
([1 for _ in shape], 1 / max(0, N - correction)),
([], 1 / max(0, N - correction)),
{"dtype": dtype},
meta,
)
Expand Down
2 changes: 1 addition & 1 deletion backends/arm/_passes/match_arg_ranks_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def call(self, graph_module: GraphModule) -> PassResult:
continue

# Calculate max rank of all inputs to node
max_rank = 1
max_rank = 0
for arg in node.args:
if isinstance(arg, Node):
shape = get_first_fake_tensor(arg).shape
Expand Down
13 changes: 7 additions & 6 deletions backends/arm/test/ops/test_expand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ class TestSimpleExpand(unittest.TestCase):
class Expand(torch.nn.Module):
# (input tensor, multiples)
test_parameters = [
(torch.ones(1), (2,)),
(torch.ones(1, 4), (1, -1)),
(torch.ones(1, 1, 2, 2), (4, 3, -1, 2)),
(torch.ones(1), (2, 2, 4)),
(torch.ones(3, 2, 4, 1), (-1, -1, -1, 3)),
(torch.ones(1, 1, 192), (1, -1, -1)),
(torch.rand(1), (2,)),
(torch.randn(1, 4), (1, -1)),
(torch.rand(1, 1, 2, 2), (4, 3, -1, 2)),
(torch.randn(1), (2, 2, 4)),
(torch.rand(3, 2, 4, 1), (-1, -1, -1, 3)),
(torch.randn(1, 1, 192), (1, -1, -1)),
(torch.randn(10, 1, 1, 97), (-1, 4, -1, -1)),
]

def forward(self, x: torch.Tensor, multiples: Sequence):
Expand Down
Loading