Skip to content

[Backend Tester] Clean up report output #13306

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 129 commits into from
Aug 13, 2025
Merged
Show file tree
Hide file tree
Changes from 119 commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
f120e70
Update
GregoryComer Jul 18, 2025
0fb85e6
Update
GregoryComer Jul 18, 2025
4d8d844
Update
GregoryComer Jul 19, 2025
dc12b40
Update
GregoryComer Jul 21, 2025
ead0616
Update
GregoryComer Jul 22, 2025
0f13676
Update
GregoryComer Jul 22, 2025
b0b01f2
Update
GregoryComer Jul 22, 2025
8b9c9ef
Update
GregoryComer Jul 22, 2025
06bf03a
Update
GregoryComer Jul 22, 2025
2f8f49b
Update
GregoryComer Jul 22, 2025
8ca7766
Update
GregoryComer Jul 22, 2025
bffb95f
Update
GregoryComer Jul 22, 2025
d21492b
Update
GregoryComer Jul 22, 2025
e2c4ea5
Update
GregoryComer Jul 22, 2025
8230848
Update
GregoryComer Jul 22, 2025
2a1f564
Update
GregoryComer Jul 22, 2025
b35e7b1
Update
GregoryComer Jul 22, 2025
5c4c6ce
Update
GregoryComer Jul 22, 2025
9397803
Update
GregoryComer Jul 22, 2025
9dfeb5a
Update
GregoryComer Jul 22, 2025
ff5c4a5
Update
GregoryComer Jul 22, 2025
42a5de5
Update
GregoryComer Jul 22, 2025
402d8f5
Update
GregoryComer Jul 22, 2025
34d3ab3
Update
GregoryComer Jul 22, 2025
1105e04
Update
GregoryComer Jul 22, 2025
482bd21
Update
GregoryComer Jul 22, 2025
ea548b7
Update
GregoryComer Jul 23, 2025
4108f54
Update
GregoryComer Jul 23, 2025
7ef236b
Update
GregoryComer Jul 23, 2025
4a58c9d
Update
GregoryComer Jul 23, 2025
3b866b4
Update
GregoryComer Jul 23, 2025
5ba25cb
Update
GregoryComer Jul 23, 2025
19760fc
Update
GregoryComer Jul 23, 2025
81dfb07
Update
GregoryComer Jul 23, 2025
4d50265
Update
GregoryComer Jul 23, 2025
5f66043
Update
GregoryComer Jul 23, 2025
24e919d
Update
GregoryComer Jul 23, 2025
523cc20
Update
GregoryComer Jul 23, 2025
74c95fe
Update
GregoryComer Jul 23, 2025
5d437b1
Update
GregoryComer Jul 23, 2025
89757ce
Update
GregoryComer Jul 23, 2025
423f79a
Update
GregoryComer Jul 23, 2025
69f7f9c
Update
GregoryComer Jul 23, 2025
c0f6224
Update
GregoryComer Jul 23, 2025
e2ea2a3
Update
GregoryComer Jul 23, 2025
7a2fab5
Update
GregoryComer Jul 23, 2025
033c231
Update
GregoryComer Jul 23, 2025
a9ed762
Update
GregoryComer Jul 23, 2025
64b174a
Update
GregoryComer Jul 23, 2025
3976629
Update
GregoryComer Jul 23, 2025
27cd171
Update
GregoryComer Jul 23, 2025
7bdd3e5
Update
GregoryComer Jul 23, 2025
b1254cd
Update
GregoryComer Jul 23, 2025
f2e2289
Update
GregoryComer Jul 23, 2025
cdd15c1
Update
GregoryComer Jul 23, 2025
e2df06e
Update
GregoryComer Jul 23, 2025
4461bd8
Update
GregoryComer Jul 23, 2025
7e97fd0
Update
GregoryComer Jul 23, 2025
bcb697c
Update
GregoryComer Jul 23, 2025
11a5a02
Update
GregoryComer Jul 24, 2025
244b146
Update
GregoryComer Jul 24, 2025
de21ac2
Update
GregoryComer Jul 24, 2025
fd26fc7
Update
GregoryComer Jul 24, 2025
4ae840d
Update
GregoryComer Jul 24, 2025
710ea49
Update
GregoryComer Jul 24, 2025
32f54b0
Update
GregoryComer Jul 24, 2025
a27d18c
Update
GregoryComer Jul 24, 2025
2eb59fc
Update
GregoryComer Jul 24, 2025
5cc4941
Update
GregoryComer Jul 24, 2025
ef7af5c
Update
GregoryComer Jul 24, 2025
18e89c1
Update
GregoryComer Jul 24, 2025
4719c90
Update
GregoryComer Jul 25, 2025
dd09555
Update
GregoryComer Aug 8, 2025
f1db3a0
Update
GregoryComer Aug 8, 2025
e0700b2
Update
GregoryComer Aug 8, 2025
f260b50
Update
GregoryComer Aug 8, 2025
d62ee60
Update
GregoryComer Aug 8, 2025
b2ab3a5
Update
GregoryComer Aug 8, 2025
c23c3e9
Update
GregoryComer Aug 8, 2025
c99c41a
Update
GregoryComer Aug 9, 2025
bf57d6c
Update
GregoryComer Aug 9, 2025
f261355
Update
GregoryComer Aug 11, 2025
c3a24f9
Update
GregoryComer Aug 11, 2025
1697cbc
Update
GregoryComer Aug 11, 2025
b94b45e
Update
GregoryComer Aug 11, 2025
5740f0a
Update
GregoryComer Aug 11, 2025
ed6840d
Update
GregoryComer Aug 11, 2025
f2a7e1f
Update
GregoryComer Aug 11, 2025
0e162ab
Update
GregoryComer Aug 11, 2025
c6bd56b
Update
GregoryComer Aug 11, 2025
144a8ae
Update
GregoryComer Aug 12, 2025
6f85fc1
Update
GregoryComer Aug 12, 2025
bd79ef2
Update
GregoryComer Aug 12, 2025
8932c29
Update
GregoryComer Aug 12, 2025
ea2549c
Update
GregoryComer Aug 12, 2025
ffaa1c3
Update
GregoryComer Aug 12, 2025
bba2fa9
Update
GregoryComer Aug 12, 2025
78086b4
Update
GregoryComer Aug 12, 2025
f4b0dc2
Update
GregoryComer Aug 12, 2025
5e92884
Update
GregoryComer Aug 12, 2025
aa27776
Update
GregoryComer Aug 12, 2025
7e1a002
Update
GregoryComer Aug 12, 2025
a628d29
Update
GregoryComer Aug 12, 2025
3615d89
Update
GregoryComer Aug 12, 2025
e994bc1
Update
GregoryComer Aug 12, 2025
0aba8e1
Update
GregoryComer Aug 12, 2025
4329bf6
Update
GregoryComer Aug 12, 2025
105aabc
Update
GregoryComer Aug 12, 2025
1d34f49
Update
GregoryComer Aug 12, 2025
933fba2
Update
GregoryComer Aug 12, 2025
d468ae4
Update
GregoryComer Aug 12, 2025
acbd480
Update
GregoryComer Aug 12, 2025
e515bf1
Update
GregoryComer Aug 12, 2025
803db00
Update
GregoryComer Aug 12, 2025
1897d4e
Update
GregoryComer Aug 12, 2025
f65d80f
Update
GregoryComer Aug 12, 2025
0d1f097
Update
GregoryComer Aug 12, 2025
f0c2490
Update
GregoryComer Aug 12, 2025
0046b02
Update
GregoryComer Aug 12, 2025
871312a
Update
GregoryComer Aug 12, 2025
53990fe
Update
GregoryComer Aug 12, 2025
567d055
Update
GregoryComer Aug 12, 2025
cd998cf
Update
GregoryComer Aug 12, 2025
31bc137
Update
GregoryComer Aug 12, 2025
dae5d43
Update
GregoryComer Aug 12, 2025
06b5532
Update
GregoryComer Aug 12, 2025
637b8a2
Update
GregoryComer Aug 12, 2025
7141f6c
Update
GregoryComer Aug 12, 2025
995c4b5
Update
GregoryComer Aug 13, 2025
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
5 changes: 4 additions & 1 deletion backends/qualcomm/tests/tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ def __init__(
default_partitioner_cls=QnnPartitioner,
)

