esiaccel 0.1.5.dev104__cp312-cp312-win_amd64.whl → 0.1.5.dev109__cp312-cp312-win_amd64.whl

esiaccel/include/esi/Common.h

@@ -20,6 +20,7 @@
 #include <cstdint>
 #include <map>
 #include <optional>
+#include <span>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -115,6 +116,11 @@ public:
   /// Get the data as a vector of bytes.
   const std::vector<uint8_t> &getData() const { return data; }
 
+  /// Implicit conversion to a vector/span of bytes, to play nice with other
+  /// APIs that accept bytearray-like things.
+  operator const std::vector<uint8_t> &() const { return data; }
+  operator std::span<const uint8_t>() const { return data; }
+
   /// Move the data out of this object.
   std::vector<uint8_t> takeData() { return std::move(data); }
 

esiaccel/include/esi/Services.h

@@ -271,13 +271,20 @@ public:
     void connect();
     std::future<MessageData> call(const MessageData &arg);
 
+    const esi::Type *getArgType() const {
+      return dynamic_cast<const ChannelType *>(type->findChannel("arg").first)
+          ->getInner();
+    }
+
+    const esi::Type *getResultType() const {
+      return dynamic_cast<const ChannelType *>(
+                 type->findChannel("result").first)
+          ->getInner();
+    }
+
     virtual std::optional<std::string> toString() const override {
-      const esi::Type *argType =
-          dynamic_cast<const ChannelType *>(type->findChannel("arg").first)
-              ->getInner();
-      const esi::Type *resultType =
-          dynamic_cast<const ChannelType *>(type->findChannel("result").first)
-              ->getInner();
+      const esi::Type *argType = getArgType();
+      const esi::Type *resultType = getResultType();
       return "function " + resultType->getID() + "(" + argType->getID() + ")";
     }
 
@@ -320,13 +327,20 @@ public:
     void connect(std::function<MessageData(const MessageData &)> callback,
                  bool quick = false);
 
+    const esi::Type *getArgType() const {
+      return dynamic_cast<const ChannelType *>(type->findChannel("arg").first)
+          ->getInner();
+    }
+
+    const esi::Type *getResultType() const {
+      return dynamic_cast<const ChannelType *>(
+                 type->findChannel("result").first)
+          ->getInner();
+    }
+
     virtual std::optional<std::string> toString() const override {
-      const esi::Type *argType =
-          dynamic_cast<const ChannelType *>(type->findChannel("arg").first)
-              ->getInner();
-      const esi::Type *resultType =
-          dynamic_cast<const ChannelType *>(type->findChannel("result").first)
-              ->getInner();
+      const esi::Type *argType = getArgType();
+      const esi::Type *resultType = getResultType();
       return "callback " + resultType->getID() + "(" + argType->getID() + ")";
     }
 

esiaccel/include/esi/Types.h

@@ -16,11 +16,17 @@
 #ifndef ESI_TYPES_H
 #define ESI_TYPES_H
 
+#include <algorithm>
+#include <any>
 #include <cstdint>
 #include <map>
+#include <span>
+#include <stdexcept>
 #include <string>
 #include <vector>
 
+#include "esi/Common.h"
+
 namespace esi {
 
 /// Root class of the ESI type system.
@@ -33,6 +39,37 @@ public:
   ID getID() const { return id; }
   virtual std::ptrdiff_t getBitWidth() const { return -1; }
 
+  /// Serialize an object to MessageData. The object should be passed as a
+  /// std::any to provide type erasure. Returns a MessageData containing the
+  /// serialized representation.
+  virtual MessageData serialize(const std::any &obj) const {
+    throw std::runtime_error("Serialization not implemented for type " + id);
+  }
+
+  /// Deserialize from a span of bytes to an object. Returns the deserialized
+  /// object as a std::any and a span to the remaining bytes.
+  virtual std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const {
+    throw std::runtime_error("Deserialization not implemented for type " + id);
+  }
+
+  /// Ensure that a std::any object is valid for this type. Throws
+  /// std::runtime_error if the object is not valid.
+  virtual void ensureValid(const std::any &obj) const {
+    throw std::runtime_error("Validation not implemented for type " + id);
+  }
+
+  // Check if a std::any object is valid for this type. Returns an optional
+  // error message if the object is not valid, else, std::nullopt.
+  std::optional<std::string> isValid(const std::any &obj) const {
+    try {
+      ensureValid(obj);
+      return std::nullopt;
+    } catch (const std::runtime_error &e) {
+      return e.what();
+    }
+  }
+
 protected:
   ID id;
 };
