Merge pull request #206 from siliconcompiler/bump-sc

update to sc 0.33.0

Author: gadfort

pyproject.toml

@@ -21,7 +21,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 license = {file = "LICENSE"}
 dependencies = [
-    "siliconcompiler>=0.32.0",
+    "siliconcompiler>=0.33.0",
     "lambdapdk>=0.1.41",
     "lambdalib>=0.2.10"
 ]

scgallery/gallery.py

@@ -16,7 +16,7 @@
 from siliconcompiler.utils import default_credentials_file
 from siliconcompiler.tools._common import has_input_files
 from siliconcompiler.tools._common.asic import get_mainlib
-from siliconcompiler.utils.flowgraph import nodes_to_execute
+from siliconcompiler.flowgraph import RuntimeFlowgraph
 
 from scgallery.targets.freepdk45 import (
     nangate45 as freepdk45_nangate45
@@ -712,13 +712,19 @@ def __finalize(self, design, chip, succeeded):
             rules_files = self.__designs[design]['rules']
 
             if rules_files:
+                runtime = RuntimeFlowgraph(
+                    chip.schema.get("flowgraph", chip.get('option', 'flow'), field='schema'),
+                    from_steps=chip.get('option', 'from'),
+                    to_steps=chip.get('option', 'to'),
+                    prune_nodes=chip.get('option', 'prune'))
+
                 chip.logger.info(f"Checking rules in: {', '.join(rules_files)}")
                 chip.use(
                     asicflow_rules,
                     job=chip.get('option', 'jobname'),
                     flow=chip.get('option', 'flow'),
                     mainlib=mainlib,
-                    flow_nodes=nodes_to_execute(chip, flow=chip.get('option', 'flow')),
+                    flow_nodes=runtime.get_nodes(),
                     rules_files=rules_files,
                     skip_rules=self.__skip_rules)
                 error = not chip.check_checklist('asicflow_rules',

scgallery/rules.py

@@ -9,7 +9,7 @@
 from datetime import datetime
 from scgallery.checklists import asicflow_rules
 from siliconcompiler import utils
-from siliconcompiler.utils.flowgraph import nodes_to_execute
+from siliconcompiler.flowgraph import RuntimeFlowgraph
 
 
 class UpdateMethod(Enum):
@@ -242,13 +242,18 @@ def update_rules(chip, method, rules):
             rules = json.load(f)
 
         if args.check:
+            runtime = RuntimeFlowgraph(
+                chip.schema.get("flowgraph", chip.get('option', 'flow'), field='schema'),
+                from_steps=chip.get('option', 'from'),
+                to_steps=chip.get('option', 'to'),
+                prune_nodes=chip.get('option', 'prune'))
             chip.summary(generate_image=False, generate_html=False)
             chip.use(
                 asicflow_rules,
                 job=chip.get('option', 'jobname'),
                 flow=chip.get('option', 'flow'),
                 mainlib=mainlib,
-                flow_nodes=nodes_to_execute(chip, flow=chip.get('option', 'flow')),
+                flow_nodes=runtime.get_nodes(),
                 rules_file=args.rules)
             if not chip.check_checklist('asicflow_rules', verbose=True, require_reports=False):
                 sys.exit(1)