def run(self, artifact: ExportedProgram, inputs=None) -> None:
def run(
self, artifact: ExportedProgram, inputs=None, generate_etrecord: bool = False
) -> None:
ep = QnnPassManager().transform_for_export_pipeline(artifact)
transform_passes = QnnPassManager().get_to_edge_transform_passes(ep)

Expand All @@ -61,6 +63,7 @@ def run(self, artifact: ExportedProgram, inputs=None) -> None:
transform_passes=transform_passes,
partitioner=self.partitioners,
compile_config=self.edge_compile_conf,
generate_etrecord=generate_etrecord,
)


Expand Down
18 changes: 14 additions & 4 deletions backends/test/harness/stages/to_edge_transform_and_lower.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,38 @@
to_edge_transform_and_lower,
)
from executorch.exir.backend.partitioner import Partitioner

from torch.export import ExportedProgram


class ToEdgeTransformAndLower(Stage):
def __init__(
self,
default_partitioner_cls: Type,
default_partitioner_cls: Type | None = None,
partitioners: Optional[List[Partitioner]] = None,
edge_compile_config: Optional[EdgeCompileConfig] = None,
):
self.partitioners = partitioners or [default_partitioner_cls()]
self.edge_compile_conf = edge_compile_config or EdgeCompileConfig()
self.partitioners = (
partitioners or [default_partitioner_cls()]
if default_partitioner_cls is not None
else []
)
self.edge_compile_conf = edge_compile_config or EdgeCompileConfig(
_check_ir_validity=False
)
self.edge_dialect_program = None

