Skip to content

Upsample Bilinear 2d #4535

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
facebook-github-bot merged 1 commit into from
Aug 8, 2024
Merged

Upsample Bilinear 2d #4535

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
6 changes: 3 additions & 3 deletions backends/xnnpack/operators/op_static_resize_bilinear_2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

from typing import cast, Dict, List
from typing import cast, Dict

import torch
from executorch.backends.xnnpack.operators.node_visitor import (
Expand All @@ -23,7 +23,7 @@

@register_node_visitor
class StaticResizeBilinear2DVisitor(NodeVisitor):
target = "aten.upsample_bilinear2d.default"
target = "aten.upsample_bilinear2d.vec"

def __init__(self, *args) -> None:
super().__init__(*args)
Expand All @@ -44,7 +44,7 @@ def define_node(
# output
output_id = vals_to_ids[node]

new_size = cast(List[int], node.args[1])
new_size = node.meta["val"].shape[-2:]

flags = XNN_FLAG_ALIGN_CORNERS if cast(bool, node.args[2]) else 0

Expand Down
2 changes: 2 additions & 0 deletions backends/xnnpack/partition/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
ReLUConfig,
SigmoidConfig,
SoftmaxConfig,
UpsampleBilinear2dConfig,
)
from executorch.backends.xnnpack.partition.config.node_configs import (
BatchNormConfig,
Expand Down Expand Up @@ -66,6 +67,7 @@
PermuteConfig,
# EluConfig, # Waiting for PyTorch Pin Update
ReLUConfig,
UpsampleBilinear2dConfig,
# Quantization Op Configs
QuantizedPerTensorConfig,
DeQuantizedPerTensorConfig,
Expand Down
10 changes: 10 additions & 0 deletions backends/xnnpack/partition/config/generic_node_configs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,13 @@ def supported_precision_types(self) -> List[ConfigPrecisionType]:

def get_original_aten(self) -> Optional[torch._ops.OpOverload]:
return torch.ops.aten.max_pool2d.default


class UpsampleBilinear2dConfig(GenericNodePartitionerConfig):
target_name = "upsample_bilinear2d.vec"

def supported_precision_types(self) -> List[ConfigPrecisionType]:
return [ConfigPrecisionType.FP32]

def get_original_aten(self) -> Optional[torch._ops.OpOverload]:
return torch.ops.aten.upsample_bilinear2d.vec
2 changes: 1 addition & 1 deletion backends/xnnpack/passes/channels_last_tagged_reshape_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ChannelsLastTaggedReshapePass(XNNPACKPass):
# Set of ops that require memory format to be channels last (NHWC)
memory_sensitive_ops_nhwc = {
exir_ops.edge.aten.convolution.default,
exir_ops.edge.aten.upsample_bilinear2d.default,
exir_ops.edge.aten.upsample_bilinear2d.vec,
exir_ops.edge.aten.mean.dim,
exir_ops.edge.aten.max_pool2d.default,
exir_ops.edge.aten.amax.default,
Expand Down
2 changes: 1 addition & 1 deletion backends/xnnpack/passes/convert_to_upsample_bilinear2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def create_upsample_bilinear_2d(
with graph_module.graph.inserting_before(output):
upsample_node = graph_module.graph.create_node(
"call_function",
exir_ops.edge.aten.upsample_bilinear2d.default,
exir_ops.edge.aten.upsample_bilinear2d.vec,
# TODO(T166527012): Using output_h and output_w here only works with static shapes
args=(input_node, [output_h, output_w], align_corners, None),
)
Expand Down
14 changes: 3 additions & 11 deletions backends/xnnpack/test/ops/bilinear2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ def test_fp32_static_resize_bilinear2d(self):
(
Tester(self.StaticResizeBilinear2dModule(), example_inputs)
.export()
.to_edge()
.partition()
.to_edge_transform_and_lower()
.check_not(self.ops)
.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
.to_executorch()
Expand All @@ -97,8 +96,7 @@ def test_fp32_static_resize_bilinear2d_with_align_corners(self):
(
Tester(self.StaticResizeBilinear2dModuleWithAlignCorners(), example_inputs)
.export()
.to_edge()
.partition()
.to_edge_transform_and_lower()
.check_not(self.ops)
.check_count({"torch.ops.higher_order.executorch_call_delegate": 1})
.to_executorch()
Expand All @@ -112,13 +110,7 @@ def test_fp32_static_resize_bilinear2d_antialiased(self):
(
Tester(self.Bilinear2dAntiAlias(), example_inputs)
.export()
.to_edge()
.check_count(
{
"executorch_exir_dialects_edge__ops_aten__upsample_bilinear2d_aa_default": 2
}
)
.partition()
.to_edge_transform_and_lower()
.check_count(
{
"executorch_exir_dialects_edge__ops_aten__upsample_bilinear2d_aa_default": 2
Expand Down