siliconcompiler 0.35.1__py3-none-any.whl → 0.35.3__py3-none-any.whl

siliconcompiler/schema/safeschema.py

@@ -7,7 +7,7 @@
 from typing import Dict, Tuple, Optional, Union, List, Set
 
 from .parameter import Parameter
-from .baseschema import BaseSchema
+from .baseschema import BaseSchema, LazyLoad
 
 
 class SafeSchema(BaseSchema):
@@ -35,7 +35,8 @@ class SafeSchema(BaseSchema):
 
     def _from_dict(self, manifest: Dict,
                    keypath: Union[List[str], Tuple[str, ...]],
-                   version: Optional[Tuple[int, ...]] = None) \
+                   version: Optional[Tuple[int, ...]] = None,
+                   lazyload: LazyLoad = LazyLoad.OFF) \
             -> Tuple[Set[Tuple[str, ...]], Set[Tuple[str, ...]]]:
         if not isinstance(manifest, dict):
             return set(), set()
@@ -43,11 +44,13 @@ class SafeSchema(BaseSchema):
         if "__meta__" in manifest:
             del manifest["__meta__"]
 
+        lazyload = LazyLoad.OFF
+
         for key, data in manifest.items():
             obj = SafeSchema.__is_dict_leaf(data, list(keypath) + [key], version)
             if not obj:
                 obj = SafeSchema()
-                obj._from_dict(data, list(keypath) + [key], version)
+                obj._from_dict(data, list(keypath) + [key], version=version, lazyload=lazyload)
 
             if key == "default":
                 self._BaseSchema__default = obj
@@ -59,11 +62,19 @@ class SafeSchema(BaseSchema):
     @classmethod
     def from_manifest(cls,
                       filepath: Union[None, str] = None,
-                      cfg: Union[None, Dict] = None) -> "SafeSchema":
+                      cfg: Union[None, Dict] = None,
+                      lazyload: bool = False) -> "SafeSchema":
         if filepath:
             cfg = BaseSchema._read_manifest(filepath)
 
-        if cfg and "__meta__" in cfg:
-            del cfg["__meta__"]
+        def rm_meta(manifest):
+            if not isinstance(manifest, dict):
+                return
+            if manifest and "__meta__" in manifest:
+                del manifest["__meta__"]
+            for section in manifest.values():
+                rm_meta(section)
+
+        rm_meta(cfg)
 
-        return super().from_manifest(filepath=None, cfg=cfg)
+        return super().from_manifest(filepath=None, cfg=cfg, lazyload=False)

siliconcompiler/schema_support/dependencyschema.py

@@ -2,11 +2,13 @@ import os.path
 
 from typing import Dict, Union, Tuple, List, Optional, Set
 
-from siliconcompiler.schema.baseschema import BaseSchema
+from siliconcompiler.schema.baseschema import BaseSchema, LazyLoad
 from siliconcompiler.schema.editableschema import EditableSchema
 from siliconcompiler.schema.parameter import Parameter, Scope
 from siliconcompiler.schema.namedschema import NamedSchema
 
+from siliconcompiler.schema_support.pathschema import PathSchemaBase
+
 
 class DependencySchema(BaseSchema):
     '''
@@ -31,7 +33,8 @@ class DependencySchema(BaseSchema):
 
     def _from_dict(self, manifest: Dict,
                    keypath: Union[List[str], Tuple[str, ...]],
-                   version: Optional[Tuple[int, ...]] = None) \
+                   version: Optional[Tuple[int, ...]] = None,
+                   lazyload: LazyLoad = LazyLoad.ON) \
             -> Tuple[Set[Tuple[str, ...]], Set[Tuple[str, ...]]]:
         '''
         Internal helper to load schema from a dictionary manifest.