def stage_type(self) -> StageType:
return StageType.TO_EDGE_TRANSFORM_AND_LOWER

def run(self, artifact: ExportedProgram, inputs=None) -> None:
def run(
self, artifact: ExportedProgram, inputs=None, generate_etrecord: bool = False
) -> None:
self.edge_dialect_program = to_edge_transform_and_lower(
artifact,
compile_config=self.edge_compile_conf,
partitioner=self.partitioners,
generate_etrecord=generate_etrecord,
)

@property
Expand Down
15 changes: 9 additions & 6 deletions backends/test/harness/tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ def __init__(
self,
module: torch.nn.Module,
example_inputs: Tuple[torch.Tensor],
stage_classes: Dict[StageType, Callable],
stage_classes: Dict[StageType, Callable] | None = None,
dynamic_shapes: Optional[Tuple[Any]] = None,
):
module.eval()

self.stage_classes = stage_classes
self.stage_classes = stage_classes or Tester.default_stage_classes()
self.original_module = module
self.example_inputs = example_inputs
self.dynamic_shapes = dynamic_shapes
Expand Down Expand Up @@ -183,10 +183,10 @@ def _post(self, stage):
assert stage_type in self.stages
self.stages[stage_type] = stage

def _run_stage(self, stage_instance, inputs=None):
def _run_stage(self, stage_instance, inputs=None, *args, **kwargs):
assert isinstance(stage_instance, Stage)
prev_stage_artifact = self._pre(stage_instance)
stage_instance.run(prev_stage_artifact, inputs=inputs)
stage_instance.run(prev_stage_artifact, inputs=inputs, *args, **kwargs) # noqa
self._post(stage_instance)
return self

Expand All @@ -213,11 +213,14 @@ def to_edge(self, to_edge_stage: Optional[ToEdge] = None):
return res

def to_edge_transform_and_lower(
self, to_edge_and_transform_stage: Optional[ToEdgeTransformAndLower] = None
self,
to_edge_and_transform_stage: Optional[ToEdgeTransformAndLower] = None,
generate_etrecord: bool = False,
):
return self._run_stage(
to_edge_and_transform_stage
or self._get_default_stage(StageType.TO_EDGE_TRANSFORM_AND_LOWER)
or self._get_default_stage(StageType.TO_EDGE_TRANSFORM_AND_LOWER),
generate_etrecord=generate_etrecord,
)

