esiaccel 0.1.3.dev254__cp38-cp38-win_amd64.whl → 0.1.4__cp38-cp38-win_amd64.whl

esiaccel/accelerator.py

@@ -41,6 +41,13 @@ class AcceleratorConnection:
   def get_service_hostmem(self) -> cpp.HostMem:
     return self.cpp_accel.get_service_hostmem()
 
+  def get_accelerator(self) -> "Accelerator":
+    """
+    Return an accelerator that may be owned by this accelerator connection.
+    If no accelerator is owned, will throw.
+    """
+    return Accelerator(self.cpp_accel.get_accelerator())
+
 
 from .esiCppAccel import HostMemOptions
 

esiaccel/include/esi/Common.h

@@ -49,7 +49,8 @@ class AppIDPath : public std::vector<AppID> {
 public:
   using std::vector<AppID>::vector;
 
-  AppIDPath operator+(const AppIDPath &b);
+  AppIDPath operator+(const AppIDPath &b) const;
+  AppIDPath parent() const;
   std::string toStr() const;
 };
 bool operator<(const AppIDPath &a, const AppIDPath &b);
@@ -105,13 +106,24 @@ public:
   /// Adopts the data vector buffer.
   MessageData() = default;
   MessageData(std::vector<uint8_t> &data) : data(std::move(data)) {}
+  MessageData(std::vector<uint8_t> &&data) : data(std::move(data)) {}
   MessageData(const uint8_t *data, size_t size) : data(data, data + size) {}
   ~MessageData() = default;
 
   const uint8_t *getBytes() const { return data.data(); }
+
+  /// Get the data as a vector of bytes.
+  const std::vector<uint8_t> &getData() const { return data; }
+
+  /// Move the data out of this object.
+  std::vector<uint8_t> takeData() { return std::move(data); }
+
   /// Get the size of the data in bytes.
   size_t getSize() const { return data.size(); }
 
+  /// Returns true if this message contains no data.
+  bool empty() const { return data.empty(); }
+
   /// Cast to a type. Throws if the size of the data does not match the size of
   /// the message. The lifetime of the resulting pointer is tied to the lifetime
   /// of this object.

esiaccel/include/esi/Services.h

@@ -124,7 +124,8 @@ public:
     uint32_t size;
   };
 
-  MMIO(AcceleratorConnection &, const HWClientDetails &clients);
+  MMIO(AcceleratorConnection &, const AppIDPath &idPath,
+       const HWClientDetails &clients);
   virtual ~MMIO() = default;
 
   /// Read a 64-bit value from the global MMIO space.
@@ -284,6 +285,7 @@ public:
     std::mutex callMutex;
     WriteChannelPort *arg;
     ReadChannelPort *result;
+    bool connected = false;
   };
 
 private:
@@ -307,8 +309,9 @@ public:
              PortMap channels);
 
   public:
-    static Callback *get(AcceleratorConnection &acc, AppID id, BundleType *type,
-                         WriteChannelPort &result, ReadChannelPort &arg);
+    static Callback *get(AcceleratorConnection &acc, AppID id,
+                         const BundleType *type, WriteChannelPort &result,
+                         ReadChannelPort &arg);
 
     /// Connect a callback to code which will be executed when the accelerator
     /// invokes the callback. The 'quick' flag indicates that the callback is

esiaccel/types.py

@@ -448,14 +448,27 @@ class FunctionPort(BundlePort):
     self.cpp_port.connect()
     self.connected = True
 
-  def call(self, **kwargs: Any) -> Future:
+  def call(self, *args: Any, **kwargs: Any) -> Future:
     """Call the function with the given argument and returns a future of the
     result."""
-    valid, reason = self.arg_type.is_valid(kwargs)
+
+    # Accept either positional or keyword arguments, but not both.
+    if len(args) > 0 and len(kwargs) > 0:
+      raise ValueError("cannot use both positional and keyword arguments")
+
+    # Handle arguments: for single positional arg, unwrap it from tuple
+    if len(args) == 1:
+      selected = args[0]
+    elif len(args) > 1:
+      selected = args
+    else:
+      selected = kwargs
+
+    valid, reason = self.arg_type.is_valid(selected)
     if not valid:
       raise ValueError(
-          f"'{kwargs}' cannot be converted to '{self.arg_type}': {reason}")
-    arg_bytes: bytearray = self.arg_type.serialize(kwargs)
+          f"'{selected}' cannot be converted to '{self.arg_type}': {reason}")
+    arg_bytes: bytearray = self.arg_type.serialize(selected)
     cpp_future = self.cpp_port.call(arg_bytes)
     return MessageFuture(self.result_type, cpp_future)
 

