najaeda 0.2.4__cp312-cp312-macosx_11_0_arm64.whl → 0.2.5__cp312-cp312-macosx_11_0_arm64.whl

najaeda/netlist.py

@@ -10,7 +10,7 @@ import struct
 import sys
 import os
 from enum import Enum
-from typing import Union, List
+from typing import Union, List, Iterator
 from dataclasses import dataclass
 
 from najaeda import naja
@@ -561,7 +561,7 @@ class Term:
         :return: True if the term is a sequential term.
         :rtype: bool
         """
-        for term in self.get_instance().get_flat_terms():
+        for term in self.get_instance().get_bit_terms():
             clockRelatedInputs = term.get_instance().get_clock_related_inputs(term)
             if self in clockRelatedInputs:
                 return True
@@ -822,17 +822,7 @@ class Term:
 
 
 def get_instance_by_path(names: list):
-    assert len(names) > 0
-    path = naja.SNLPath()
-    instance = None
-    top = naja.NLUniverse.get().getTopDesign()
-    design = top
-    for name in names:
-        path = naja.SNLPath(path, design.getInstance(name))
-        instance = design.getInstance(name)
-        assert instance is not None
-        design = instance.getModel()
-    return Instance(path)
+    return get_top().get_child_instance(names)
 
 
 # def refresh_path(path: naja.SNLPath):
@@ -951,14 +941,13 @@ class Instance:
         :return: True if this is the top design.
         :rtype: bool
         """
-        return len(self.pathIDs) == 0
+        return not self.pathIDs
 
     def is_assign(self) -> bool:
         """(assign a=b) will create an instance of assign connecting
         the wire a to the output of the assign and b to the input.
 
-        :return: True if this is an assign. Assigns are represented with
-        unnamed Assign instances.
+        :return: True if this is an assign (represented by an unnamed assign instance).
         :rtype: bool
         """
         return self.__get_snl_model().isAssign()
@@ -1120,10 +1109,10 @@ class Instance:
         """
         return sum(1 for _ in self.get_nets())
 
-    def get_flat_nets(self):
+    def get_bit_nets(self):
         """Iterate over all scalar nets and bus net bits.
 
-        :return: an iterator over the flat nets of this Instance.
+        :return: an iterator over the nets at bit level of this Instance.
         :rtype: Iterator[Net]
         """
         for net in self.__get_snl_model().getNets():
@@ -1133,13 +1122,13 @@ class Instance:
             else:
                 yield Net(self.pathIDs, net)
 
-    def count_flat_nets(self) -> int:
+    def count_bit_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.
+        :return: the number of bit nets of this Instance.
         :rtype: int
         """
-        return sum(1 for _ in self.get_flat_nets())
+        return sum(1 for _ in self.get_bit_nets())
 
     def get_net(self, name: str) -> Net:
         """
@@ -1183,22 +1172,22 @@ class Instance:
         """
         return sum(1 for _ in self.get_terms())
 
-    def get_flat_terms(self):
+    def get_bit_terms(self):
         """Iterate over all scalar terms and bus term bits.
 
-        :return: the flat terms of this Instance.
+        :return: the bit terms of this Instance.
         :rtype: Iterator[Term]
         """
         for term in self.__get_snl_model().getBitTerms():
             yield Term(self.pathIDs, term)
 
-    def count_flat_terms(self) -> int:
+    def count_bit_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.
+        :return: the number of bit terms of this Instance.
         :rtype: int
         """
-        return sum(1 for _ in self.get_flat_terms())
+        return sum(1 for _ in self.get_bit_terms())
 
     def get_term(self, name: str) -> Term:
         """
@@ -1231,11 +1220,11 @@ class Instance:
         """
         return sum(1 for _ in self.get_input_terms())
 
-    def get_flat_input_terms(self):
+    def get_input_bit_terms(self):
         """Iterate over all scalar input terms and bus input term bits
         of this Instance.
 
-        :return: the flat input terms of this Instance.
+        :return: the bit input terms of this Instance.
         :rtype: Iterator[Term]
         """
         for term in self.__get_snl_model().getTerms():
@@ -1246,14 +1235,14 @@ class Instance:
                 else:
                     yield Term(self.pathIDs, term)
 
-    def count_flat_input_terms(self) -> int:
+    def count_input_bit_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.
+        :return: the number of bit input terms of this Instance.
         :rtype: int
         """
-        return sum(1 for _ in self.get_flat_input_terms())
+        return sum(1 for _ in self.get_input_bit_terms())
 
     def get_output_terms(self):
         """Iterate over all scalar output terms and bus output terms
@@ -1275,11 +1264,11 @@ class Instance:
         """
         return sum(1 for _ in self.get_output_terms())
 
