najaeda 0.1.21__cp310-cp310-macosx_11_0_arm64.whl → 0.1.22__cp310-cp310-macosx_11_0_arm64.whl

najaeda/docs/source/conf.py

@@ -15,7 +15,7 @@ sys.path.insert(0, os.path.abspath('../../../'))
 project = 'najaeda'
 copyright = '2024, Naja authors'
 author = 'Naja authors'
-release = '0.1.9'
+release = '0.1.22'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
@@ -27,7 +27,7 @@ extensions = [
     'sphinx.ext.todo',          # (Optional) For TODOs in the documentation
 ]
 
-autodoc_mock_imports = ["najaeda.snl"]
+autodoc_mock_imports = ["najaeda.naja"]
 templates_path = ['_templates']
 exclude_patterns = []
 

najaeda/netlist.py

@@ -11,6 +11,7 @@ import struct
 import sys
 import os
 from enum import Enum
+from typing import Union, List
 
 from najaeda import naja
 
@@ -455,9 +456,9 @@ class Term:
             term_str = (
                 f"{path}/{get_snl_term_for_ids(self.pathIDs, self.termIDs).getName()}"
             )
-        if self.is_bus:
+        if self.is_bus():
             term_str += f"[{self.get_msb()}:{self.get_lsb()}]"
-        elif self.is_bus_bit:
+        elif self.is_bus_bit():
             term_str += f"[{self.get_lsb()}]"
         return term_str
 
@@ -978,7 +979,7 @@ class Instance:
             yield Instance(path_child)
             # path.pop()
 