esiaccel/utils.py

@@ -4,6 +4,7 @@
 
 from . import codegen
 
+import platform
 from pathlib import Path
 import subprocess
 import sys
@@ -13,16 +14,23 @@ _thisdir = Path(__file__).absolute().resolve().parent
 
 def run_esiquery():
   """Run the esiquery executable with the same arguments as this script."""
-  esiquery = _thisdir / "bin" / "esiquery"
+  if platform.system() == "Windows":
+    esiquery = _thisdir / "esiquery.exe"
+  else:
+    esiquery = _thisdir / "bin" / "esiquery"
   return subprocess.call([esiquery] + sys.argv[1:])
 
 
 def run_esi_cosim():
   """Run the esi-cosim.py script with the same arguments as this script."""
   import importlib.util
-  esi_cosim = _thisdir / "bin" / "esi-cosim.py"
+  if platform.system() == "Windows":
+    esi_cosim = _thisdir / "esi-cosim.py"
+  else:
+    esi_cosim = _thisdir / "bin" / "esi-cosim.py"
   spec = importlib.util.spec_from_file_location("esi_cosim", esi_cosim)
   assert spec is not None
+  assert spec.loader is not None
   cosim_import = importlib.util.module_from_spec(spec)
   spec.loader.exec_module(cosim_import)
   return cosim_import.__main__(sys.argv)