-    def get_flat_output_terms(self):
+    def get_output_bit_terms(self):
         """Iterate over all scalar output terms and bus output term bits
         of this Instance.
 
-        :return: the flat output terms of this Instance.
+        :return: the bit output terms of this Instance.
         :rtype: Iterator[Term]
         """
         for term in self.__get_snl_model().getTerms():
@@ -1290,16 +1279,16 @@ class Instance:
                 else:
                     yield Term(self.pathIDs, term)
 
-    def count_flat_output_terms(self) -> int:
+    def count_output_bit_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.
+        :return: the number of bit output terms of this Instance.
         :rtype: int
         """
-        return sum(1 for _ in self.get_flat_output_terms())
+        return sum(1 for _ in self.get_output_bit_terms())
 
-    def get_attributes(self):
+    def get_attributes(self) -> Iterator[Attribute]:
         """Iterate over the attributes of this Instance.
 
         :return: the attributes of this Instance.
@@ -1341,7 +1330,7 @@ class Instance:
         # Delete the last instance in uniq_path
         self.__get_snl_model().getInstanceByID(id).destroy()
 
-    def get_design(self):
+    def get_design(self) -> "Instance":
         """
         :return: the Instance containing this instance.
         :rtype: Instance
@@ -1403,7 +1392,7 @@ class Instance:
         model = self.__get_snl_model()
         return model.getDB().getID(), model.getLibrary().getID(), model.getID()
 
-    def create_child_instance(self, model: str, name: str):
+    def create_child_instance(self, model: str, name: str) -> "Instance":
         """Create a child instance with the given model and name.
 
         :param str model: the name of the model of the instance to create.
@@ -1524,7 +1513,7 @@ class Instance:
         :rtype: Net
         """
         path = get_snl_path_from_id_list(self.pathIDs)
-        if path.size() > 0:
+        if path.size():
             naja.SNLUniquifier(path)
             path = get_snl_path_from_id_list(self.pathIDs)
         model = self.__get_snl_model()
@@ -1541,7 +1530,7 @@ class Instance:
         :rtype: Net
         """
         path = get_snl_path_from_id_list(self.pathIDs)
-        if path.size() > 0:
+        if path.size():
             naja.SNLUniquifier(path)
             path = get_snl_path_from_id_list(self.pathIDs)
         model = self.__get_snl_model()
@@ -1840,3 +1829,31 @@ def apply_constant_propagation():
     top = naja.NLUniverse.get().getTopDesign()
     if top is not None:
         naja.NLUniverse.get().applyConstantPropagation()
+
+
+def get_max_fanout() -> int:
+    """Get the maximum fanout of the top design.
+
+    :return: the maximum fanout of the top design.
+    :rtype: int
+    """
+    u = naja.NLUniverse.get()
+    if u is not None:
+        top = naja.NLUniverse.get().getTopDesign()
+        if top is not None:
+            return naja.NLUniverse.get().getMaxFanout()
+    return 0
+
+
+def get_max_logic_level() -> int:
+    """Get the maximum logic level of the top design.
+
+    :return: the maximum logic level of the top design.
+    :rtype: int
+    """
+    u = naja.NLUniverse.get()
+    if u is not None:
+        top = naja.NLUniverse.get().getTopDesign()
+        if top is not None:
+            return naja.NLUniverse.get().getMaxLogicLevel()
+    return 0

najaeda/stats.py

@@ -236,7 +236,7 @@ def compute_instance_terms(instance, instance_stats):
 
 
 def compute_instance_net_stats(instance, instance_stats):
-    for net in instance.get_flat_nets():
+    for net in instance.get_bit_nets():
         if net.is_const():
             pass
         nb_components = sum(1 for c in net.get_terms())
@@ -372,21 +372,18 @@ def convert_instance_stats_to_json(instance_stats):
     return json_top
 
 
-def dump_instance_stats_json(instance, stats_file):
-    # stats_files = [(InstanceStats.ReportType.JSON, stats_file)]
-    # stats_file.write("[\n")
-    # dump_instance_stats(design, stats_files)
-    # stats_file.write("]")
+def dump_instance_stats_json(instance, path: str):
     instances_stats = InstancesStats()
     compute_instance_stats(instance, instances_stats)
     json_dict = convert_instance_stats_to_json(instances_stats)
-    json.dump(json_dict, stats_file, indent=4)
+    with open(path, "w") as f:
+        json.dump(json_dict, f, indent=4)
 
 
-def dump_instance_stats_text(instance, file):
+def dump_instance_stats_text(instance, path: str):
     instances_stats = InstancesStats()
     compute_instance_stats(instance, instances_stats)
