najaeda 0.2.10__cp312-cp312-macosx_11_0_arm64.whl → 0.2.12__cp312-cp312-macosx_11_0_arm64.whl

najaeda/netlist.py

@@ -72,6 +72,35 @@ def get_snl_path_from_id_list(id_list: list) -> naja.SNLPath:
     return path
 
 
+class Attribute:
+    def __init__(self, snlAttribute):
+        self.snlAttribute = snlAttribute
+
+    def __str__(self):
+        return str(self.snlAttribute)
+
+    def get_name(self):
+        """
+        :return: the name of the attribute.
+        :rtype: str
+        """
+        return self.snlAttribute.getName()
+
+    def has_value(self):
+        """
+        :return: True if the attribute has a value.
+        :rtype: bool
+        """
+        return self.snlAttribute.hasValue()
+
+    def get_value(self):
+        """
+        :return: the value of the attribute.
+        :rtype: str
+        """
+        return self.snlAttribute.getValue()
+
+
 class Equipotential:
     """Class that represents the term and wraps
     some of the snl occurrence API.
@@ -423,6 +452,25 @@ class Net:
         yield from self.get_design_terms()
         yield from self.get_inst_terms()
 
+    def get_attributes(self) -> Iterator[Attribute]:
+        """Iterate over the attributes of this Net.
+
+        :return: the attributes of this Net.
+        :rtype: Iterator[Attribute]
+        """
+        if hasattr(self, "net"):
+            snlnet = self.net
+            for attribute in snlnet.getAttributes():
+                yield Attribute(attribute)
+
+    def count_attributes(self) -> int:
+        """Count the attributes of this Net.
+
+        :return: the number of attributes of this Net.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_attributes())
+
 
 def get_snl_term_for_ids(pathIDs, termIDs):
     path = get_snl_path_from_id_list(pathIDs)
@@ -638,6 +686,24 @@ class Term:
         elif snlterm.getDirection() == naja.SNLTerm.Direction.InOut:
             return Term.Direction.INOUT
 
+    def get_attributes(self) -> Iterator[Attribute]:
+        """Iterate over the attributes of this Term.
+
+        :return: the attributes of this Term.
+        :rtype: Iterator[Attribute]
+        """
+        snlterm = get_snl_term_for_ids(self.pathIDs, self.termIDs)
+        for attribute in snlterm.getAttributes():
+            yield Attribute(attribute)
+
+    def count_attributes(self) -> int:
+        """Count the attributes of this Term.
+
+        :return: the number of attributes of this Term.
+        :rtype: int
+        """
+        return sum(1 for _ in self.get_attributes())
+
     def get_combinatorial_inputs(self):
         """Get all combinatorial input terms of this instance.
 
@@ -894,35 +960,6 @@ def get_instance_by_path(names: list):
     return get_top().get_child_instance(names)
 
 
-class Attribute:
-    def __init__(self, snlAttribute):
-        self.snlAttribute = snlAttribute
-
-    def __str__(self):
-        return str(self.snlAttribute)
-
-    def get_name(self):
-        """
-        :return: the name of the attribute.
-        :rtype: str
-        """
-        return self.snlAttribute.getName()
-
-    def has_value(self):
-        """
-        :return: True if the attribute has a value.
-        :rtype: bool
-        """
-        return self.snlAttribute.hasValue()
-
-    def get_value(self):
-        """
-        :return: the value of the attribute.
-        :rtype: str
-        """
-        return self.snlAttribute.getValue()
-
-
 class Instance:
     """Class that represents an instance in the design hierarchy.
     """
@@ -1831,7 +1868,7 @@ def apply_constant_propagation():
         naja.NLUniverse.get().applyConstantPropagation()
 
 
-def get_max_fanout() -> int:
+def get_max_fanout() -> list:
     """Get the maximum fanout of the top design.
 
     :return: the maximum fanout of the top design.
@@ -1841,11 +1878,39 @@ def get_max_fanout() -> int:
     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:
