esiaccel 0.1.3.dev254__cp310-cp310-win_amd64.whl → 0.1.4.dev14__cp310-cp310-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

@@ -105,13 +105,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

@@ -284,6 +284,7 @@ public:
     std::mutex callMutex;
     WriteChannelPort *arg;
     ReadChannelPort *result;
+    bool connected = false;
   };
 
 private:
@@ -307,8 +308,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-0.1.3.dev254.dist-info → esiaccel-0.1.4.dev14.dist-info}/METADATA

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

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

@@ -1,16 +1,16 @@
-esiaccel/CosimBackend.dll,sha256=CFS3YKUCR8YUeT01Q1RYcjq2ihX6Etu2yhzO0yTc3Lg,7150080
-esiaccel/CosimBackend.lib,sha256=z37_AHWOiyR9xHPZscK4K6LwDyIQ2PMDohocFPetJ1o,4991546
-esiaccel/ESICppRuntime.dll,sha256=snEnx_QTC9fzwrUKo3VC0RLWLRRLYDSml-UWn-T7auk,3682304
-esiaccel/ESICppRuntime.lib,sha256=40kY9ZKIA30oXrlCWDuIjIlFe9fjjOlUOvsXqflZ4b8,14489550
+esiaccel/CosimBackend.dll,sha256=2ROEJKJI2yeZa1RgDO4HLKwVrHbizo4qRu5oJh9J5Y8,7150592
+esiaccel/CosimBackend.lib,sha256=2qSqISOnyefgUZQPnUoDyDzkpcQVnCf-fjyqLb6aINI,4991546
+esiaccel/ESICppRuntime.dll,sha256=atnDgZGEZzugqrSTsXxM9WuJ90YPM1_vuriApUrCl70,3682304
+esiaccel/ESICppRuntime.lib,sha256=0IylTM7GptXB8Uhwuk4sISzwTnpKfncShSswrVRWgHE,14489550
 esiaccel/__init__.py,sha256=C0GLqCQuF5g5qTzmAkf_YAHmBV2XAyiJad3Qz7h8u1g,562
-esiaccel/accelerator.py,sha256=GM2FRZF_8nzAJ_7TSRSw_kaJCYWCHMK-cQD8ZZU8QVs,3071
+esiaccel/accelerator.py,sha256=BcXPsUqcQV3YsVVyYbz9P6JnZLlcnuageFbJwID9_3s,3318
 esiaccel/codegen.py,sha256=uoYELtnIabVvgLeCABj-mWras0BvmSKABPH-cd9nDFk,6560
-esiaccel/esiCppAccel.cp310-win_amd64.pyd,sha256=wIYYNfbRrZ4ge5Rlua5v5kC2RHpkpLkw1abrLb4Nt3w,449536
-esiaccel/types.py,sha256=gfUgrX67KYFruX5xsj_wLNJCdwczzLpseyH71M86pW0,17047
+esiaccel/esiCppAccel.cp310-win_amd64.pyd,sha256=B8PCXDAcwjeQiTPgw74iuc5KYbeczoyWgg5sWWIonQ8,453120
+esiaccel/types.py,sha256=xR7XbXQ8LqoiiniThYJhqphG813KBNi5d-yHm5bEXtg,17465
 esiaccel/utils.py,sha256=nzar3WALJC_RfmM5v0GeUev5So1-EAYuAMxG9jLj3eQ,1062
-esiaccel/zlib1.dll,sha256=aFqKQis-sH15exkZwVqpPuVd7jXbn0EuDgflPTkv0Mw,90112
+esiaccel/zlib1.dll,sha256=GdCarfwUvifr_s2rzmL3n5d_FITYj3Kthg37c6YQP4w,90112
 esiaccel/bin/esi-cosim.py,sha256=GwYfNh4aagypheAhGf0EIX6ojkLYKkc5OMlFR9pfXe8,14381
-esiaccel/bin/esiquery.exe,sha256=nX5Lbh0la1SfERNFnSqk5Om41AykvMJneCL2nPzyjAI,441856
+esiaccel/bin/esiquery.exe,sha256=9aO4B2fSsa9SBdkpl_nlof4Ti72bBXGYDDOADpRrJOQ,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
@@ -19,26 +19,26 @@ esiaccel/cosim/driver.cpp,sha256=DrEKkSN7Y_Hu7wcaUulH5mbC2L4yB9xLClRMeRUpzHM,384
 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/Common.h,sha256=PKoDU2y2q5zwfeyjW5jfHqRiP6NGPOF3Wn3aOHdmWvM,5468
 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/Services.h,sha256=THgEbqNOuUIo1nonFFVsy_7H58GvPKP0Yw6i-ySPWBA,14782
 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=1MynTzOLdoGWRuNVgq41jkxqikulNPA_YxUG84cFUbo,159744
-esiaccel/lib/EsiCosimDpiServer.lib,sha256=ocuz8E7M9lqKKs28TQGykLVCDbsXgUj2OS_5TYsYVp8,604164
-esiaccel/lib/MtiPli.dll,sha256=kM6gYQreNwOl1Sj1GYsjXc_qDgw13I6TvCsTkXV1zuw,14848
-esiaccel/lib/MtiPli.lib,sha256=mvcL2Bmst64ac3JSSzCpr31ke3MUPFxNXcAhdVmgdq4,14570
-esiaccel-0.1.3.dev254.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.1.3.dev254.dist-info/METADATA,sha256=mOFUAglmKQpYsdsfbbVSZUot0fYxkgcJd-08Vbr2Mj8,16148
-esiaccel-0.1.3.dev254.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-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,,
+esiaccel/lib/EsiCosimDpiServer.dll,sha256=U8DKOtQyhu1ddghit0ek_FWEeLc64KrIHw57BQQjAd8,159744
+esiaccel/lib/EsiCosimDpiServer.lib,sha256=eFEv_EO7-u7vxUTbURwj0d5rwHNoncITR9P2qJAE1Vk,604164
+esiaccel/lib/MtiPli.dll,sha256=_PC1fd9fbi0O3gWe_wpS2eKMvvJVzMf_769Qgkyg5Ys,14848
+esiaccel/lib/MtiPli.lib,sha256=0vBNn5m9C3ulbl8UJ83c0tuxZAKVrB6_B1bQmBE5jc0,14570
+esiaccel-0.1.4.dev14.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.1.4.dev14.dist-info/METADATA,sha256=mJ1x3H02wk60DAAYF_OYohX29tNA8WdoiEzo0vCSaH8,16147
+esiaccel-0.1.4.dev14.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+esiaccel-0.1.4.dev14.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.1.4.dev14.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.1.4.dev14.dist-info/RECORD,,