esiaccel 0.1.5.dev52__cp313-cp313-win_amd64.whl → 0.1.5.dev66__cp313-cp313-win_amd64.whl

esiaccel/types.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 from . import esiCppAccel as cpp
 
 from typing import TYPE_CHECKING
+
 if TYPE_CHECKING:
   from .accelerator import HWModule
 
@@ -26,22 +27,33 @@ import traceback
 
 def _get_esi_type(cpp_type: cpp.Type):
   """Get the wrapper class for a C++ type."""
-  for cpp_type_cls, fn in __esi_mapping.items():
+  if isinstance(cpp_type, cpp.ChannelType):
+    return _get_esi_type(cpp_type.inner)
+
+  for cpp_type_cls, wrapper_cls in __esi_mapping.items():
     if isinstance(cpp_type, cpp_type_cls):
-      return fn(cpp_type)
-  return ESIType(cpp_type)
+      return wrapper_cls.wrap_cpp(cpp_type)
+  return ESIType.wrap_cpp(cpp_type)
 
 
-# Mapping from C++ types to functions constructing the Python object
-# corresponding to that type.
-__esi_mapping: Dict[Type, Callable] = {
-    cpp.ChannelType: lambda cpp_type: _get_esi_type(cpp_type.inner)
-}
+# Mapping from C++ types to wrapper classes
+__esi_mapping: Dict[Type, Type] = {}
 
 
 class ESIType:
 
-  def __init__(self, cpp_type: cpp.Type):
+  def __init__(self, id: str):
+    self._init_from_cpp(cpp.Type(id))
+
+  @classmethod
+  def wrap_cpp(cls, cpp_type: cpp.Type):
+    """Wrap a C++ ESI type with its corresponding Python ESI Type."""
+    instance = cls.__new__(cls)
+    instance._init_from_cpp(cpp_type)
+    return instance
+
+  def _init_from_cpp(self, cpp_type: cpp.Type):
+    """Initialize instance attributes from a C++ type object."""
     self.cpp_type = cpp_type
 
   @property
@@ -86,6 +98,9 @@ class ESIType:
 
 class VoidType(ESIType):
 
+  def __init__(self, id: str):
+    self._init_from_cpp(cpp.VoidType(id))
+
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if obj is not None:
       return (False, f"void type cannot must represented by None, not {obj}")
@@ -110,8 +125,8 @@ __esi_mapping[cpp.VoidType] = VoidType
 
 class BitsType(ESIType):
 
-  def __init__(self, cpp_type: cpp.BitsType):
-    self.cpp_type: cpp.BitsType = cpp_type
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.BitsType(id, width))
 
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if not isinstance(obj, (bytearray, bytes, list)):
@@ -143,8 +158,8 @@ __esi_mapping[cpp.BitsType] = BitsType
 
 class IntType(ESIType):
 
-  def __init__(self, cpp_type: cpp.IntegerType):
-    self.cpp_type: cpp.IntegerType = cpp_type
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.IntegerType(id, width))
 
   @property
   def bit_width(self) -> int:
@@ -153,6 +168,9 @@ class IntType(ESIType):
 
 class UIntType(IntType):
 
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.UIntType(id, width))
+
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if not isinstance(obj, int):
       return (False, f"must be an int, not {type(obj)}")
@@ -176,6 +194,9 @@ __esi_mapping[cpp.UIntType] = UIntType
 
 class SIntType(IntType):
 
+  def __init__(self, id: str, width: int):
+    self._init_from_cpp(cpp.SIntType(id, width))
+
   def is_valid(self, obj) -> Tuple[bool, Optional[str]]:
     if not isinstance(obj, int):
       return (False, f"must be an int, not {type(obj)}")
@@ -203,11 +224,16 @@ __esi_mapping[cpp.SIntType] = SIntType
 
 class StructType(ESIType):
 
