Skip to content

Update Inspector interface based on new design and define underlying data classes (Event, EventBlock, PerfData) #343

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions sdk/edir/et_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class RESERVED_METADATA_ARG(Enum):
DEBUG_HANDLE = "debug_handle"
MODULE_STACK = "module_stack"
SOURCE_FN = "source_fn"
MODULE_TYPE = "module_type"
MODULE_TYPE = "nn_module_type"
PROFILE_START_TIME = "profile_start_time"
PROFILE_END_TIME = "profile_end_time"
LOAD_START_TIME = "load_start_time"
Expand Down Expand Up @@ -672,7 +672,7 @@ def _compose_op_graph(
# Generate Module Graphs
module_graphs: List[OperatorGraph] = []
for module_key, module_nodes in module_mapping.items():
module_element = OperatorGraph(
module_element = OperatorGraphWithStats(
graph_name=module_key[0],
elements=module_nodes,
metadata={"module_type": module_key[1]},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @generated by //executorch/sdk/edir/tests:generate_fixtures

FXOperatorGraph(graph_name='base', elements=[FXOperatorGraph(graph_name='inputs', elements=[ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], metadata=None), FXOperatorGraph(graph_name='forward', elements=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), OperatorNode(name='mul_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='mul.Tensor'), OperatorGraph(graph_name='executorch_call_delegate', elements=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='executorch_call_delegate')], metadata={'module_type': 'executorch_call_delegate'})], metadata=None), FXOperatorGraph(graph_name='outputs', elements=[ValueNode(name='output_', inputs=[OperatorNode(name='mul_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='mul.Tensor')], output_shapes=None, metadata={}, dtype=None, val=None)], metadata=None)], metadata=None)
FXOperatorGraph(graph_name='base', elements=[FXOperatorGraph(graph_name='inputs', elements=[ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], metadata=None), FXOperatorGraph(graph_name='forward', elements=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), OperatorNode(name='mul_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='mul.Tensor'), OperatorGraphWithStats(graph_name='executorch_call_delegate', elements=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='executorch_call_delegate')], metadata={'module_type': 'executorch_call_delegate'})], metadata=None), FXOperatorGraph(graph_name='outputs', elements=[ValueNode(name='output_', inputs=[OperatorNode(name='mul_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=())], output_shapes=None, metadata={}, op='mul.Tensor')], output_shapes=None, metadata={}, dtype=None, val=None)], metadata=None)], metadata=None)
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @generated by //executorch/sdk/edir/tests:generate_fixtures

FXOperatorGraph(graph_name='base', elements=[FXOperatorGraph(graph_name='inputs', elements=[ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=()), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], metadata=None), FXOperatorGraph(graph_name='forward', elements=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 4}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 6}, op='aten.mul.Tensor'), OperatorGraph(graph_name='executorch_call_delegate', elements=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 4}, op='executorch_call_delegate')], metadata={'module_type': 'executorch_call_delegate'})], metadata=None), FXOperatorGraph(graph_name='outputs', elements=[ValueNode(name='output_', inputs=[OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 4}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 6}, op='aten.mul.Tensor')], output_shapes=None, metadata={'debug_handle': 7}, dtype=None, val=None)], metadata=None)], metadata=None)
FXOperatorGraph(graph_name='base', elements=[FXOperatorGraph(graph_name='inputs', elements=[ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=()), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], metadata=None), FXOperatorGraph(graph_name='forward', elements=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 4}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 6}, op='aten.mul.Tensor'), OperatorGraphWithStats(graph_name='executorch_call_delegate', elements=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 4}, op='executorch_call_delegate')], metadata={'module_type': 'executorch_call_delegate'})], metadata=None), FXOperatorGraph(graph_name='outputs', elements=[ValueNode(name='output_', inputs=[OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={'debug_handle': 3}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 4}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 6}, op='aten.mul.Tensor')], output_shapes=None, metadata={'debug_handle': 7}, dtype=None, val=None)], metadata=None)], metadata=None)
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @generated by //executorch/sdk/edir/tests:generate_fixtures

FXOperatorGraph(graph_name='base', elements=[FXOperatorGraph(graph_name='inputs', elements=[ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=()), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], metadata=None), FXOperatorGraph(graph_name='forward', elements=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 0}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 1}, op='mul.out'), OperatorGraph(graph_name='executorch_call_delegate', elements=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 0}, op='executorch_call_delegate')], metadata={'module_type': 'executorch_call_delegate'})], metadata=None), FXOperatorGraph(graph_name='outputs', elements=[ValueNode(name='output_', inputs=[OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 0}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 1}, op='mul.out')], output_shapes=None, metadata={'debug_handle': 7}, dtype=None, val=None)], metadata=None)], metadata=None)
FXOperatorGraph(graph_name='base', elements=[FXOperatorGraph(graph_name='inputs', elements=[ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=()), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], metadata=None), FXOperatorGraph(graph_name='forward', elements=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 0}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 1}, op='mul.out'), OperatorGraphWithStats(graph_name='executorch_call_delegate', elements=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 0}, op='executorch_call_delegate')], metadata={'module_type': 'executorch_call_delegate'})], metadata=None), FXOperatorGraph(graph_name='outputs', elements=[ValueNode(name='output_', inputs=[OperatorNode(name='aten_mul_tensor_', inputs=[OperatorNode(name='executorch_call_delegate_', inputs=[ValueNode(name='lowered_module_0_', inputs=None, output_shapes=None, metadata={}, dtype=None, val=None), ValueNode(name='arg0_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 0}, dtype=None, val=()), ValueNode(name='arg1_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 1}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 0}, op='executorch_call_delegate'), ValueNode(name='arg2_1_', inputs=None, output_shapes=None, metadata={'debug_handle': 2}, dtype=None, val=())], output_shapes=None, metadata={'debug_handle': 1}, op='mul.out')], output_shapes=None, metadata={'debug_handle': 7}, dtype=None, val=None)], metadata=None)], metadata=None)

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions sdk/etdb/TARGETS
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,25 @@ python_library(
"inspector.py",
],
deps = [
"fbsource//third-party/pypi/ipython:ipython",
"fbsource//third-party/pypi/numpy:numpy",
"fbsource//third-party/pypi/pandas:pandas",
"fbsource//third-party/pypi/tabulate:tabulate",
":inspector_utils",
"//caffe2:torch",
"//executorch/exir:lib",
"//executorch/sdk/edir:et_schema",
"//executorch/sdk/etrecord:etrecord",
],
)

python_library(
name = "inspector_utils",
srcs = [
"_inspector_utils.py",
],
deps = [
"//executorch/sdk/edir:et_schema",
"//executorch/sdk/etrecord:etrecord",
],
)
22 changes: 22 additions & 0 deletions sdk/etdb/_inspector_utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# 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 Mapping

from executorch.sdk.edir.et_schema import FXOperatorGraph, OperatorGraphWithStats
from executorch.sdk.etrecord import ETRecord


# TODO: add a unittest for this function
def gen_graphs_from_etrecord(
etrecord: ETRecord,
) -> Mapping[str, OperatorGraphWithStats]:
if etrecord.graph_map is None:
return {}
return {
name: FXOperatorGraph.gen_operator_graph(exported_program.graph_module)
for name, exported_program in etrecord.graph_map.items()
}
Loading