@@ -54,12 +91,7 @@ public:
   const ChannelVector &getChannels() const { return channels; }
   std::ptrdiff_t getBitWidth() const override { return -1; };
 
-  std::pair<const Type *, Direction> findChannel(std::string name) const {
-    for (auto [channelName, dir, type] : channels)
-      if (channelName == name)
-        return std::make_pair(type, dir);
-    throw std::runtime_error("Channel '" + name + "' not found in bundle");
-  }
+  std::pair<const Type *, Direction> findChannel(std::string name) const;
 
 protected:
   ChannelVector channels;
@@ -73,6 +105,11 @@ public:
   const Type *getInner() const { return inner; }
   std::ptrdiff_t getBitWidth() const override { return inner->getBitWidth(); };
 
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
+
 private:
   const Type *inner;
 };
@@ -83,6 +120,11 @@ public:
   VoidType(const ID &id) : Type(id) {}
   // 'void' is 1 bit by convention.
   std::ptrdiff_t getBitWidth() const override { return 1; };
+
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
 };
 
 /// The "any" type is a special type which can be used to represent any type, as
@@ -112,6 +154,11 @@ private:
 class BitsType : public BitVectorType {
 public:
   using BitVectorType::BitVectorType;
+
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
 };
 
 /// Integers are bit vectors which may be signed or unsigned and are interpreted
@@ -125,12 +172,22 @@ public:
 class SIntType : public IntegerType {
 public:
   using IntegerType::IntegerType;
+
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
 };
 
 /// Unsigned integer.
 class UIntType : public IntegerType {
 public:
   using IntegerType::IntegerType;
+
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
 };
 
 /// Structs are an ordered collection of fields, each with a name and a type.
@@ -153,6 +210,11 @@ public:
     return size;
   }
 
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
+
   // Returns whether this struct type should be reversed when
   // serializing/deserializing.
   // By default, a truthy value here makes StructType's compatible with system
@@ -180,6 +242,11 @@ public:
     return elementSize * size;
   }
 
+  void ensureValid(const std::any &obj) const override;
+  MessageData serialize(const std::any &obj) const override;
+  std::pair<std::any, std::span<const uint8_t>>
+  deserialize(std::span<const uint8_t> data) const override;
+
 private:
   const Type *elementType;
   uint64_t size;

{esiaccel-0.1.5.dev104.dist-info → esiaccel-0.1.5.dev109.dist-info}/METADATA

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

{esiaccel-0.1.5.dev104.dist-info → esiaccel-0.1.5.dev109.dist-info}/RECORD

@@ -1,17 +1,17 @@
-esiaccel/CosimBackend.dll,sha256=RlSIvtBDE5dzjEF1jXUAx_gBNmU0SuluzFqzWpOC2SA,7150592
-esiaccel/CosimBackend.lib,sha256=LtcEhVi75BqE9pNbUTxOoSFvcjI954tz7VmdsBTaoLY,4991556
-esiaccel/ESICppRuntime.dll,sha256=uJlwV3UUIM0D1Lge2qT2a9ITPoGarMLmAH6IIhDwkrY,3722240
-esiaccel/ESICppRuntime.lib,sha256=jIEtwRR_6zJuM_eXeRTQYjBwp4CPp2ghYt9gGNQFwyU,14530126
-esiaccel/EsiCosimDpiServer.dll,sha256=T4URtspzmd2TU_6ZNGvOr_rrdA4JCBU8CSTvgLdy2TA,159744
+esiaccel/CosimBackend.dll,sha256=-1oGeoxlOYFfyAvR1LHXgKJWiLCMlMe8tqSAeQTi1dw,7152128
+esiaccel/CosimBackend.lib,sha256=UjflmgR93Kl22Du0lTqGhXWQqWEF-V8VwcqUuFo8GNk,4992924
+esiaccel/ESICppRuntime.dll,sha256=opmZcZKYp0_9m_fFyHVG_iE4vGoBz3r_7vcSkw2tbEs,4072448
+esiaccel/ESICppRuntime.lib,sha256=iTs8qJpIEH_7g-nMYZZGJbNrA1zekEwuTUAZfqUlmic,15139758
+esiaccel/EsiCosimDpiServer.dll,sha256=HnJAX8hzB5xxfov1Lwf_ERLp556zDE58GUyjWU-dxN8,159744
 esiaccel/EsiCosimDpiServer.lib,sha256=bYBigD0RtRRSEiDxf4_gvpasLjD8fcUmC0CjRgQiQ0s,604164