{esiaccel-0.1.3.dev254.dist-info → esiaccel-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esiaccel
-Version: 0.1.3.dev254
+Version: 0.1.4
 Summary: ESI accelerators runtime
 Author-email: John Demme <John.Demme@microsoft.com>
 License: ==============================================================================

esiaccel-0.1.4.dist-info/RECORD

@@ -0,0 +1,43 @@
+esiaccel/CosimBackend.dll,sha256=UG_alRaMgxJCqQpBNQtGT1k2J5kSSmK5Hzftw35tYfE,7150592
+esiaccel/CosimBackend.lib,sha256=2qSqISOnyefgUZQPnUoDyDzkpcQVnCf-fjyqLb6aINI,4991546
+esiaccel/ESICppRuntime.dll,sha256=IXhhzqLOI2j9zXfngFkGphVuTqaSYxqcKqNchJ1KQd0,3720192
+esiaccel/ESICppRuntime.lib,sha256=D4u-YAIwkcox2sWcg2glm6fm4iodJ53u-rHZnFKgkec,14529278
+esiaccel/EsiCosimDpiServer.dll,sha256=D2wN_ofaDLv_ChR5-Ullaj-HTZFctKljmw523tD7gXg,159744
+esiaccel/EsiCosimDpiServer.lib,sha256=eFEv_EO7-u7vxUTbURwj0d5rwHNoncITR9P2qJAE1Vk,604164
+esiaccel/MtiPli.dll,sha256=ebqJsDwqSxlIFslOKoeM_ddbwVGnjwydhvoLl41XRII,14848
+esiaccel/MtiPli.lib,sha256=0vBNn5m9C3ulbl8UJ83c0tuxZAKVrB6_B1bQmBE5jc0,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.cp38-win_amd64.pyd,sha256=UJAx0K3Z6fsctGq9NHTzNKZXqXq2bu08_zlVYfXpJqE,453120
+esiaccel/esiquery.exe,sha256=D0f3Kf4ejjaCEyYIMq0qkHciZkCgiAoBZpKEyYNC30U,441856
+esiaccel/types.py,sha256=xR7XbXQ8LqoiiniThYJhqphG813KBNi5d-yHm5bEXtg,17465
+esiaccel/utils.py,sha256=0_A8Jw3M7mjvjTHeV6u00tvRWxLnWKdFq_6NFKTgbVk,1296
+esiaccel/cmake/esiaccelConfig.cmake,sha256=u2aW99k1lEcmYTG1P3BTJqtmDrj53wUUaBz_jzw8kYY,565
+esiaccel/cosim/Cosim_DpiPkg.sv,sha256=9qGn1VyAVrzBP5At1thV6xrovg0WghICD01Zz9J221E,3458
+esiaccel/cosim/Cosim_Endpoint.sv,sha256=ri1fHdkiphe8S2-vm6Ru16rBGYiDiS1c8qeCAsl1diU,6498
+esiaccel/cosim/Cosim_Manifest.sv,sha256=vl9b6XieEkP880IBw1ferekBnDJwFanZZggJJGertXM,1123
+esiaccel/cosim/driver.cpp,sha256=DrEKkSN7Y_Hu7wcaUulH5mbC2L4yB9xLClRMeRUpzHM,3842
+esiaccel/cosim/driver.sv,sha256=ro-j9GM164A1W0MDPkqYfEn3TUKHSqVvgjO31fnloQI,1428
+esiaccel/include/esi/Accelerator.h,sha256=RhkZ2HeMZ0iHc5BkHdDWXoeg9J9lyPQciH5bWq5Qc_w,9772
+esiaccel/include/esi/CLI.h,sha256=Nn8tHn_xtEfkrD7USE2tao6ktYOJ6xcbnhZkS9-ox0A,2540
+esiaccel/include/esi/Common.h,sha256=pR2cqBEgKRYeJsHatjE7MC5WAw9SGbcO-JOyIGjIwF8,5503
+esiaccel/include/esi/Context.h,sha256=Tk_4nBDtTeVY62GfX4Cs_ZMIQstjSgrWHddN_PKANEA,2396
+esiaccel/include/esi/Design.h,sha256=mU8OwpCYijiWSdDq17l45LMzZxBca93nosudWCXNHfQ,4922
+esiaccel/include/esi/Engines.h,sha256=bbGbhXjYMpIpXh_DR0OS57zyGQUIDXh_S7xHX3su0Y0,4831
+esiaccel/include/esi/Logging.h,sha256=sHqMcpp0lNIHkIEyvSm-BBWx4zXXh6NOATCgZpgzYI4,8944
+esiaccel/include/esi/Manifest.h,sha256=j3v9UA0ogtJQBlv6k5s4j_3sCsq-gwF9btVg5dKTBlg,2244
+esiaccel/include/esi/Ports.h,sha256=T2WbPBViUSvFbO5Jjxlcp_eGq9jMitguvNnz3O0564U,10543
+esiaccel/include/esi/Services.h,sha256=H7Iq3F3LivSZHblFJmrC8RAU_MftfKAPDtyGBfJ2nP4,14815
+esiaccel/include/esi/Types.h,sha256=P4ExO8-zvm7qQocUmkM_ATIvamxtDZ8JT2ToLkFo1dk,5483
+esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,3061
+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.4.dist-info/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.1.4.dist-info/METADATA,sha256=resLjPFUg3HTjlGXoMqo83MwJJmXOxNjcOFzXN301wM,16120
+esiaccel-0.1.4.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
+esiaccel-0.1.4.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.1.4.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.1.4.dist-info/RECORD,,

esiaccel-0.1.3.dev254.dist-info/RECORD

@@ -1,44 +0,0 @@
-esiaccel/CosimBackend.dll,sha256=hFDsCQECZRq-yQjYmk4Ez2wovMaDTeqVx1kghx6G-XM,7150080
-esiaccel/CosimBackend.lib,sha256=z37_AHWOiyR9xHPZscK4K6LwDyIQ2PMDohocFPetJ1o,4991546
-esiaccel/ESICppRuntime.dll,sha256=dib6YEfmjFS5KD1xBKqSN1-h2AjCGXrQbjJNgOBKiCg,3682304
-esiaccel/ESICppRuntime.lib,sha256=40kY9ZKIA30oXrlCWDuIjIlFe9fjjOlUOvsXqflZ4b8,14489550
-esiaccel/__init__.py,sha256=C0GLqCQuF5g5qTzmAkf_YAHmBV2XAyiJad3Qz7h8u1g,562
-esiaccel/accelerator.py,sha256=GM2FRZF_8nzAJ_7TSRSw_kaJCYWCHMK-cQD8ZZU8QVs,3071
-esiaccel/codegen.py,sha256=uoYELtnIabVvgLeCABj-mWras0BvmSKABPH-cd9nDFk,6560
-esiaccel/esiCppAccel.cp38-win_amd64.pyd,sha256=1jJYzs5ehdyJ-yGLzMauu0SiMCR9umZAVWBe-_9HG14,449024
-esiaccel/types.py,sha256=gfUgrX67KYFruX5xsj_wLNJCdwczzLpseyH71M86pW0,17047
-esiaccel/utils.py,sha256=nzar3WALJC_RfmM5v0GeUev5So1-EAYuAMxG9jLj3eQ,1062
-esiaccel/zlib1.dll,sha256=H4HhMw5gQhM9VLstW2eiySMSgTPcCznP1Cgj2n-rzaU,90112
-esiaccel/bin/esi-cosim.py,sha256=GwYfNh4aagypheAhGf0EIX6ojkLYKkc5OMlFR9pfXe8,14381
-esiaccel/bin/esiquery.exe,sha256=m-uMb4tmP6JCZj64MmnRl1eDkdJA2oA61xu1FJQ6p-w,441856
-esiaccel/cmake/esiaccelConfig.cmake,sha256=u2aW99k1lEcmYTG1P3BTJqtmDrj53wUUaBz_jzw8kYY,565
-esiaccel/cosim/Cosim_DpiPkg.sv,sha256=9qGn1VyAVrzBP5At1thV6xrovg0WghICD01Zz9J221E,3458
-esiaccel/cosim/Cosim_Endpoint.sv,sha256=ri1fHdkiphe8S2-vm6Ru16rBGYiDiS1c8qeCAsl1diU,6498
-esiaccel/cosim/Cosim_Manifest.sv,sha256=vl9b6XieEkP880IBw1ferekBnDJwFanZZggJJGertXM,1123
-esiaccel/cosim/driver.cpp,sha256=DrEKkSN7Y_Hu7wcaUulH5mbC2L4yB9xLClRMeRUpzHM,3842
-esiaccel/cosim/driver.sv,sha256=ro-j9GM164A1W0MDPkqYfEn3TUKHSqVvgjO31fnloQI,1428
-esiaccel/include/esi/Accelerator.h,sha256=RhkZ2HeMZ0iHc5BkHdDWXoeg9J9lyPQciH5bWq5Qc_w,9772
-esiaccel/include/esi/CLI.h,sha256=Nn8tHn_xtEfkrD7USE2tao6ktYOJ6xcbnhZkS9-ox0A,2540
-esiaccel/include/esi/Common.h,sha256=GyB9S4GJn-1K4bZNWi6Fc5ftKsL2Y362QOsNYuCqk6I,5078
-esiaccel/include/esi/Context.h,sha256=Tk_4nBDtTeVY62GfX4Cs_ZMIQstjSgrWHddN_PKANEA,2396
-esiaccel/include/esi/Design.h,sha256=mU8OwpCYijiWSdDq17l45LMzZxBca93nosudWCXNHfQ,4922
-esiaccel/include/esi/Engines.h,sha256=bbGbhXjYMpIpXh_DR0OS57zyGQUIDXh_S7xHX3su0Y0,4831
-esiaccel/include/esi/Logging.h,sha256=sHqMcpp0lNIHkIEyvSm-BBWx4zXXh6NOATCgZpgzYI4,8944
-esiaccel/include/esi/Manifest.h,sha256=j3v9UA0ogtJQBlv6k5s4j_3sCsq-gwF9btVg5dKTBlg,2244
-esiaccel/include/esi/Ports.h,sha256=T2WbPBViUSvFbO5Jjxlcp_eGq9jMitguvNnz3O0564U,10543
-esiaccel/include/esi/Services.h,sha256=NyeuBxBzmZLpDoikQsjI-ih5FfVivfepZU9Bt8oi0CE,14721
-esiaccel/include/esi/Types.h,sha256=P4ExO8-zvm7qQocUmkM_ATIvamxtDZ8JT2ToLkFo1dk,5483
-esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,3061
-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/lib/EsiCosimDpiServer.dll,sha256=duEhOJGH6aSi90sMt6yUsov033gX1UCfB1LLmyPKEp4,159744
-esiaccel/lib/EsiCosimDpiServer.lib,sha256=ocuz8E7M9lqKKs28TQGykLVCDbsXgUj2OS_5TYsYVp8,604164
-esiaccel/lib/MtiPli.dll,sha256=anYHZ1mIEeUBqlHQyLKr5DbR1ykaR6iL8C9-UFyLNvo,14848
-esiaccel/lib/MtiPli.lib,sha256=mvcL2Bmst64ac3JSSzCpr31ke3MUPFxNXcAhdVmgdq4,14570
-esiaccel-0.1.3.dev254.dist-info/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.1.3.dev254.dist-info/METADATA,sha256=VDCpU24-bu9CFM00wlEuOIY2-raPMbbkpU8IAZwV2cw,16127
-esiaccel-0.1.3.dev254.dist-info/WHEEL,sha256=2M046GvC9RLU1f1TWyM-2sB7cRKLhAC7ucAFK8l8f24,99
-esiaccel-0.1.3.dev254.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
-esiaccel-0.1.3.dev254.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
-esiaccel-0.1.3.dev254.dist-info/RECORD,,