-  def __init__(self, cpp_type: cpp.StructType):
-    self.cpp_type = cpp_type
-    self.fields: List[Tuple[str, ESIType]] = [
-        (name, _get_esi_type(ty)) for (name, ty) in cpp_type.fields
-    ]
+  def __init__(self, id: str, fields: List[Tuple[str, "ESIType"]]):
+    # Convert Python ESIType fields to cpp Type fields
+    cpp_fields = [(name, field_type.cpp_type) for name, field_type in fields]
+    self._init_from_cpp(cpp.StructType(id, cpp_fields))
+
+  def _init_from_cpp(self, cpp_type: cpp.StructType):
+    """Initialize instance attributes from a C++ type object."""
+    super()._init_from_cpp(cpp_type)
+    # For wrap_cpp path, we need to convert C++ fields back to Python
+    self.fields = [(name, _get_esi_type(ty)) for (name, ty) in cpp_type.fields]
 
   @property
   def bit_width(self) -> int:
@@ -252,8 +278,12 @@ __esi_mapping[cpp.StructType] = StructType
 
 class ArrayType(ESIType):
 
-  def __init__(self, cpp_type: cpp.ArrayType):
-    self.cpp_type = cpp_type
+  def __init__(self, id: str, element_type: "ESIType", size: int):
+    self._init_from_cpp(cpp.ArrayType(id, element_type.cpp_type, size))
+
+  def _init_from_cpp(self, cpp_type: cpp.ArrayType):
+    """Initialize instance attributes from a C++ type object."""
+    super()._init_from_cpp(cpp_type)
     self.element_type = _get_esi_type(cpp_type.element)
     self.size = cpp_type.size
 