-esiaccel/MtiPli.dll,sha256=xLnlKLEynXJbw8clNzNyWgVRPIQYLKjENsckwrrrCss,14848
+esiaccel/MtiPli.dll,sha256=kDuEa8gesoGeIYw_oSksfyT_UcLNWH8_kZ3ZyTyYdHE,14848
 esiaccel/MtiPli.lib,sha256=X0PcXwheCUvBMgQ5BAawePxbXQSLNk5M1FFn6V56ydo,14570
 esiaccel/__init__.py,sha256=65xXWHwJwRePsyhWk837NpzuN0qsNhoAX29TOiSYKGc,905
 esiaccel/accelerator.py,sha256=BcXPsUqcQV3YsVVyYbz9P6JnZLlcnuageFbJwID9_3s,3318
 esiaccel/codegen.py,sha256=uoYELtnIabVvgLeCABj-mWras0BvmSKABPH-cd9nDFk,6560
 esiaccel/esi-cosim.py,sha256=GwYfNh4aagypheAhGf0EIX6ojkLYKkc5OMlFR9pfXe8,14381
-esiaccel/esiCppAccel.cp312-win_amd64.pyd,sha256=PYuBuXHkscH2NLrlFvoj_D7ccyMeXqXtSPUVRUcFyoU,507904
-esiaccel/esiquery.exe,sha256=7MhugVtsTGg4wEsdee7vZydWkJOBTQhGOmmYXioGWNs,441856
+esiaccel/esiCppAccel.cp312-win_amd64.pyd,sha256=l9kElbUnVooP05MpHdqiibjuyWjAFwZnn3X5VNF1Rds,510976
+esiaccel/esiquery.exe,sha256=k0Xxj_FLyuhBvWhWZpfA6bVQ1bNlARPULQrpUMF5DVA,441856
 esiaccel/types.py,sha256=LFLzUCvtYF6FLsmKet6eJTMq2ija2Z5kxd5Ks6tkS4U,19044
 esiaccel/utils.py,sha256=q-8fmgJ9tUvmBsIvqZiZ7u845IJhOjvjYTQLhhrNYl0,1515
 esiaccel/cmake/esiaccelConfig.cmake,sha256=u2aW99k1lEcmYTG1P3BTJqtmDrj53wUUaBz_jzw8kYY,565
@@ -22,22 +22,22 @@ 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=pR2cqBEgKRYeJsHatjE7MC5WAw9SGbcO-JOyIGjIwF8,5503
+esiaccel/include/esi/Common.h,sha256=IGJvAU72dlearXFbSmlXFFriy8aomirp7opEBjgewek,5775
 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=05nnhCXvStzCy436UM4LA6Z6N9jHgHUJgGcP5CWHQY0,5859
+esiaccel/include/esi/Services.h,sha256=hv_asloGwIVcgoCjtYubfBvb-UJbU_GQKoZW464BYn8,15125
+esiaccel/include/esi/Types.h,sha256=zAwdD24BtXFXMBNCkEy59pQ0r_NLM4GyxqIgjWuQ6ac,8675
 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.5.dev104.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.1.5.dev104.dist-info/METADATA,sha256=swcP5O3aZB-EDQxTAXzd7KNZDFebItz5aaHCmwicAMo,16148
-esiaccel-0.1.5.dev104.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-esiaccel-0.1.5.dev104.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
-esiaccel-0.1.5.dev104.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
-esiaccel-0.1.5.dev104.dist-info/RECORD,,
+esiaccel-0.1.5.dev109.dist-info/licenses/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.1.5.dev109.dist-info/METADATA,sha256=QuApKX402-OL_r3eLeumWbqiJCa8nnEt_k1h-0y97IE,16148
+esiaccel-0.1.5.dev109.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+esiaccel-0.1.5.dev109.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.1.5.dev109.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.1.5.dev109.dist-info/RECORD,,