@@ -48,7 +51,7 @@ class DependencySchema(BaseSchema):
             The result of the parent class's _from_dict method.
         '''
         self.set("deps", False, field="lock")
-        ret = super()._from_dict(manifest, keypath, version)
+        ret = super()._from_dict(manifest, keypath, version=version, lazyload=lazyload)
         self.set("deps", True, field="lock")
         return ret
 
@@ -289,3 +292,20 @@ class DependencySchema(BaseSchema):
     def _reset_deps(self) -> None:
         '''Resets the internal dependency dictionary.'''
         self.__deps = {}
+
+    def check_filepaths(self, ignore_keys: Optional[List[Tuple[str, ...]]] = None) -> bool:
+        '''
+        Verifies that paths to all files in manifest are valid.
+
+        Args:
+            ignore_keys (list of keypaths): list of keypaths to ignore while checking
+
+        Returns:
+            True if all file paths are valid, otherwise False.
+        '''
+        error = False
+        for obj in [self, *self.get_dep()]:
+            if not isinstance(obj, PathSchemaBase):
+                continue
+            error |= not PathSchemaBase.check_filepaths(obj, ignore_keys=ignore_keys)
+        return not error

siliconcompiler/schema_support/filesetschema.py

@@ -1,6 +1,8 @@
 import contextlib
 
-from typing import List, Tuple, Optional, Union, Iterable
+from pathlib import Path
+
+from typing import List, Tuple, Optional, Union, Iterable, Set
 
 from siliconcompiler import utils
 
@@ -43,7 +45,8 @@ class FileSetSchema(PathSchema):
 
     ###############################################
     def add_file(self,
-                 filename: str,
+                 filename: Union[List[Union[Path, str]], Set[Union[Path, str]],
+                                 Tuple[Union[Path, str], ...], Path, str],
                  fileset: Optional[str] = None,
                  filetype: Optional[str] = None,
                  clobber: bool = False,
@@ -62,7 +65,8 @@ class FileSetSchema(PathSchema):
         * etc.
 
         Args:
-            filename (Path or list[Path]): File path or list of paths to add.
+            filename (Path, str, or collection): File path (Path or str), or a collection
+                (list, tuple, set) of file paths to add.
             fileset (str): Logical group to associate the file with.
             filetype (str, optional): Type of the file (e.g., 'verilog', 'sdc').
             clobber (bool, optional): If True, clears the list before adding the
@@ -89,7 +93,9 @@ class FileSetSchema(PathSchema):
             raise ValueError("fileset key must be a string")
 
         # handle list inputs
-        if isinstance(filename, (list, tuple)):
+        if isinstance(filename, (list, set, tuple)):
+            if isinstance(filename, set):
+                filename = sorted(filename)
             params = []
             for item in filename:
                 params.extend(

siliconcompiler/schema_support/option.py

@@ -1,4 +1,4 @@
-from typing import Union, List, Tuple, Callable
+from typing import Union, List, Tuple, Callable, Dict, Optional
 
 from siliconcompiler.schema import BaseSchema, EditableSchema, Parameter, Scope, PerNode
 from siliconcompiler.schema.utils import trim
@@ -189,7 +189,7 @@ class SchedulerSchema(BaseSchema):
                 Maximum number of threads for each task in a job. If not set this will default
                 to the number of cpu cores available."""))
 
-    def get_name(self, step: str = None, index: str = None) -> str:
+    def get_name(self, step: Optional[str] = None, index: Optional[str] = None) -> str:
         """Gets the scheduler platform name.
 
         Args:
@@ -201,7 +201,7 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('name', step=step, index=index)
 
-    def set_name(self, value: str, step: str = None, index: str = None):
+    def set_name(self, value: str, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the scheduler platform name.
 
         Args:
@@ -211,7 +211,7 @@ class SchedulerSchema(BaseSchema):
         """
         self.set('name', value, step=step, index=index)
 
-    def get_cores(self, step: str = None, index: str = None) -> int:
+    def get_cores(self, step: Optional[str] = None, index: Optional[str] = None) -> int:
         """Gets the number of CPU cores required for the job.
 
         Args:
@@ -223,7 +223,7 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('cores', step=step, index=index)
 
-    def set_cores(self, value: int, step: str = None, index: str = None):
+    def set_cores(self, value: int, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the number of CPU cores required for the job.
 
         Args:
@@ -233,7 +233,7 @@ class SchedulerSchema(BaseSchema):
         """
         self.set('cores', value, step=step, index=index)
 
-    def get_memory(self, step: str = None, index: str = None) -> int:
+    def get_memory(self, step: Optional[str] = None, index: Optional[str] = None) -> int:
         """Gets the memory required for the job in megabytes.
 
         Args:
@@ -245,7 +245,7 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('memory', step=step, index=index)
 
-    def set_memory(self, value: int, step: str = None, index: str = None):
+    def set_memory(self, value: int, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the memory required for the job in megabytes.
 
         Args:
@@ -255,7 +255,7 @@ class SchedulerSchema(BaseSchema):
         """
         self.set('memory', value, step=step, index=index)
 
-    def get_queue(self, step: str = None, index: str = None) -> str:
+    def get_queue(self, step: Optional[str] = None, index: Optional[str] = None) -> str:
         """Gets the scheduler queue (or partition) for the job.
 
         Args:
@@ -267,7 +267,7 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('queue', step=step, index=index)
 
-    def set_queue(self, value: str, step: str = None, index: str = None):
+    def set_queue(self, value: str, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the scheduler queue (or partition) for the job.
 
         Args:
@@ -277,7 +277,7 @@ class SchedulerSchema(BaseSchema):
         """
         self.set('queue', value, step=step, index=index)
 
-    def get_defer(self, step: str = None, index: str = None) -> str:
+    def get_defer(self, step: Optional[str] = None, index: Optional[str] = None) -> str:
         """Gets the deferred start time for the job.
 
         Args:
@@ -289,7 +289,7 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('defer', step=step, index=index)
 
-    def set_defer(self, value: str, step: str = None, index: str = None):
+    def set_defer(self, value: str, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the deferred start time for the job.
 
         Args:
@@ -299,7 +299,7 @@ class SchedulerSchema(BaseSchema):
         """
         self.set('defer', value, step=step, index=index)
 
-    def get_options(self, step: str = None, index: str = None) -> List[str]:
+    def get_options(self, step: Optional[str] = None, index: Optional[str] = None) -> List[str]:
         """Gets the advanced pass-through options for the scheduler.
 
         Args:
@@ -311,7 +311,8 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('options', step=step, index=index)
 
-    def add_options(self, value: Union[List[str], str], step: str = None, index: str = None,
+    def add_options(self, value: Union[List[str], str],
+                    step: Optional[str] = None, index: Optional[str] = None,
                     clobber: bool = False):
         """Adds or sets advanced pass-through options for the scheduler.
 
@@ -327,7 +328,7 @@ class SchedulerSchema(BaseSchema):
         else:
             self.add('options', value, step=step, index=index)
 
-    def get_msgevent(self, step: str = None, index: str = None) -> List[str]:
+    def get_msgevent(self, step: Optional[str] = None, index: Optional[str] = None) -> List[str]:
         """Gets the event triggers for sending messages.
 
         Args:
@@ -339,7 +340,8 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('msgevent', step=step, index=index)
 
-    def add_msgevent(self, value: Union[List[str], str], step: str = None, index: str = None,
+    def add_msgevent(self, value: Union[List[str], str],
+                     step: Optional[str] = None, index: Optional[str] = None,
                      clobber: bool = False):
         """Adds or sets the event triggers for sending messages.
 
@@ -355,7 +357,7 @@ class SchedulerSchema(BaseSchema):
         else:
             self.add('msgevent', value, step=step, index=index)
 
-    def get_msgcontact(self, step: str = None, index: str = None) -> List[str]:
+    def get_msgcontact(self, step: Optional[str] = None, index: Optional[str] = None) -> List[str]:
         """Gets the contact list for scheduler event messages.
 
         Args:
@@ -367,7 +369,8 @@ class SchedulerSchema(BaseSchema):
         """
         return self.get('msgcontact', step=step, index=index)
 
-    def add_msgcontact(self, value: Union[List[str], str], step: str = None, index: str = None,
+    def add_msgcontact(self, value: Union[List[str], str],
+                       step: Optional[str] = None, index: Optional[str] = None,
                        clobber: bool = False):
         """Adds or sets the contact list for scheduler event messages.
 
@@ -428,7 +431,7 @@ class OptionSchema(BaseSchema):
         """Initializes the options schema and defines all its parameters."""
         super().__init__()
 
-        self.__callbacks = {}
+        self.__callbacks: Dict[str, Callable] = {}
 
         # Initialize schema
         schema = EditableSchema(self)
@@ -890,7 +893,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('cachedir', value)
 
-    def get_nice(self, step: str = None, index: str = None) -> int:
+    def get_nice(self, step: Optional[str] = None, index: Optional[str] = None) -> int:
         """Gets the tool scheduling priority (nice level).
 
         Args:
@@ -902,7 +905,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('nice', step=step, index=index)
 
-    def set_nice(self, value: int, step: str = None, index: str = None):
+    def set_nice(self, value: int, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the tool scheduling priority (nice level).
 
         Args:
@@ -928,7 +931,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('flow', value)
 
-    def get_optmode(self, step: str = None, index: str = None) -> int:
+    def get_optmode(self, step: Optional[str] = None, index: Optional[str] = None) -> int:
         """Gets the optimization mode.
 
         Args:
@@ -940,7 +943,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('optmode', step=step, index=index)
 
-    def set_optmode(self, value: int, step: str = None, index: str = None):
+    def set_optmode(self, value: int, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the optimization mode.
 
         Args:
@@ -1047,7 +1050,7 @@ class OptionSchema(BaseSchema):
         else:
             self.add('prune', value)
 
-    def get_breakpoint(self, step: str = None, index: str = None) -> bool:
+    def get_breakpoint(self, step: Optional[str] = None, index: Optional[str] = None) -> bool:
         """Checks if a breakpoint is set on a specific step.
 
         Args:
@@ -1059,7 +1062,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('breakpoint', step=step, index=index)
 
-    def set_breakpoint(self, value: bool, step: str = None, index: str = None):
+    def set_breakpoint(self, value: bool, step: Optional[str] = None, index: Optional[str] = None):
         """Sets a breakpoint on a specific step.
 
         Args:
@@ -1117,7 +1120,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('nodisplay', value)
 
-    def get_quiet(self, step: str = None, index: str = None) -> bool:
+    def get_quiet(self, step: Optional[str] = None, index: Optional[str] = None) -> bool:
         """Gets the quiet execution flag for a step.
 
         Args:
@@ -1129,7 +1132,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('quiet', step=step, index=index)
 
-    def set_quiet(self, value: bool, step: str = None, index: str = None):
+    def set_quiet(self, value: bool, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the quiet execution flag for a step.
 
         Args:
@@ -1155,7 +1158,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('jobincr', value)
 
-    def get_novercheck(self, step: str = None, index: str = None) -> bool:
+    def get_novercheck(self, step: Optional[str] = None, index: Optional[str] = None) -> bool:
         """Gets the version checking disable flag for a step.
 
         Args:
@@ -1167,7 +1170,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('novercheck', step=step, index=index)
 
-    def set_novercheck(self, value: bool, step: str = None, index: str = None):
+    def set_novercheck(self, value: bool, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the version checking disable flag for a step.
 
         Args:
@@ -1177,7 +1180,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('novercheck', value, step=step, index=index)
 
-    def get_track(self, step: str = None, index: str = None) -> bool:
+    def get_track(self, step: Optional[str] = None, index: Optional[str] = None) -> bool:
         """Gets the provenance tracking flag for a step.
 
         Args:
@@ -1189,7 +1192,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('track', step=step, index=index)
 
-    def set_track(self, value: bool, step: str = None, index: str = None):
+    def set_track(self, value: bool, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the provenance tracking flag for a step.
 
         Args:
@@ -1199,7 +1202,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('track', value, step=step, index=index)
 
-    def get_continue(self, step: str = None, index: str = None) -> bool:
+    def get_continue(self, step: Optional[str] = None, index: Optional[str] = None) -> bool:
         """Gets the continue-on-error flag for a step.
 
         Args:
@@ -1211,7 +1214,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('continue', step=step, index=index)
 
-    def set_continue(self, value: bool, step: str = None, index: str = None):
+    def set_continue(self, value: bool, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the continue-on-error flag for a step.
 
         Args:
@@ -1221,7 +1224,7 @@ class OptionSchema(BaseSchema):
         """
         self.set('continue', value, step=step, index=index)
 
-    def get_timeout(self, step: str = None, index: str = None) -> float:
+    def get_timeout(self, step: Optional[str] = None, index: Optional[str] = None) -> float:
         """Gets the timeout value for a step in seconds.
 
         Args:
@@ -1233,7 +1236,7 @@ class OptionSchema(BaseSchema):
         """
         return self.get('timeout', step=step, index=index)
 
-    def set_timeout(self, value: float, step: str = None, index: str = None):
+    def set_timeout(self, value: float, step: Optional[str] = None, index: Optional[str] = None):
         """Sets the timeout value for a step in seconds.
 
         Args:

siliconcompiler/schema_support/pathschema.py

@@ -392,7 +392,8 @@ class PathSchema(PathSchemaBase):
         resolver = Resolver.find_resolver(path)
         return resolver(name, schema._parent(root=True), path, tag).get_path()
 
-    def _find_files_dataroot_resolvers(self) -> Dict[str, Union[str, Callable]]:
+    def _find_files_dataroot_resolvers(self, resolvers: bool = False) \
+            -> Dict[str, Union[str, Callable]]:
         """
         Returns a dictionary of path resolvers data directory handling for find_files
 
@@ -410,7 +411,11 @@ class PathSchema(PathSchemaBase):
             path = BaseSchema.get(schema, "dataroot", dataroot, "path")
             tag = BaseSchema.get(schema, "dataroot", dataroot, "tag")
             resolver = Resolver.find_resolver(path)
-            resolver_map[dataroot] = resolver(dataroot, schema_root, path, tag).get_path
+            resolver_obj = resolver(dataroot, schema_root, path, tag)
+            if resolvers:
+                resolver_map[dataroot] = resolver_obj
+            else:
+                resolver_map[dataroot] = resolver_obj.get_path
         return resolver_map
 
     @contextlib.contextmanager

siliconcompiler/schema_support/record.py

@@ -12,7 +12,7 @@ from typing import Dict, Union, List, Optional, Set, Tuple
 from datetime import datetime, timezone
 from enum import Enum
 
-from siliconcompiler.schema import BaseSchema
+from siliconcompiler.schema import BaseSchema, LazyLoad
 from siliconcompiler.schema import EditableSchema, Parameter, PerNode, Scope
 from siliconcompiler.schema.utils import trim
 
@@ -53,7 +53,8 @@ class RecordSchema(BaseSchema):
 
     def _from_dict(self, manifest: Dict,
                    keypath: Union[List[str], Tuple[str, ...]],
-                   version: Optional[Tuple[int, ...]] = None) \
+                   version: Optional[Tuple[int, ...]] = None,
+                   lazyload: LazyLoad = LazyLoad.ON) \
             -> Tuple[Set[Tuple[str, ...]], Set[Tuple[str, ...]]]:
         """
         Constructs a schema from a dictionary.
@@ -66,10 +67,10 @@ class RecordSchema(BaseSchema):
         Returns:
             dict: The constructed dictionary.
         """
-        ret = super()._from_dict(manifest, keypath, version)
+        ret = super()._from_dict(manifest, keypath, version=version, lazyload=lazyload)
 
         # Correct for change specification
-        if version and version < (0, 50, 4):
+        if not lazyload.is_enforced and version and version < (0, 50, 4):
             for timekey in RecordTime:
                 start_param = self.get(timekey.value, field=None)
                 for value, step, index in start_param.getvalues():

siliconcompiler/targets/asap7_demo.py

@@ -3,7 +3,9 @@ from siliconcompiler import ASIC
 from siliconcompiler.flows import asicflow, synflow
 
 from lambdapdk.asap7.libs.asap7sc7p5t import ASAP7SC7p5RVT, ASAP7SC7p5SLVT, ASAP7SC7p5LVT
-from lambdapdk.asap7.libs.fakeram7 import FakeRAM7Lambdalib_SinglePort, FakeRAM7Lambdalib_DoublePort
+from lambdapdk.asap7.libs.fakeram7 import FakeRAM7Lambdalib_SinglePort, \
+    FakeRAM7Lambdalib_DoublePort, \
+    FakeRAM7Lambdalib_TrueDoublePort
 from lambdapdk.asap7.libs.fakeio7 import FakeIO7Lambdalib_IO
 
 
@@ -101,4 +103,5 @@ def asap7_demo(
     # for demonstration and academic purposes.
     FakeRAM7Lambdalib_SinglePort.alias(project)
     FakeRAM7Lambdalib_DoublePort.alias(project)
+    FakeRAM7Lambdalib_TrueDoublePort.alias(project)
     FakeIO7Lambdalib_IO.alias(project)