def run_passes(self, run_passes_stage: Optional[RunPasses] = None):
Expand Down
13 changes: 11 additions & 2 deletions backends/test/suite/flow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging

from dataclasses import dataclass, field
from dataclasses import dataclass
from typing import Callable

from executorch.backends.test.harness import Tester
Expand All @@ -26,16 +26,25 @@ class TestFlow:
tester_factory: Callable[..., Tester]
""" A factory function that returns a Tester instance for this lowering flow. """

quantize: bool = field(default=False)
quantize: bool = False
""" Whether to tester should run the quantize stage on the model. """

quantize_stage_factory: Callable[..., Quantize] | None = None
""" A factory function which instantiates a Quantize stage. Can be None to use the tester's default. """

is_delegated: bool = True
""" Indicates whether the flow is expected to generate CALL_DELEGATE nodes. """


def all_flows() -> dict[str, TestFlow]:
flows = []

from executorch.backends.test.suite.flows.portable import PORTABLE_TEST_FLOW

flows += [
PORTABLE_TEST_FLOW,
]

try:
from executorch.backends.test.suite.flows.xnnpack import (
XNNPACK_STATIC_INT8_PER_CHANNEL_TEST_FLOW,
Expand Down
19 changes: 19 additions & 0 deletions backends/test/suite/flows/portable.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import logging

from executorch.backends.test.harness import Tester
from executorch.backends.test.suite.flow import TestFlow

logger = logging.getLogger(__name__)
logger.setLevel(logging.INFO)


def _create_portable_flow() -> TestFlow:
return TestFlow(
"portable",
backend="portable",
tester_factory=Tester,
is_delegated=False,
)


PORTABLE_TEST_FLOW = _create_portable_flow()
12 changes: 6 additions & 6 deletions backends/test/suite/operators/test_amax.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,39 +207,39 @@ def test_amax_edge_cases(self, flow: TestFlow) -> None:
AmaxModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AmaxModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AmaxModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

x = torch.tensor([[1.0, float("nan"), 3.0], [4.0, 5.0, float("nan")]])
self._test_op(
AmaxModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AmaxModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AmaxModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

def test_amax_scalar(self, flow: TestFlow) -> None:
Expand Down
12 changes: 6 additions & 6 deletions backends/test/suite/operators/test_amin.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,39 +209,39 @@ def test_amin_edge_cases(self, flow: TestFlow) -> None:
AminModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AminModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AminModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

x = torch.tensor([[1.0, float("nan"), 3.0], [4.0, 5.0, float("nan")]])
self._test_op(
AminModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AminModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
AminModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

def test_amin_scalar(self, flow: TestFlow) -> None:
Expand Down
12 changes: 6 additions & 6 deletions backends/test/suite/operators/test_argmax.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,39 +149,39 @@ def test_argmax_edge_cases(self, flow: TestFlow) -> None:
ArgmaxModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgmaxModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgmaxModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

x = torch.tensor([[1.0, float("nan"), 3.0], [4.0, 5.0, float("nan")]])
self._test_op(
ArgmaxModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgmaxModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgmaxModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

x = torch.tensor([5.0])
Expand Down
12 changes: 6 additions & 6 deletions backends/test/suite/operators/test_argmin.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,39 +149,39 @@ def test_argmin_edge_cases(self, flow: TestFlow) -> None:
ArgminModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgminModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgminModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

x = torch.tensor([[1.0, float("nan"), 3.0], [4.0, 5.0, float("nan")]])
self._test_op(
ArgminModel(),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgminModel(dim=0),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)
self._test_op(
ArgminModel(dim=1),
(x,),
flow,
use_random_test_inputs=False,
generate_random_test_inputs=False,
)

x = torch.tensor([5.0])
Expand Down
4 changes: 2 additions & 2 deletions backends/test/suite/operators/test_floor.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@


class FloorModel(torch.nn.Module):
def __init__(self):
super().__init__()
def forward(self, x):
return torch.floor(x)


@operator_test
Expand Down
Loading
Loading