-    def get_number_of_child_instances(self) -> int:
+    def count_child_instances(self) -> int:
         """
         :return: the number of child instances of this instance.
         :rtype: int
@@ -1467,7 +1468,14 @@ class VerilogConfig:
         self.keep_assigns = keep_assigns
 
 
-def load_verilog(files: list, config: VerilogConfig = None) -> Instance:
+def load_verilog(files: Union[str, List[str]], config: VerilogConfig = None) -> Instance:
+    """Load verilog files into the top design.
+    :param files: a list of verilog files to load or a single file.
+    :param config: the configuration to use when loading the files.
+    :return: the top Instance.
+    """
+    if isinstance(files, str):
+        files = [files]
     if not files or len(files) == 0:
         raise Exception("No verilog files provided")
     if config is None:
@@ -1480,7 +1488,14 @@ def load_verilog(files: list, config: VerilogConfig = None) -> Instance:
     return get_top()
 
 
-def load_liberty(files: list):
+def load_liberty(files: Union[str, List[str]]):
+    """Load liberty files.
+    :param files: a list of liberty files to load or a single file.
+    """
+    if isinstance(files, str):
+        files = [files]
+    if not files or len(files) == 0:
+        raise Exception("No liberty files provided")
     logging.info(f"Loading liberty files: {', '.join(files)}")
     __get_top_db().loadLibertyPrimitives(files)
 

{najaeda-0.1.21.dist-info → najaeda-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: najaeda
-Version: 0.1.21
+Version: 0.1.22
 Summary: Naja EDA Python package
 Author-Email: Naja Authors <contact@keplertech.io>
 License: Apache License 2.0

{najaeda-0.1.21.dist-info → najaeda-0.1.22.dist-info}/RECORD

@@ -1,11 +1,16 @@
-najaeda/netlist.py,sha256=vDzsRYZDM7svKEJHVquM-pyfIikALY-RkvLm6vm-MSM,52810
+najaeda-0.1.22.dist-info/RECORD,,
+najaeda-0.1.22.dist-info/WHEEL,sha256=nFSIsNnUJn_8RF-FUhBaXtCep1yHZRCxSkBom4ebATM,114
+najaeda-0.1.22.dist-info/METADATA,sha256=yODu-S8hBOfAa8gE_obfi9DKrlaWUMBz89ZZb9fk10A,2475
+najaeda-0.1.22.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+najaeda-0.1.22.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
+najaeda/netlist.py,sha256=donwdHm7eKBQNTkjdTTt9lAqKxSbSSYF3CTmN1UafkY,53396
 najaeda/libnaja_nl.dylib,sha256=O1pfUil1jLkWu89X3JGpKyTwuVqmpsnwZDOESYqjqeU,713152
 najaeda/pandas_stats.py,sha256=yOb4ka965U7rN4D6AwvSGmRyeT_O7Ed-5cmT8BFbfeo,1070
 najaeda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-najaeda/naja.so,sha256=wSN6dKKqhK3f77ylSjgItoT-5o52oVdM7I3C7ZdnZZw,99440
+najaeda/naja.so,sha256=MR_bQ_U1LJRg_rHuKma1ReUGEUewKzUZTbVI5B6FQUE,99440
 najaeda/net_visitor.py,sha256=P_esjibYb-wBDuF-AyF7es9sJYw1Ha8RhTPu-qKe7G4,1940
 najaeda/libnaja_opt.dylib,sha256=91kz37-SLpztC7x1F_VYZlddwzCBoNVaD6NqL7OL2GQ,190816
-najaeda/libnaja_python.dylib,sha256=J6TSYbYPdU4ylvJv1ugZEK5g2GX3o1Z68rJGn-5V3ik,904240
+najaeda/libnaja_python.dylib,sha256=l_0oqWr7QEUDCHKI8l2twNrdBEwneIIvXG4yk_Xt4Jc,904240
 najaeda/stats.py,sha256=wackXsf0x24ic9v-UifECHj4t5yveUWssMDZp2B057A,16187
 najaeda/instance_visitor.py,sha256=JMsPSQaWNiDjxS05rxg83a0PIsrOIuTi9G35hkwdibs,1530
 najaeda/libnaja_bne.dylib,sha256=r9-g0qCILL6w_BgXYg62karCWloSPSpdNGEeS2Ey0Jk,134064
@@ -16,7 +21,7 @@ najaeda/docs/requirements.txt,sha256=1XIBGTIplm2arC9HhDCfLuAjozGdVSXkqmOj8ybuT6U
 najaeda/docs/.readthedocs.yaml,sha256=nN_Psro-YdfPcIiueZkJcZepts68g23rqVThhKnmVRw,790
 najaeda/docs/source/index.rst,sha256=80VMfeEGHObnOUXRBxIzISQsG_HNkgT-pUpsDZsCfOY,387
 najaeda/docs/source/instance.rst,sha256=7B2IBB0p32Tb4qvOCE77OlrQaYpFADvmTlq1q8eyVqw,458
-najaeda/docs/source/conf.py,sha256=iSeerg2pJlZlhtwkJ9edRRYrLEdx3R1p7GWi78dHP1o,2019
+najaeda/docs/source/conf.py,sha256=XqCFo29gZCbaoPe1xEan9ZonYyQW5NZnWHGEWrB7p8Q,2021
 najaeda/docs/source/preprocessor.py,sha256=TK4LsTdNbv2dxkKQaJ7cEyo9PU5v_56vlrFCJYIPKf8,2625
 najaeda/docs/source/term.rst,sha256=QKWT6u1xjEjusvcZYknKQ-M83ibohO5y1EYTQnnXqak,690
 najaeda/docs/source/net.rst,sha256=i6YEir8ZOldSY8-UmPxgVJ4Ot3y-Q6seRkBr2H-KmXc,732
@@ -33,8 +38,3 @@ najaeda/.dylibs/libtbb.12.15.dylib,sha256=MGGmYnvwo6PQYq7aVv_m2gKHBbOkAdwjPLJtYZ
 najaeda/.dylibs/libkj-1.1.0.dylib,sha256=pB7dMks8b8ybJ6xKWqFR_hHjKsmpf7wzbcunZaS7gO4,578320
 najaeda/primitives/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 najaeda/primitives/xilinx.py,sha256=Ka-jlu-OxixEZ_yR_niXLHtaUL8HxT1Bg9H9Kpnr4ns,26551
-najaeda-0.1.21.dist-info/RECORD,,
-najaeda-0.1.21.dist-info/WHEEL,sha256=nFSIsNnUJn_8RF-FUhBaXtCep1yHZRCxSkBom4ebATM,114
-najaeda-0.1.21.dist-info/METADATA,sha256=F9KxuiPDRio9g80RxoIDE7lwBcbAwk85-8GA5c5Mmxo,2475
-najaeda-0.1.21.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-najaeda-0.1.21.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377