librelane 2.4.0.dev3__py3-none-any.whl → 2.4.0.dev5__py3-none-any.whl

librelane/common/cli.py

@@ -67,7 +67,7 @@ class IntEnumChoice(Choice):
                 f"{value} is not a not a valid value for IntEnum {self.__enum.__name__}"
             )
 
-    def get_metavar(self, param: "Parameter") -> str:
+    def get_metavar(self, param: Parameter) -> str:
         _bk = self.choices
         self.choices = [f"{e.name} or {e.value}" for e in self.__enum]
         result = super().get_metavar(param)

librelane/common/metrics/__main__.py

@@ -286,7 +286,7 @@ cli.add_command(compare_multiple)
 @cloup.option(
     "-m",
     "--metric-repo",
-    default="efabless/librelane-metrics",
+    default="librelane/librelane-metrics",
     help="The repository storing metrics for --repo",
 )
 @cloup.option(

librelane/state/design_format.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from enum import Enum
-from dataclasses import dataclass
 from typing import Dict, Optional
+from dataclasses import dataclass, replace
 
 
 @dataclass
@@ -44,10 +44,16 @@ class DesignFormatObject:
     folder_override: Optional[str] = None
     multiple: bool = False
 
+    _instance_optional: bool = False
+
     @property
     def folder(self) -> str:
         return self.folder_override or self.id
 
+    @property
+    def optional(self) -> bool:
+        return self._instance_optional
+
 
 class DesignFormat(Enum):
     """
@@ -174,6 +180,15 @@ class DesignFormat(Enum):
     def by_id(id: str) -> Optional["DesignFormat"]:
         return _designformat_by_id.get(id)
 
+    def mkOptional(self) -> "DesignFormat":
+        # HACK: Create ephemeral DesignFormat copy until 3.0.0 lets us do this
+        # a bit more appropriately.
+        clone = object.__new__(DesignFormat)
+        clone._name_ = self._name_
+        clone._value_ = replace(self._value_)
+        clone._value_._instance_optional = True
+        return clone
+
 
 _designformat_by_id: Dict[str, "DesignFormat"] = {
     format.value.id: format for format in DesignFormat

librelane/steps/openroad.py

@@ -778,7 +778,10 @@ class STAPostPNR(STAPrePNR):
         ),
     ]
 
-    inputs = STAPrePNR.inputs + [DesignFormat.SPEF, DesignFormat.ODB]
+    inputs = STAPrePNR.inputs + [
+        DesignFormat.SPEF,
+        DesignFormat.ODB.mkOptional(),
+    ]
     outputs = STAPrePNR.outputs + [DesignFormat.LIB]
 
     def prepare_env(self, env: dict, state: State) -> dict:
@@ -851,19 +854,21 @@ class STAPostPNR(STAPrePNR):
     ) -> MetricsUpdate:
         current_env["_LIB_SAVE_DIR"] = corner_dir
         metrics_updates = super().run_corner(state_in, current_env, corner, corner_dir)
-        try:
-            filter_unannotated_metrics = self.filter_unannotated_report(
-                corner=corner,
-                checks_report=os.path.join(corner_dir, "checks.rpt"),
-                corner_dir=corner_dir,
-                env=current_env,
-                odb_design=str(state_in[DesignFormat.ODB]),
-            )
-        except subprocess.CalledProcessError as e:
-            self.err(
-                f"Failed filtering unannotated nets for the {corner} timing corner."
-            )
-            raise e
+        filter_unannotated_metrics = {}
+        if odb := state_in[DesignFormat.ODB]:
+            try:
+                filter_unannotated_metrics = self.filter_unannotated_report(
+                    corner=corner,
+                    checks_report=os.path.join(corner_dir, "checks.rpt"),
+                    corner_dir=corner_dir,
+                    env=current_env,
+                    odb_design=str(odb),
+                )
+            except subprocess.CalledProcessError as e:
+                self.err(
+                    f"Failed filtering unannotated nets for the {corner} timing corner."
+                )
+                raise e
         return {**metrics_updates, **filter_unannotated_metrics}
 
     def run(self, state_in: State, **kwargs) -> Tuple[ViewsUpdate, MetricsUpdate]:

librelane/steps/pyosys.py

@@ -14,8 +14,10 @@
 import os
 import re
 import io
+import sys
 import json
 import fnmatch
+import shutil
 import subprocess
 from decimal import Decimal
 from abc import abstractmethod
@@ -207,7 +209,11 @@ class PyosysStep(Step):
 
     def get_command(self, state_in: State) -> List[str]:
         script_path = self.get_script_path()
-        cmd = ["yosys", "-y", script_path]
+        # HACK: Get Colab working
+        yosys_bin = "yosys"
+        if "google.colab" in sys.modules:
+            yosys_bin = shutil.which("yosys") or "yosys"
+        cmd = [yosys_bin, "-y", script_path]
         if self.config["YOSYS_LOG_LEVEL"] != "ALL":
             cmd += ["-Q"]
         if self.config["YOSYS_LOG_LEVEL"] == "WARNING":
@@ -220,6 +226,11 @@ class PyosysStep(Step):
 
     def run(self, state_in: State, **kwargs) -> Tuple[ViewsUpdate, MetricsUpdate]:
         cmd = self.get_command(state_in)
+        # HACK: Get Colab working
+        if "google.colab" in sys.modules:
+            kwargs, env = self.extract_env(kwargs)
+            env.pop("PATH", "")
+            kwargs["env"] = env
         subprocess_result = super().run_subprocess(cmd, **kwargs)
         return {}, subprocess_result["generated_metrics"]
 

librelane/steps/step.py

@@ -53,7 +53,13 @@ from ..config import (
     Variable,
     universal_flow_config_variables,
 )
-from ..state import DesignFormat, DesignFormatObject, State, InvalidState, StateElement
+from ..state import (
+    DesignFormat,
+    DesignFormatObject,
+    State,
+    InvalidState,
+    StateElement,
+)
 from ..common import (
     GenericDict,
     GenericImmutableDict,
@@ -661,7 +667,10 @@ class Step(ABC):
             for input, output in zip_longest(Self.inputs, Self.outputs):
                 input_str = ""
                 if input is not None:
-                    input_str = f"{input.value.name} (.{input.value.extension})"
+                    optional = "?" if input.value.optional else ""
+                    input_str = (
+                        f"{input.value.name}{optional} (.{input.value.extension})"
+                    )
 
                 output_str = ""
                 if output is not None:
@@ -1141,7 +1150,7 @@ class Step(ABC):
 
         for input in self.inputs:
             value = state_in_result[input]
-            if value is None:
+            if value is None and not input.value.optional:
                 raise StepException(
                     f"{type(self).__name__}: missing required input '{input.name}'"
                 ) from None

{librelane-2.4.0.dev3.dist-info → librelane-2.4.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: librelane
-Version: 2.4.0.dev3
+Version: 2.4.0.dev5
 Summary: An infrastructure for implementing chip design flows
 Home-page: https://github.com/librelane/librelane
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: ciel (>=0.16.0)
-Requires-Dist: click (>=8,<9)
+Requires-Dist: click (>=8,<8.2)
 Requires-Dist: cloup (>=3.0.5,<4)
 Requires-Dist: deprecated (>=1.2.10,<2)
 Requires-Dist: httpx (>=0.22.0,<0.29)

{librelane-2.4.0.dev3.dist-info → librelane-2.4.0.dev5.dist-info}/RECORD

@@ -2,11 +2,11 @@ librelane/__init__.py,sha256=EMpoZrRmS_wsweKjhyAg52OXCK7HWQ8o8CVrYaX4ub0,1220
 librelane/__main__.py,sha256=48sW8mh1MNbG0Mf75f5LekXzerbaEASLInQSrvQqPw4,14802
 librelane/__version__.py,sha256=dbE4stCACDmIoxgKksesAkTa-_hi5dW6nPLWw9Pfq3Q,1486
 librelane/common/__init__.py,sha256=LrzxjZKJu3-i8oEYdXtV1IxkXicHtoSUNRcOGrGVGsw,1516
-librelane/common/cli.py,sha256=Ob7mDR77qX1DZ7MXBQ4EPGS3dAO0o7b4njIloOxoB-Q,2351
+librelane/common/cli.py,sha256=xi48GBGHRsYrLGwx40ARwpykHx7GnuHbJjHxjOwtZ5Y,2349
 librelane/common/drc.py,sha256=2N5jPbM0cxnOj2Kci2AhHTTgHcynTtkV118ii3kq7IU,9603
 librelane/common/generic_dict.py,sha256=xJjHIRvhp4vDk98kvaj8VPa3nUubMedaSfB5OL08sOE,10008
 librelane/common/metrics/__init__.py,sha256=nzdmeia1fN4CDPT604v-OHaBVydz-M4hz232g-jxJ6M,1521
-librelane/common/metrics/__main__.py,sha256=jU7UXuGugZ_ojR4ml8Q6KHARiMF8QFBnqlMgtJRgJRI,12472
+librelane/common/metrics/__main__.py,sha256=VfoOHFkGXtei6GLkPUD42X6io8QKFCHhxLMWOXPz_5E,12473
 librelane/common/metrics/library.py,sha256=CG7rubLdjuCQL9-9bzAC-64hf-KlH-iu_Fg0oKuesqs,7373
 librelane/common/metrics/metric.py,sha256=h3Xd26z5M80IJgVmmrBTjKcdGLb4I0wyjM-H4jdyi_0,6990
 librelane/common/metrics/util.py,sha256=Bl_9znlot7-Os2VigYLSmMf56aAkGdv3evWz9vfK7K4,9344
@@ -144,7 +144,7 @@ librelane/scripts/pyosys/ys_common.py,sha256=mOni8WmKMNuLWsLRNcE15rcqCxGR1kf-9ck
 librelane/scripts/tclsh/hello.tcl,sha256=kkR3akY7QnGHYXsQODYwLkMkUEOgWcNFtzaMTTEV2bY,34
 librelane/state/__init__.py,sha256=rLUdAkeB278r8pB2Jpv-ccmmmP32FR90wANIFHXdA0w,969
 librelane/state/__main__.py,sha256=Ici4Ejg1ICUZNSYZRguC3BfEk_wFxsmE0ag0Vv8iY1I,1679
-librelane/state/design_format.py,sha256=9mWBbHrhzludtv3dKB6P4UQncBVTMMtoj69kNgRvh5o,5306
+librelane/state/design_format.py,sha256=ISl4O18ky1BiMkQn8Si0Tcf8UA5vrlZ1yay0iKPxvfk,5794
 librelane/state/state.py,sha256=J05gAeSVDiF76ITuw4WJZ7WkMyG4oTjt_7kpsI3E3PE,11957
 librelane/steps/__init__.py,sha256=j3JYrdnWM74dYuEvE931oSrQI7FUz-hKWr8Mts8C0wg,1668
 librelane/steps/__main__.py,sha256=GviXtDLISKJCufKxK3oFPOSMF1GyShZbG5RXpVCYFkk,13376
@@ -156,14 +156,14 @@ librelane/steps/magic.py,sha256=4o_WarBAQdTTuekP72uovjvqW5wsaDCpMB3LtAhC_IY,2005
 librelane/steps/misc.py,sha256=Xk_a6JJPljkk8pemu-NtlzDRs-8S7vuRKZKj4pnCRlE,5690
 librelane/steps/netgen.py,sha256=R9sDWv-9wKMdi2rkuLQdOc4uLlbYhXcKKd6WsZsnLt0,8953
 librelane/steps/odb.py,sha256=_WhAFEVbFioSGsVrGbXQVqcXYAnE22gLA4eF1v028EQ,38030
-librelane/steps/openroad.py,sha256=0uHbFYO3wT9rFkovxMgr4rMzaMpA9DvG8sWLM4L3jn8,85836
+librelane/steps/openroad.py,sha256=6YaGHgpvPmAqpC_zpPBBEEc-DRpkS4HwG79zd1P1iKs,85987
 librelane/steps/openroad_alerts.py,sha256=IJyB4piBDCKXhkJswHGMYCRDwbdQsR0GZlrGGDhmW6Q,3364
-librelane/steps/pyosys.py,sha256=bBKCIiKxbAQXrEgR1gdg2el-IpuZoUzLOwR62-ilwQg,22326
-librelane/steps/step.py,sha256=YkUWbxx2dOz0QR90jM5NC7neFkWO1RW5zJc0I_XxRyc,54975
+librelane/steps/pyosys.py,sha256=mnbPR267XzJvDhtXW4cdTAB3IqvksUZt4ch5xQHgdY0,22705
+librelane/steps/step.py,sha256=OkFNyW86ZY9VlNQHUeJIOLHtOuO1bioXsnwky7_l1pc,55154
 librelane/steps/tclstep.py,sha256=0PMWJ6C3dKnlQf9mA9rZntgxUBCiByE9csHcEcM1iq0,10027
 librelane/steps/verilator.py,sha256=MWx2TpLqYyea9_jSeLG9c2S5ujvYERQZRFNaMhfHxZE,7916
 librelane/steps/yosys.py,sha256=GX6rTiQG-ZhDxfB9SxrPQ9Sab3WC84p0OUtqiL1Nubk,12533
-librelane-2.4.0.dev3.dist-info/METADATA,sha256=ycb_5xJHsFD3ETcy_FObKWoWc64Ck0BpJ4cGB2Ts3DE,6600
-librelane-2.4.0.dev3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-librelane-2.4.0.dev3.dist-info/entry_points.txt,sha256=GTBvXykNMMFsNKiJFgtEw7P1wb_VZIqVM35EFSpyZQE,263
-librelane-2.4.0.dev3.dist-info/RECORD,,
+librelane-2.4.0.dev5.dist-info/METADATA,sha256=GkRScJalX2iq16FMMUHkxkmr-2Mf_rA0HXjKx9xqNdQ,6602
+librelane-2.4.0.dev5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+librelane-2.4.0.dev5.dist-info/entry_points.txt,sha256=GTBvXykNMMFsNKiJFgtEw7P1wb_VZIqVM35EFSpyZQE,263
+librelane-2.4.0.dev5.dist-info/RECORD,,