Skip to content

Move positional alpha to kwargs in ReplaceScalarWithTensorArgPass (#24176) #24176

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
meta-codesync merged 1 commit into from
Oct 29, 2026
Merged

Move positional alpha to kwargs in ReplaceScalarWithTensorArgPass (#24176) #24176

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
27 changes: 27 additions & 0 deletions backends/cadence/aot/tests/test_replace_ops_passes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,33 @@ def test_sub_replace_scalar_with_tensor_arg(
0,
)

@expand(
[
["add", exir_ops.edge.aten.add.Scalar, exir_ops.edge.aten.add.Tensor],
["sub", exir_ops.edge.aten.sub.Scalar, exir_ops.edge.aten.sub.Tensor],
]
)
@torch.no_grad()
def test_replace_scalar_with_tensor_arg_positional_alpha(
self,
_,
scalar_op: torch._ops.OpOverload,
tensor_op: torch._ops.OpOverload,
) -> None:
x = torch.randn(7, 5)
original_gm = single_op_builder(
placeholders=(x,),
op=scalar_op,
args=(x, 1.5, 2),
)
gm_before = copy.deepcopy(original_gm)
p = ReplaceScalarWithTensorArgPass()
graph_after_passes = cast(PassResult, p(original_gm)).graph_module

validate(gm_before, graph_after_passes, [x], "ReplaceScalarWithTensorArgPass")
self.assertEqual(count_node(graph_after_passes, tensor_op), 1)
self.assertEqual(count_node(graph_after_passes, scalar_op), 0)

@expand(
[
["3d", (7, 5, 6), 1.23],
Expand Down
11 changes: 8 additions & 3 deletions backends/transforms/replace_scalar_with_tensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from executorch.exir.dialects.edge._ops import EdgeOpOverload
from executorch.exir.pass_base import ExportPass
from torch._ops import OpOverload
from torch.fx.operator_schemas import normalize_function


class ReplaceScalarWithTensorArgPass(ExportPass):
Expand Down Expand Up @@ -71,8 +72,6 @@ def get_replacement(self, op, args, kwargs, meta):
},
meta=meta,
),
# Other args.
*args[2:],
),
kwargs=kwargs,
meta=meta,
Expand All @@ -96,4 +95,10 @@ def call_operator(self, op, args, kwargs, meta):
):
return super().call_operator(op, args, kwargs, meta)

return self.get_replacement(op, args, kwargs, meta)
# alpha is positional in add/sub.Scalar but keyword-only in .Tensor.
bound = normalize_function(
op, args, kwargs, normalize_to_only_use_kwargs=True
).kwargs
return self.get_replacement(
op, (bound["input"], bound["other"]), {"alpha": bound["alpha"]}, meta
)
Loading