Bug Fixes

Author: quic-boyuc

backends/qualcomm/debugger/observatory/cli.py

@@ -72,8 +72,8 @@ def main():
         AccuracyLens.register_dataset_patches(install_qnn_dataset_patches)
         Observatory.register_lens(AccuracyLens)
 
-        from .lenses.per_layer_accuracy import PerLayerAccuracyLens
-        cls.register_lens(PerLayerAccuracyLens)
+        from executorch.devtools.observatory.lenses.per_layer_accuracy import PerLayerAccuracyLens
+        Observatory.register_lens(PerLayerAccuracyLens)
 
 
 

backends/xnnpack/debugger/observatory/cli.py

@@ -23,7 +23,7 @@
 
 
 def main():
-    from executorch.devtools.observatory.cli import (
+    from devtools.observatory.cli import (
         parse_observatory_args,
         run_observatory,
         run_visualize,
@@ -52,8 +52,8 @@ def main():
     )
     obs_flags, script_path, script_argv = parse_observatory_args(usage_str=usage)
 
-    from executorch.devtools.observatory.observatory import Observatory
-    from executorch.devtools.observatory.lenses.pipeline_graph_collector import (
+    from devtools.observatory.observatory import Observatory
+    from devtools.observatory.lenses.pipeline_graph_collector import (
         PipelineGraphCollectorLens,
     )
 
@@ -65,12 +65,12 @@ def main():
     Observatory.register_lens(PipelineGraphCollectorLens)
 
     if obs_flags["--accuracy"]:
-        from executorch.devtools.observatory.lenses.accuracy import AccuracyLens
+        from devtools.observatory.lenses.accuracy import AccuracyLens
 
         Observatory.register_lens(AccuracyLens)
 
-        from .lenses.per_layer_accuracy import PerLayerAccuracyLens
-        cls.register_lens(PerLayerAccuracyLens)
+        from devtools.observatory.lenses.per_layer_accuracy import PerLayerAccuracyLens
+        Observatory.register_lens(PerLayerAccuracyLens)
 
 
 

devtools/fx_viewer/templates/view_controller.js

@@ -150,8 +150,8 @@ class ViewerController {
     }
 
     zoomToFit() {
-        const padding = 50;
         const rect = this.viewer.canvasContainer.getBoundingClientRect();
+        const padding = Math.min(50, rect.width/5, rect.height/5);
         const availableW = rect.width - padding * 2;
         const availableH = rect.height - padding * 2;
 

devtools/observatory/README.md

@@ -241,12 +241,6 @@ return AnalysisResult(per_record_data={"step_1": record_analysis})
 | [REFERENCE.md](REFERENCE.md) | Contract tables, API reference, JS callbacks, performance notes |
 | [lenses/DEBUG_HANDLE_SYNC_ANALYSIS.md](lenses/DEBUG_HANDLE_SYNC_ANALYSIS.md) | Technical analysis of debug_handle consistency across pipeline stages |
 
-## Demos
-
-1. `examples/demo_graphview_accuracy_compare.py` — custom accuracy lens with per-layer graph overlays
-2. `examples/demo_etrecord_auto_collect.py` — ETRecord auto-collection workflow
-3. `examples/generate_ui_test_harness.py` — UI testing utilities
-
 ## Tests
 
 ```bash

devtools/observatory/cli.py

@@ -179,22 +179,10 @@ def parse_observatory_args(usage_str: str | None = None):
     return obs_flags, script_path, script_argv
 
 
-def infer_report_dir(script_argv: list[str]) -> str:
-    keys = ("-a", "--artifact", "-o", "--output_dir")
-    for idx, arg in enumerate(script_argv):
-        if arg in keys and idx + 1 < len(script_argv):
-            return script_argv[idx + 1]
-        if arg.startswith("--artifact="):
-            return arg.split("=", 1)[1]
-        if arg.startswith("--output_dir="):
-            return arg.split("=", 1)[1]
-    return "."
-
-
 def resolve_report_paths(
     obs_flags: dict[str, object], script_argv: list[str]
 ) -> tuple[str, str]:
-    report_dir = obs_flags["--report-dir"] or infer_report_dir(script_argv)
+    report_dir = obs_flags["--report-dir"]
     report_html = obs_flags["--report-html"]
     report_json = obs_flags["--report-json"]
 

devtools/observatory/observatory.py

@@ -57,12 +57,15 @@ class Observatory:
     _config_stack: List[Dict[str, Any]] = []
 
     @classmethod
-    def register_lens(cls, lens_cls: Type[Lens]) -> None:
+    def register_lens(cls, lens_cls: Type[Lens], append=True) -> None:
         """Register lens class and run one-time setup."""
 
         if lens_cls in cls._lens_registry:
             return
-        cls._lens_registry.append(lens_cls)
+        if append:
+            cls._lens_registry.append(lens_cls)
+        else:
+            cls._lens_registry.insert(0, lens_cls)
         try:
             lens_cls.setup()
         except Exception as exc:
@@ -80,10 +83,11 @@ def _ensure_default_lenses(cls) -> None:
         from .lenses.metadata import MetadataLens
         from .lenses.stack_trace import StackTraceLens
 
-        cls.register_lens(GraphLens)
-        cls.register_lens(MetadataLens)
-        cls.register_lens(StackTraceLens)
-        cls.register_lens(GraphColorLens)
+        # defaut lenses should stay in front in case other lenses depends on their data
+        cls.register_lens(GraphColorLens, append=False)
+        cls.register_lens(StackTraceLens, append=False)
+        cls.register_lens(GraphLens, append=False)
+        cls.register_lens(MetadataLens, append=False)
         cls._lenses_initialized = True
 
     @classmethod