hwcomponents-adc 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

hwcomponents_adc/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.14'
-__version_tuple__ = version_tuple = (1, 0, 14)
+__version__ = version = '1.0.16'
+__version_tuple__ = version_tuple = (1, 0, 16)
 
 __commit_id__ = commit_id = None

hwcomponents_adc/main.py

@@ -6,7 +6,7 @@ from typing import Dict, List
 import yaml
 from hwcomponents_adc.headers import *
 from .optimizer import ADCRequest
-from hwcomponents import EnergyAreaModel, actionDynamicEnergy
+from hwcomponents import ComponentModel, action
 
 SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
 
@@ -62,7 +62,7 @@ def adc_attr_to_request(attributes: Dict, logger: logging.Logger) -> ADCRequest:
 
     r = ADCRequest(
         bits=try_check(resolution_names, numeric=True),
-        tech=float(checkerr("tech_node", numeric=True)) * 1e9, # m -> nm
+        tech=float(checkerr("tech_node", numeric=True)) * 1e9,  # m -> nm
         throughput=float(checkerr("throughput", numeric=True)),
         n_adcs=n_adcs,
         logger=logger,
@@ -78,7 +78,7 @@ def dict_to_str(attributes: Dict) -> str:
     return s
 
 
-class ADC(EnergyAreaModel):
+class ADC(ComponentModel):
     """
     Analog digital converter (ADC) model based on https://arxiv.org/abs/2404.06553.
 
@@ -97,6 +97,7 @@ class ADC(EnergyAreaModel):
         throughput: The throughput of the ADC in samples per second.
         n_adcs: The number of ADCs.
     """
+
     component_name = [
         "adc",
         "pim_adc",
@@ -170,53 +171,53 @@ class ADC(EnergyAreaModel):
         )
         return request.energy_per_op(self._model) * 1e-12  # pJ -> J
 
-    @actionDynamicEnergy
-    def convert(self):
+    @action
+    def convert(self) -> tuple[float, float]:
         """
-        Returns the energy for one ADC conversion in Joules.
+        Returns the energy and latency for one ADC conversion.
 
         Returns:
-            The energy for one ADC conversion in Joules.
+            (energy, latency): Tuple in (Joules, seconds).
         """
         # Assume leakage is 20% of the total energy
-        return self.get_energy() * 0.8
+        return self.get_energy() * 0.8, 1 / self.throughput
 
-    @actionDynamicEnergy
-    def drive(self):
+    @action
+    def drive(self) -> tuple[float, float]:
         """
-        Returns the energy for one ADC conversion in Joules.
+        Returns the energy and latency for one ADC conversion.
 
         Returns:
-            The energy for one ADC conversion in Joules.
+            (energy, latency): Tuple in (Joules, seconds).
         """
         return self.convert()
 
-    @actionDynamicEnergy
-    def read(self):
+    @action
+    def read(self) -> tuple[float, float]:
         """
-        Returns the energy for one ADC conversion in Joules.
+        Returns the energy and latency for one ADC conversion.
 
         Returns:
-            The energy for one ADC conversion in Joules.
+            (energy, latency): Tuple in (Joules, seconds).
         """
         return self.convert()
 
-    @actionDynamicEnergy
-    def sample(self):
+    @action
+    def sample(self) -> tuple[float, float]:
         """
-        Returns the energy for one ADC conversion in Joules.
+        Returns the energy and latency for one ADC conversion.
 
         Returns:
-            The energy for one ADC conversion in Joules.
+            (energy, latency): Tuple in (Joules, seconds).
         """
         return self.convert()
 
-    @actionDynamicEnergy
-    def activate(self):
+    @action
+    def activate(self) -> tuple[float, float]:
         """
-        Returns the energy for one ADC conversion in Joules.
+        Returns the energy and latency for one ADC conversion.
 
         Returns:
-            The energy for one ADC conversion in Joules.
+            (energy, latency): Tuple in (Joules, seconds).
         """
         return self.convert()

{hwcomponents_adc-1.0.14.dist-info → hwcomponents_adc-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hwcomponents-adc
-Version: 1.0.14
+Version: 1.0.16
 Summary: A package for estimating the energy and area of Analog-Digital Converters
 Author-email: Tanner Andrulis <Andrulis@mit.edu>
 License-Expression: MIT

{hwcomponents_adc-1.0.14.dist-info → hwcomponents_adc-1.0.16.dist-info}/RECORD

@@ -1,8 +1,8 @@
 hwcomponents_adc/__init__.py,sha256=5-yJAO35278NGG9dpkFYB4IP49jaEA6T7qebld7Pjhs,29
-hwcomponents_adc/_version.py,sha256=6M51k-eDUkvbg1O0UDaNPjBRHmqrs5f127zkdrldxjg,706
+hwcomponents_adc/_version.py,sha256=4CHhABBoxgEpxC6Tk-T_Y7W9bHR4vDaLUdkc2GswE34,706
 hwcomponents_adc/energy_correlation.csv,sha256=LFrjS5FnOTUIlKI5LrqufmsKfa6Y4qgWSl8Sd9VgsBo,23003
 hwcomponents_adc/headers.py,sha256=yO6qJfN33H7mgvm2TIr31IibeR1lxhWoLiOk9bcbuyk,2407
-hwcomponents_adc/main.py,sha256=rMO49XPBKpCj2z7_uZYZjEJSxQO67WM-ZuG6Ebty4Ws,6748
+hwcomponents_adc/main.py,sha256=RZte7LS7JvKYBS6k0fasazJX8OX7rIgZESd2UMLR2rg,6826
 hwcomponents_adc/model.py,sha256=yZUsBd5nVE9-lcS8lizJ_NwfBrXjANLYFDw2JQvbLRk,9834
 hwcomponents_adc/murmannsurvey.py,sha256=AsIPMIjGK4-P6uEsuFAeNQkH8-m6cSUPlOYPrO-BqA4,1445
 hwcomponents_adc/optimizer.py,sha256=Z2a1FZ60aOWGVEt_XCvRRVHbZe1O5nsLWfrdBEoTPZU,3313
@@ -10,7 +10,7 @@ hwcomponents_adc/update_model.py,sha256=jUmGsqGdIA9KwvgF2X9AwVpJ2jZluZxFekUDomA4
 hwcomponents_adc/adc_data/adc_list.csv,sha256=wY1adNrc6XTWUXakNqcIQGntqGDMNmjY-7Pz_w806to,18247
 hwcomponents_adc/adc_data/citation.bib,sha256=Y0deF_COqi8VtZpIAxPAtGX3s7p7jdM2zhCiTc_ZxPQ,177
 hwcomponents_adc/adc_data/model.yaml,sha256=TClBV4ljce3xv_kxAaOig-JvoCUfc7gKNpD5QfeHseE,1181
-hwcomponents_adc-1.0.14.dist-info/METADATA,sha256=6lwS3G8AO-iMK2_eC7Q-Sg_fU_Ix2U_BKWJyD23Thz4,4231
-hwcomponents_adc-1.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hwcomponents_adc-1.0.14.dist-info/top_level.txt,sha256=B5pehwpyDw3tB_l5bskxXhYTM5vZXaYN64JcR_JmXAI,17
-hwcomponents_adc-1.0.14.dist-info/RECORD,,
+hwcomponents_adc-1.0.16.dist-info/METADATA,sha256=_aWpxbLJyV5ViDte9V7ZJow1B8GBVTKXZOLcxXMxmMU,4231
+hwcomponents_adc-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hwcomponents_adc-1.0.16.dist-info/top_level.txt,sha256=B5pehwpyDw3tB_l5bskxXhYTM5vZXaYN64JcR_JmXAI,17
+hwcomponents_adc-1.0.16.dist-info/RECORD,,