-    instances_stats.dump_instance_stats_text(instance, file)
+    instances_stats.dump_instance_stats_text(instance, path)
 
 
 def dump_constants(design, analyzed_models):

{najaeda-0.2.4.dist-info → najaeda-0.2.5.dist-info}/METADATA

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

{najaeda-0.2.4.dist-info → najaeda-0.2.5.dist-info}/RECORD

@@ -1,21 +1,22 @@
-najaeda-0.2.4.dist-info/RECORD,,
-najaeda-0.2.4.dist-info/WHEEL,sha256=v7i1yNVEHWKlHHcCQ8SYkgpldhmAvPDAYWfI_XMFumo,114
-najaeda-0.2.4.dist-info/METADATA,sha256=aGamxUDd_TKlccUOBxm-ooAbA3Ef-FwSlgP3lPTW09U,3435
-najaeda-0.2.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-najaeda-0.2.4.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
-najaeda/netlist.py,sha256=KdBQ77bMqYiUU_ecbDrR43L98FXk05_ahvj-8um-G5k,63866
+najaeda-0.2.5.dist-info/RECORD,,
+najaeda-0.2.5.dist-info/WHEEL,sha256=v7i1yNVEHWKlHHcCQ8SYkgpldhmAvPDAYWfI_XMFumo,114
+najaeda-0.2.5.dist-info/METADATA,sha256=eiDQdwCVkgO-2dtr2b5a_8g5upb0uPXfpUICWWL4Apc,3435
+najaeda-0.2.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+najaeda-0.2.5.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
+najaeda/netlist.py,sha256=ZCFc5z7auEGAn2YURizMHnK0Twljug6vefuBCdxGopw,64298
 najaeda/libnaja_nl.dylib,sha256=v773WRb6Pl9gpAtRNB8Z6YO0L0L1N121JPXRm9CjucI,757456
 najaeda/pandas_stats.py,sha256=yOb4ka965U7rN4D6AwvSGmRyeT_O7Ed-5cmT8BFbfeo,1070
 najaeda/_version.py,sha256=c-4hT20dyE-3BcdzOqR0vd92E7ydR5u2c-VmCc6oU8A,332
 najaeda/__init__.py,sha256=6QrOzlqTfd558FH9Zm6ve54IzkHaDJ8ZO8hTCaEwsL8,218
-najaeda/naja.so,sha256=KlZfhVxDYoHspfxoGy4yHuU8h9-r3y51IDlK9TSrjeQ,99440
+najaeda/naja.so,sha256=Hf_mYB3eVhsiB0Nb9xBOM7Yx6a5DNaRcA5O51r56-MU,99440
 najaeda/net_visitor.py,sha256=P_esjibYb-wBDuF-AyF7es9sJYw1Ha8RhTPu-qKe7G4,1940
 najaeda/libnaja_opt.dylib,sha256=wIG2H5rnxbqGrwLSgklJjZ5wjOkx2Shhu2RsnYQwmuE,212720
-najaeda/libnaja_python.dylib,sha256=soj2mTcuscVV3Frs3XmeiyekyUgWm5fmxGezO6ziJEQ,944848
-najaeda/stats.py,sha256=W41fqyMiAN9o9ajXy1t-CGoxDaSmY0TyTT5epc6yz-I,16249
+najaeda/libnaja_python.dylib,sha256=nQf5iO914R0wB_KU1CHktkIA5gS10v6HmGkwBkoAVgI,961840
+najaeda/stats.py,sha256=g1F1CEBNVvGgzINOI7sK83123cCbclLDmyUjuep3-EU,16107
 najaeda/instance_visitor.py,sha256=JMsPSQaWNiDjxS05rxg83a0PIsrOIuTi9G35hkwdibs,1530
 najaeda/libnaja_bne.dylib,sha256=pLbGUnDr5PSGXbA8wKD-pqEyQIWHbiCb1icPpxRYrWE,136416
-najaeda/libnaja_dnl.dylib,sha256=qroDUAnl-eBJcdz-1YGC08Ngz4NEUctMiZ4W-gpT5mU,147088
+najaeda/libnaja_metrics.dylib,sha256=Nj1HCvjZR1q4PiWnwKiRHIJ0XFdhsX8XwSLNxXGrl0A,106864
+najaeda/libnaja_dnl.dylib,sha256=tZdFzYkdrk3-MDGPPJoxwLmNjBH2_UhTCEOzueR43hE,148000
 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