+            max_fanout = naja.NLUniverse.get().getMaxFanout()
+            result = []
+            index = 0
+            result.append(max_fanout[0])
+            fanouts = []
+            for entry in max_fanout[1]:
+                fanout = []
+                driver = entry[0]
+                component = driver.getComponent()
+                path = driver.getPath().getPathIDs()
+                if isinstance(component, naja.SNLInstTerm):
+                    path.append(component.getInstance().getID())
+                    component = component.getBitTerm()
+                print(component)
+                print(path)
+                fanout.append(Term(path, component))
+                readers = []
+                for item in entry[1]:
+                    component = item.getComponent()
+                    path = item.getPath().getPathIDs()
+                    if isinstance(component, naja.SNLInstTerm):
+                        path.append(component.getInstance().getID())
+                        component = component.getBitTerm()
+                    readers.append(Term(path, component))
+                fanout.append(readers)
+                fanouts.append(fanout)
+                index += 1
+            result.append(fanouts)
+            return result
+    return [0]
+
+
+def get_max_logic_level() -> list:
     """Get the maximum logic level of the top design.
 
     :return: the maximum logic level of the top design.
@@ -1855,5 +1920,25 @@ def get_max_logic_level() -> int:
     if u is not None:
         top = naja.NLUniverse.get().getTopDesign()
         if top is not None:
-            return naja.NLUniverse.get().getMaxLogicLevel()
-    return 0
+            max_logic_level = naja.NLUniverse.get().getMaxLogicLevel()
+            result = []
+            index = 0
+            for entry in max_logic_level:
+                if index == 0:
+                    result.append(max_logic_level[0])
+                else:
+                    paths = []
+                    for path in entry:
+                        llpath = []
+                        for item in path:
+                            component = item.getComponent()
+                            pathIDs = item.getPath().getPathIDs()
+                            if isinstance(component, naja.SNLInstTerm):
+                                pathIDs.append(component.getInstance().getID())
+                                component = component.getBitTerm()
+                            llpath.append(Term(pathIDs, component))
+                        paths.append(llpath)
+                    result.append(paths)
+                index += 1
+            return result
+    return [0]

{najaeda-0.2.10.dist-info → najaeda-0.2.12.dist-info}/METADATA

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

{najaeda-0.2.10.dist-info → najaeda-0.2.12.dist-info}/RECORD

@@ -1,22 +1,22 @@
-najaeda-0.2.10.dist-info/RECORD,,
-najaeda-0.2.10.dist-info/WHEEL,sha256=a5hFNLnG478el62xhySpcm13yln7Jlz1BenyGRdoSlE,114
-najaeda-0.2.10.dist-info/METADATA,sha256=-9uJNNWWDpC0ofYCIvFlQgusbbd5iMvBmz60oz5HspE,3656
-najaeda-0.2.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-najaeda-0.2.10.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
-najaeda/netlist.py,sha256=iDaELvPq9irnAPmk6F7LqjP0W6w9uUpb3b_UG900Q-g,63744
-najaeda/libnaja_nl.dylib,sha256=G0kN6sg7R5sLwPFDL2jPZHjUPFbzA-CWycVTuYLowoo,774400
+najaeda-0.2.12.dist-info/RECORD,,
+najaeda-0.2.12.dist-info/WHEEL,sha256=a5hFNLnG478el62xhySpcm13yln7Jlz1BenyGRdoSlE,114
+najaeda-0.2.12.dist-info/METADATA,sha256=hSlx5YMwg6ZliqOfS5k6qHjF9kx0i_m6g6z-ulC5TAc,3656
+najaeda-0.2.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+najaeda-0.2.12.dist-info/licenses/AUTHORS,sha256=7NYEGDAX_1QZvCCHfq8YVXC5ZbwH_pbNI8DcSmm70GU,377
+najaeda/netlist.py,sha256=f36j5CT2pEV9qqQwJmkAe-1vU8n8Smied4XTuEFkcok,67034
+najaeda/libnaja_nl.dylib,sha256=wW6MuM89Q6WIK-GqDuFJrbHvb06IY8fX9LE1ijytHEo,774480
 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=InUjeTwg_gRulIBrVozhkA6jgP6DScuzWu1eqQwQiiU,99440
+najaeda/naja.so,sha256=O4ik-tGZn4n0T2h_G-hrzZTCk6jNWH-hsFU6lAJ9N7w,99440
 najaeda/net_visitor.py,sha256=P_esjibYb-wBDuF-AyF7es9sJYw1Ha8RhTPu-qKe7G4,1940
 najaeda/libnaja_opt.dylib,sha256=vW8P49UplpYdjSxqU3TeaV2s9ck75Spq5ZcrN3ET0f4,212720
-najaeda/libnaja_python.dylib,sha256=8PARxZfekFTxgjZSd-VCklRkSiPsM1rGJkZWi4Fi1Dw,962128
+najaeda/libnaja_python.dylib,sha256=Vt0E2AbFgiqX5Jmfl2CNXjdo8EK_D1t5IZMcFonc0l0,962688
 najaeda/stats.py,sha256=g1F1CEBNVvGgzINOI7sK83123cCbclLDmyUjuep3-EU,16107
 najaeda/instance_visitor.py,sha256=JMsPSQaWNiDjxS05rxg83a0PIsrOIuTi9G35hkwdibs,1530
 najaeda/libnaja_bne.dylib,sha256=pLbGUnDr5PSGXbA8wKD-pqEyQIWHbiCb1icPpxRYrWE,136416
-najaeda/libnaja_metrics.dylib,sha256=Nj1HCvjZR1q4PiWnwKiRHIJ0XFdhsX8XwSLNxXGrl0A,106864
-najaeda/libnaja_dnl.dylib,sha256=QJ6_p0xWdPZn0T1MmPQ74j3FRXkQliM_7E8KQiotRzg,148000
+najaeda/libnaja_metrics.dylib,sha256=83UJKTRmqtEvUZokv539CWcCENvd8lOf5U2SfgXnT7E,123440
+najaeda/libnaja_dnl.dylib,sha256=B2jj02K-4rzjeAYCpXShrgNDjm9I1gz4e50n_DugUgg,148096
 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