chore: minor code tidy up (#105)

Author: awphi

scripts/generate-mlir-bin-sbom.py

@@ -66,7 +66,7 @@ def main():
                 "open-source-office@arm.com",
             )
         ],
-        creator_comment="THIS SOFTWARE BILL OF MATERIALS (\"SBOM\") IS PROVIDED BY ARM LIMITED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL ARM LIMITED BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SBOM, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.",
+        creator_comment='THIS SOFTWARE BILL OF MATERIALS ("SBOM") IS PROVIDED BY ARM LIMITED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL ARM LIMITED BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SBOM, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.',
         created=build_time,
     )
     document = Document(creation_info)

src/vgf_adapter_model_explorer/builder/builder.py

@@ -12,7 +12,7 @@
 from ..constants import GRAPH_INPUT_ANNOTATION, GRAPH_OUTPUT_ANNOTATION
 from ..generic import append_attr_to_metadata_list
 from ..parser.types import IOBase, Module, Resource, Vgf
-from .utils import extend_resource, find_item, format_index
+from .utils import extend_resource, format_index
 
 
 class VgfGraphBuilder:
@@ -26,6 +26,7 @@ def __init__(
         """Builds a Model Explorer GraphCollection from VGF data."""
 
         self.vgf_data = vgf_data
+        self.vgf_resources = {r.index: r for r in vgf_data.resources}
         self._build_spirv_nodes = build_spirv_nodes
         self.graph_collection = self._build_graph_collection()
 
@@ -41,9 +42,11 @@ def _build_graph_collection(self) -> gb.GraphCollection:
     def _build_nodes(self) -> list[gb.GraphNode]:
         """Build all nodes for the graph."""
         nodes = [self._build_graph_input_node()]
+        modules = {m.index: m for m in self.vgf_data.modules}
+        graph_output_node = self._build_graph_output_node()
 
         for segment in self.vgf_data.model_sequence.segments:
-            module = find_item(segment.module_index, self.vgf_data.modules)
+            module = modules.get(segment.module_index)
             if not module:
                 continue
 
@@ -56,9 +59,7 @@ def _build_nodes(self) -> list[gb.GraphNode]:
             output_nodes = self._build_segment_output_nodes(
                 segment.outputs, module, spirv_nodes
             )
-            nodes.extend(
-                input_nodes + output_nodes + [self._build_graph_output_node()]
-            )
+            nodes.extend(input_nodes + output_nodes + [graph_output_node])
 
         return nodes
 
@@ -98,7 +99,7 @@ def _build_segment_input_nodes(
         nodes: list[gb.GraphNode] = []
 
         for input in inputs:
-            resource = find_item(input.mrt_index, self.vgf_data.resources)
+            resource = self.vgf_resources.get(input.mrt_index)
             if not resource:
                 continue
             nodes.append(self._build_node(resource, module, input.mrt_index))
@@ -113,7 +114,7 @@ def _build_segment_output_nodes(
         source_id = spirv_nodes[-1].id if spirv_nodes else None
 
         for output in outputs:
-            resource = find_item(output.mrt_index, self.vgf_data.resources)
+            resource = self.vgf_resources.get(output.mrt_index)
             if not resource:
                 continue
             output_nodes.append(
@@ -157,9 +158,7 @@ def _build_node(
     ) -> gb.GraphNode:
         """Build a single graph node."""
         if source_id:
-            incoming_edges = [
-                gb.IncomingEdge(sourceNodeId=source_id, targetNodeInputId="0")
-            ]
+            incoming_edges = [gb.IncomingEdge(sourceNodeId=source_id)]
         else:
             incoming_edges = self._build_incoming_edges(resource)
 

src/vgf_adapter_model_explorer/builder/utils.py

@@ -4,20 +4,9 @@
 # Licensed under the Apache License v2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for license information.
 
-from typing import Iterable, TypeVar
-
 from model_explorer import graph_builder as gb
 
-from ..parser.types import Module, Resource
-
-T = TypeVar("T")
-
-
-def find_item(index: int, items: Iterable[T]) -> T | None:
-    """Finds the item at the given index."""
-    return next(
-        filter(lambda x: getattr(x, "index", None) == index, items), None
-    )
+from ..parser.types import Resource
 
 
 def format_index(prefix: str, index: int) -> str:
@@ -34,14 +23,3 @@ def extend_resource(node: gb.GraphNode, resource: Resource) -> None:
             gb.KeyValue(key="Format", value=resource.vk_format),
         ]
     )
-
-
-def extend_module(node: gb.GraphNode, module: Module) -> None:
-    """Extends module nodes with attributes."""
-    node.attrs.extend(
-        [
-            gb.KeyValue(key="Has Spirv", value=str(module.has_spirv)),
-            gb.KeyValue(key="Type", value=str(module.type)),
-            gb.KeyValue(key="Entry Point", value=str(module.entry_point)),
-        ]
-    )

src/vgf_adapter_model_explorer/constants.py

@@ -13,7 +13,6 @@
 GRAPH_OUTPUT_ANNOTATION: str = "GraphOutputs"
 GRAPH_TENSOR_IDX: str = "tensor_index"
 GRAPH_TENSOR_TYPE: str = "tensor_shape"
-GRAPH_TENSOR_TAG: str = "__tensor_tag"
 
 TERMINATOR_OPS: Set[str] = {"func.return"}
 

src/vgf_adapter_model_explorer/exec/mlir_translate.py

@@ -4,25 +4,10 @@
 # Licensed under the Apache License v2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for license information.
 
-import importlib.resources
-import sys
 from pathlib import Path
 
 from vgf_adapter_model_explorer.exec.exec_cmd import exec_cmd
-
-
-def get_binary_path(binary_name: str) -> Path:
-    """Get path to bundled binary, accounting for platform extensions."""
-    if sys.platform.startswith("win"):
-        binary_name = binary_name + ".exe"
-
-    return Path(
-        str(
-            importlib.resources.files(
-                "vgf_adapter_model_explorer.bin"
-            ).joinpath(binary_name)
-        )
-    )
+from vgf_adapter_model_explorer.exec.utils import get_binary_path
 
 
 def exec_mlir_translate(spirv_path: Path) -> str:

src/vgf_adapter_model_explorer/exec/utils.py

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: Copyright 2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License v2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for license information.
+
+import importlib.resources
+import sys
+from pathlib import Path
+
+
+def get_binary_path(binary_name: str) -> Path:
+    """Get path to bundled binary, accounting for platform extensions."""
+    if sys.platform.startswith("win"):
+        binary_name = binary_name + ".exe"
+
+    return Path(
+        str(
+            importlib.resources.files(
+                "vgf_adapter_model_explorer.bin"
+            ).joinpath(binary_name)
+        )
+    )

src/vgf_adapter_model_explorer/exec/vgf_dump.py

@@ -4,27 +4,12 @@
 # Licensed under the Apache License v2.0
 # See http://www.apache.org/licenses/LICENSE-2.0 for license information.
 
-import importlib.resources
-import sys
 import tempfile
 from pathlib import Path
 from typing import Optional
 
 from vgf_adapter_model_explorer.exec.exec_cmd import exec_cmd
-
-
-def get_binary_path(binary_name: str) -> Path:
-    """Get path to bundled binary, accounting for platform extensions."""
-    if sys.platform.startswith("win"):
-        binary_name = binary_name + ".exe"
-
-    return Path(
-        str(
-            importlib.resources.files(
-                "vgf_adapter_model_explorer.bin"
-            ).joinpath(binary_name)
-        )
-    )
+from vgf_adapter_model_explorer.exec.utils import get_binary_path
 
 
 def exec_vgf_dump(