najaeda 0.1.17__cp39-cp39-macosx_11_0_arm64.whl → 0.1.22__cp39-cp39-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
@@ -1010,6 +1011,14 @@ class Instance:
         for net in self.__get_snl_model().getNets():
             yield Net(self.pathIDs, net)
 
+    def count_nets(self) -> int:
+        """Count the number of scalar nets and bus nets of this Instance.
+
+        :return: the number of nets of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_nets())
+
     def get_flat_nets(self):
         """Iterate over all scalar nets and bus net bits.
 
@@ -1023,6 +1032,14 @@ class Instance:
             else:
                 yield Net(self.pathIDs, net)
 
+    def count_flat_nets(self) -> int:
+        """Count the number of scalar nets and bus net bits of this Instance.
+
+        :return: the number of flat nets of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_flat_nets())
+
     def get_net(self, name: str) -> Net:
         """
         :param str name: the name of the Net to get.
@@ -1050,6 +1067,14 @@ class Instance:
         for term in self.__get_snl_model().getTerms():
             yield Term(self.pathIDs, term)
 
+    def count_terms(self) -> int:
+        """Count the number of scalar terms and bus terms of this Instance.
+
+        :return: the number of terms of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_terms())
+
     def get_flat_terms(self):
         """Iterate over all scalar terms and bus term bits.
 
@@ -1059,6 +1084,14 @@ class Instance:
         for term in self.__get_snl_model().getBitTerms():
             yield Term(self.pathIDs, term)
 
+    def count_flat_terms(self) -> int:
+        """Count the number of scalar terms and bus term bits of this Instance.
+
+        :return: the number of flat terms of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_flat_terms())
+
     def get_term(self, name: str) -> Term:
         """
         :param str name: the name of the Term to get.
@@ -1081,6 +1114,15 @@ class Instance:
             if term.getDirection() != naja.SNLTerm.Direction.Output:
                 yield Term(self.pathIDs, term)
 
+    def count_input_terms(self) -> int:
+        """Count the number of scalar input terms and bus input terms
+        of this Instance.
+
+        :return: the number of input terms of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_input_terms())
+
     def get_flat_input_terms(self):
         """Iterate over all scalar input terms and bus input term bits
         of this Instance.
@@ -1096,6 +1138,15 @@ class Instance:
                 else:
                     yield Term(self.pathIDs, term)
 
+    def count_flat_input_terms(self) -> int:
+        """Count the number of scalar input terms and bus input term bits
+        of this Instance.
+
+        :return: the number of flat input terms of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_flat_input_terms())
+
     def get_output_terms(self):
         """Iterate over all scalar output terms and bus output terms
         of this Instance.
@@ -1107,6 +1158,15 @@ class Instance:
             if term.getDirection() != naja.SNLTerm.Direction.Input:
                 yield Term(self.pathIDs, term)
 
+    def count_output_terms(self) -> int:
+        """Count the number of scalar output terms and bus output terms
+        of this Instance.
+
+        :return: the number of output terms of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_output_terms())
+
     def get_flat_output_terms(self):
         """Iterate over all scalar output terms and bus output term bits
         of this Instance.
@@ -1122,6 +1182,15 @@ class Instance:
                 else:
                     yield Term(self.pathIDs, term)
 
+    def count_flat_output_terms(self) -> int:
+        """Count the number of scalar output terms and bus output term bits
+        of this Instance.
+
+        :return: the number of flat output terms of this Instance.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_flat_output_terms())
+
     def get_attributes(self):
         """Iterate over the attributes of this Instance.
 
@@ -1399,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:
@@ -1412,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)
 
@@ -1477,3 +1560,17 @@ def get_model_name(id: tuple[int, int, int]) -> str:
                 if model:
                     return model.getName()
     return None
+
+
+def apply_dle():
+    """Apply the DLE (Dead Logic Elimination) to the top design."""
+    top = naja.NLUniverse.get().getTopDesign()
+    if top is not None:
+        naja.NLUniverse.get().applyDLE()
+
+
+def apply_constant_propagation():
+    """Apply constant propagation to the top design."""
+    top = naja.NLUniverse.get().getTopDesign()
+    if top is not None:
+        naja.NLUniverse.get().applyConstantPropagation()

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

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

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

@@ -1,27 +1,27 @@
-najaeda-0.1.17.dist-info/RECORD,,
-najaeda-0.1.17.dist-info/WHEEL,sha256=gUcXopd-K2IKuDoaEe4uBUYaf2fjHRiHplXdACpNr9A,112
-najaeda-0.1.17.dist-info/METADATA,sha256=kOcF0pRa4WGiLp5MFPu1H2cfTeTz66ZaLNDuHVSmvWs,2475
-najaeda-0.1.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-najaeda-0.1.17.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
-najaeda/netlist.py,sha256=f_lr0sbwk6NZbLWDfgCNqwqbIaxZxac0GA8JhTJ5DS4,50187
+najaeda-0.1.22.dist-info/RECORD,,
+najaeda-0.1.22.dist-info/WHEEL,sha256=Bp5NfjQuMM_4-YV1MlnhqEfxPV5ySj3kUtyINz66rJc,112
+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=CUaXZt5Q5dUvyS-Y3oRUMiJlcljdW0NWgsAmR1HUNec,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=-k7rJk_5L6nwKfBhgy3zAWU9GKdVjfp1r0iIx_K8mC0,190816
-najaeda/libnaja_python.dylib,sha256=MGD5pydoh4mRtpFnw_xgDqkTS1OlTDzZKF9CKRsDF6k,903808
+najaeda/libnaja_opt.dylib,sha256=91kz37-SLpztC7x1F_VYZlddwzCBoNVaD6NqL7OL2GQ,190816
+najaeda/libnaja_python.dylib,sha256=T2F6x0X3vz_a_RLdKaQOS6XsHZhiPfBZ9czNWbOkAiM,904240
 najaeda/stats.py,sha256=wackXsf0x24ic9v-UifECHj4t5yveUWssMDZp2B057A,16187
 najaeda/instance_visitor.py,sha256=JMsPSQaWNiDjxS05rxg83a0PIsrOIuTi9G35hkwdibs,1530
 najaeda/libnaja_bne.dylib,sha256=r9-g0qCILL6w_BgXYg62karCWloSPSpdNGEeS2Ey0Jk,134064
-najaeda/libnaja_dnl.dylib,sha256=kH9Jzdbvj14dlzSSU8hPctvWn6r1qBh6GYOdPWFwLBs,145840
+najaeda/libnaja_dnl.dylib,sha256=zWsiT-RPDJz9koiDDUHqGNFzSFz7x2SmlIo5PTLkTUs,145936
 najaeda/native/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 najaeda/native/stats.py,sha256=t50hhE9pEFNtlssjES0A-K9TsO_2ZSUAb-e9L3Rt6yc,13063
 najaeda/docs/requirements.txt,sha256=1XIBGTIplm2arC9HhDCfLuAjozGdVSXkqmOj8ybuT6U,121
 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

{najaeda-0.1.17.dist-info → najaeda-0.1.22.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: scikit-build-core 0.11.4
+Generator: scikit-build-core 0.11.5
 Root-Is-Purelib: false
 Tag: cp39-cp39-macosx_11_0_arm64