{esiaccel-0.1.5.dev52.dist-info → esiaccel-0.1.5.dev66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esiaccel
-Version: 0.1.5.dev52
+Version: 0.1.5.dev66
 Summary: ESI accelerators runtime
 Author-email: John Demme <John.Demme@microsoft.com>
 License: ==============================================================================

{esiaccel-0.1.5.dev52.dist-info → esiaccel-0.1.5.dev66.dist-info}/RECORD

@@ -1,18 +1,18 @@
-esiaccel/CosimBackend.dll,sha256=h1YXdHiAZkymlm9dTciu18YHb7Ixwf3QlLba9fGHuWM,7150592
+esiaccel/CosimBackend.dll,sha256=bX051HSQMyD0DoBCav5GT9MppSzn260PGQhIt-8gl3U,7150592
 esiaccel/CosimBackend.lib,sha256=8Fyulmz95ENysUTuD0iZJQvYbSmut971I2rTbIrFBzM,4991546
-esiaccel/ESICppRuntime.dll,sha256=4kLb-ctyQ10Mftkn5d09r898k3oYJvzYB24nWSH8aSQ,3721728
-esiaccel/ESICppRuntime.lib,sha256=K2p6iiiJhsJQXETksMzrjX-6hQqd6WZquNB3F5DAy7w,14530116
-esiaccel/EsiCosimDpiServer.dll,sha256=2G5KW34JHtz9zefFaeURzqBan-CNxsEfYMimZi0J72o,159744
+esiaccel/ESICppRuntime.dll,sha256=IWfPbyIZa0-w5UN9rTLks1wn-JZdrmMWoVe-RRUvUFw,3721728
+esiaccel/ESICppRuntime.lib,sha256=6x7L5j_dXvWvnVQqtk7mYYWWECCf7dsiHYtx21_-hDA,14530116
+esiaccel/EsiCosimDpiServer.dll,sha256=51ZAGpq65Jjmijpmmz4BmuM6mQE-NeSi1Kp6U9ye8TI,159744
 esiaccel/EsiCosimDpiServer.lib,sha256=MoMCezJdQ9qhdHtUicRVY7CrmYWfUwM2zK8flQxz5pY,604164
-esiaccel/MtiPli.dll,sha256=ePnQ7Jhmi1haOyiUPTUzdGIg6dUjwhiJvQ3jxsfKGN8,14848
+esiaccel/MtiPli.dll,sha256=J2fT1AqfnZt-OuwYy35v-FnSyXvKXsKAio4DvA3d4O8,14848
 esiaccel/MtiPli.lib,sha256=ZhsT1gjT0a2_jT_SKm_z_RHbFKAZ7kOLJ3U9dfCpjiY,14570
 esiaccel/__init__.py,sha256=C0GLqCQuF5g5qTzmAkf_YAHmBV2XAyiJad3Qz7h8u1g,562
 esiaccel/accelerator.py,sha256=BcXPsUqcQV3YsVVyYbz9P6JnZLlcnuageFbJwID9_3s,3318
 esiaccel/codegen.py,sha256=uoYELtnIabVvgLeCABj-mWras0BvmSKABPH-cd9nDFk,6560
 esiaccel/esi-cosim.py,sha256=GwYfNh4aagypheAhGf0EIX6ojkLYKkc5OMlFR9pfXe8,14381
-esiaccel/esiCppAccel.cp313-win_amd64.pyd,sha256=OiH9piQDICIA5-RJqqDd4KULslKMCIE_plIcn-12KSs,462336
-esiaccel/esiquery.exe,sha256=e3FfDhIm9nsGV2u7ZH8DQUbbxa0_zDDHUpoeDZ3FyaY,441856
-esiaccel/types.py,sha256=xR7XbXQ8LqoiiniThYJhqphG813KBNi5d-yHm5bEXtg,17465
+esiaccel/esiCppAccel.cp313-win_amd64.pyd,sha256=2XbzyBB1V1Xe9a89UHyF9K-HuPD3U-lP9WPx7gOkOsg,501760
+esiaccel/esiquery.exe,sha256=YG34jMRm-dyu5Cy30oP-6Q4_VK2rSg91oD5nYVBJSrk,441856
+esiaccel/types.py,sha256=LtBYmpmSBlzbB-f_4XqcptmseqI6Q0ibnNWJT3G-GI8,18696
 esiaccel/utils.py,sha256=0_A8Jw3M7mjvjTHeV6u00tvRWxLnWKdFq_6NFKTgbVk,1296
 esiaccel/cmake/esiaccelConfig.cmake,sha256=u2aW99k1lEcmYTG1P3BTJqtmDrj53wUUaBz_jzw8kYY,565
 esiaccel/cosim/Cosim_DpiPkg.sv,sha256=9qGn1VyAVrzBP5At1thV6xrovg0WghICD01Zz9J221E,3458
@@ -35,9 +35,9 @@ esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,
 esiaccel/include/esi/backends/Cosim.h,sha256=s7vYd0ra6m1nvk-n37MjvBoGVI-CCUKBt0DU4PKlaHM,2838
 esiaccel/include/esi/backends/RpcServer.h,sha256=WMwnhwU2qnrcglGNeiKg9QQHpkDx1QE1JydKYDK4jqE,1856
 esiaccel/include/esi/backends/Trace.h,sha256=kx4wwLH3a0ndmRUdaDyYGZ1SP83zlpFrk30Nw8ZrJJA,3286
-esiaccel-0.1.5.dev52.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.1.5.dev52.dist-info/METADATA,sha256=kq4nyvqQ7ubysprTBSONL9J10mQECPAW-v6QPPd8_30,16147
-esiaccel-0.1.5.dev52.dist-info/WHEEL,sha256=qV0EIPljj1XC_vuSatRWjn02nZIz3N1t8jsZz7HBr2U,101
-esiaccel-0.1.5.dev52.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
-esiaccel-0.1.5.dev52.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
-esiaccel-0.1.5.dev52.dist-info/RECORD,,
+esiaccel-0.1.5.dev66.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.1.5.dev66.dist-info/METADATA,sha256=m-lVIoMZORN2P2-Q2KBb8r7QdEa2Mpr0TuIWR3nsOP4,16147
+esiaccel-0.1.5.dev66.dist-info/WHEEL,sha256=qV0EIPljj1XC_vuSatRWjn02nZIz3N1t8jsZz7HBr2U,101
+esiaccel-0.1.5.dev66.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.1.5.dev66.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.1.5.dev66.dist-info/RECORD,,