siliconcompiler 0.33.2__py3-none-any.whl → 0.34.1__py3-none-any.whl

siliconcompiler/report/report.py

@@ -61,7 +61,7 @@ def get_flowgraph_nodes(chip, step, index):
             value = chip.get('record', key, step=step, index=index)
         if value is not None:
             if key == 'inputnode':
-                value = ", ".join([f'{step}{index}' for step, index in value])
+                value = ", ".join([f'{step}/{index}' for step, index in value])
             if key == 'pythonpackage':
                 value = ", ".join(value)
             nodes[key] = str(value)
@@ -181,7 +181,7 @@ def make_manifest(chip):
         >>> make_manifest(chip)
         Returns tree/json of manifest.
     '''
-    manifest = chip.schema.getdict()
+    manifest = chip.getdict()
     modified_manifest = {}
     make_manifest_helper(manifest, modified_manifest)
     return modified_manifest
@@ -200,7 +200,7 @@ def get_flowgraph_path(chip):
     '''
     flow = chip.get('option', 'flow')
     runtime = RuntimeFlowgraph(
-        chip.schema.get("flowgraph", flow, field='schema'),
+        chip.get("flowgraph", flow, field='schema'),
         from_steps=chip.get('option', 'from'),
         to_steps=chip.get('option', 'to'),
         prune_nodes=chip.get('option', 'prune'))
@@ -363,7 +363,7 @@ def get_chart_selection_options(chips):
         chip = chip_and_chip_name['chip_object']
         nodes_list, _, _, _, chip_metrics, _ = \
             utils._collect_data(chip, format_as_string=False)
-        nodes.update(set([f'{step}{index}' for step, index in nodes_list]))
+        nodes.update(set([f'{step}/{index}' for step, index in nodes_list]))
         metrics.update(set(chip_metrics))
     return nodes, metrics
 

siliconcompiler/report/summary_table.py

@@ -44,7 +44,7 @@ def _show_summary_table(chip, flow, flowgraph_nodes, show_all_indices):
 
     # trim labels to column width
     column_labels = []
-    labels = [f'{step}{index}' for step, index in nodes_to_show]
+    labels = [f'{step}/{index}' for step, index in nodes_to_show]
     if labels:
         column_width = min([column_width, max([len(label) for label in labels])])
 
@@ -85,7 +85,7 @@ def _show_summary_table(chip, flow, flowgraph_nodes, show_all_indices):
             info_list.append(f"partname : {fpga_partname}")
 
     libraries = set()
-    for val, step, index in chip.schema.get('asic', 'logiclib', field=None).getvalues():
+    for val, step, index in chip.get('asic', 'logiclib', field=None).getvalues():
         if not step or (step, index) in flowgraph_nodes:
             libraries.update(val)
     if libraries:

siliconcompiler/report/utils.py

@@ -6,7 +6,7 @@ from siliconcompiler.flowgraph import RuntimeFlowgraph
 
 
 def _find_summary_image(chip, ext='png'):
-    for nodes in reversed(chip.schema.get(
+    for nodes in reversed(chip.get(
             "flowgraph", chip.get('option', 'flow'), field="schema").get_execution_order()):
         for step, index in nodes:
             layout_img = chip.find_result(ext, step=step, index=index)
@@ -17,7 +17,7 @@ def _find_summary_image(chip, ext='png'):
 
 def _find_summary_metrics(chip, metrics_map):
     metrics = {}
-    for nodes in reversed(chip.schema.get(
+    for nodes in reversed(chip.get(
             "flowgraph", chip.get('option', 'flow'), field="schema").get_execution_order()):
         for step, index in nodes:
             for name, metric_info in metrics_map.items():
@@ -45,7 +45,7 @@ def _collect_data(chip, flow=None, flowgraph_nodes=None, format_as_string=True):
 
     if not flowgraph_nodes:
         runtime = RuntimeFlowgraph(
-            chip.schema.get("flowgraph", flow, field='schema'),
+            chip.get("flowgraph", flow, field='schema'),
             from_steps=chip.get('option', 'from'),
             to_steps=chip.get('option', 'to'),
             prune_nodes=chip.get('option', 'prune'))
@@ -70,7 +70,7 @@ def _collect_data(chip, flow=None, flowgraph_nodes=None, format_as_string=True):
     reports = {}
 
     # Build ordered list of nodes in flowgraph
-    for level_nodes in chip.schema.get("flowgraph", flow, field="schema").get_execution_order():
+    for level_nodes in chip.get("flowgraph", flow, field="schema").get_execution_order():
         nodes.extend(sorted(level_nodes))
     nodes = [node for node in nodes if node in flowgraph_nodes]
     for (step, index) in nodes:
@@ -147,7 +147,7 @@ def _get_flowgraph_path(chip, flow, nodes_to_execute, only_include_successful=Fa
     to_search = []
     # Start search with any successful leaf nodes.
     flowgraph_steps = list(map(lambda node: node[0], nodes_to_execute))
-    runtime = RuntimeFlowgraph(chip.schema.get("flowgraph", flow, field='schema'),
+    runtime = RuntimeFlowgraph(chip.get("flowgraph", flow, field='schema'),
                                from_steps=flowgraph_steps,
                                to_steps=flowgraph_steps)
     end_nodes = runtime.get_exit_nodes()