esiaccel 0.0.17.dev618__cp311-cp311-win_amd64.whl → 0.0.17.dev664__cp311-cp311-win_amd64.whl

esiaccel/include/esi/Accelerator.h

@@ -133,6 +133,13 @@ public:
     return clientEngines[id];
   }
 
+  Accelerator &getAccelerator() {
+    if (!ownedAccelerator)
+      throw std::runtime_error(
+          "AcceleratorConnection does not own an accelerator");
+    return *ownedAccelerator;
+  }
+
 protected:
   /// If `createEngine` is overridden, this method should be called to register
   /// the engine and all of the channels it services.
@@ -163,9 +170,8 @@ private:
 
   std::unique_ptr<AcceleratorServiceThread> serviceThread;
 
-  /// List of accelerator objects owned by this connection. These are destroyed
-  /// when the connection dies or is shutdown.
-  std::vector<std::unique_ptr<Accelerator>> ownedAccelerators;
+  /// Accelerator object owned by this connection.
+  std::unique_ptr<Accelerator> ownedAccelerator;
 };
 
 namespace registry {

esiaccel/include/esi/CLI.h

@@ -0,0 +1,71 @@
+//===- CLI.h - ESI runtime tool CLI parser common ---------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains the common CLI parser code for ESI runtime tools. Exposed
+// publicly so that out-of-tree tools can use it. This is a header-only library
+// to make compilation easier for out-of-tree tools.
+//
+// DO NOT EDIT!
+// This file is distributed as part of an ESI package. The source for this file
+// should always be modified within CIRCT (lib/dialect/ESI/runtime/cpp).
+//
+//===----------------------------------------------------------------------===//
+
+// NOLINTNEXTLINE(llvm-header-guard)
+#ifndef ESI_CLI_H
+#define ESI_CLI_H
+
+#include "CLI/CLI.hpp"
+#include "esi/Context.h"
+
+namespace esi {
+
+/// Common options and code for ESI runtime tools.
+class CliParser : public CLI::App {
+public:
+  CliParser(const std::string &toolName)
+      : CLI::App(toolName), debug(false), verbose(false) {
+    add_option("backend", backend, "Backend to use for connection")->required();
+    add_option("connection", connStr,
+               "Connection string to use for accelerator communication")
+        ->required();
+    add_flag("--debug", debug, "Enable debug logging");
+    add_flag("-v,--verbose", verbose, "Enable verbose (info) logging");
+    require_subcommand(0, 1);
+  }
+
+  /// Run the parser.
+  int esiParse(int argc, const char **argv) {
+    CLI11_PARSE(*this, argc, argv);
+    if (debug)
+      ctxt = Context::withLogger<ConsoleLogger>(Logger::Level::Debug);
+    else if (verbose)
+      ctxt = Context::withLogger<ConsoleLogger>(Logger::Level::Info);
+    return 0;
+  }
+
+  /// Connect to the accelerator using the specified backend and connection.
+  std::unique_ptr<AcceleratorConnection> connect() {
+    return ctxt.connect(backend, connStr);
+  }
+
+  /// Get the context.
+  Context &getContext() { return ctxt; }
+
+protected:
+  Context ctxt;
+
+  std::string backend;
+  std::string connStr;
+  bool debug;
+  bool verbose;
+};
+
+} // namespace esi
+
+#endif // ESI_CLI_H

esiaccel/include/esi/Context.h

@@ -30,7 +30,7 @@ class AcceleratorConnection;
 /// context. It owns all the types, uniquifying them.
 class Context {
 public:
-  Context() : logger(std::make_unique<NullLogger>()) {}
+  Context() : logger(std::make_unique<ConsoleLogger>(Logger::Level::Warning)) {}
   Context(std::unique_ptr<Logger> logger) : logger(std::move(logger)) {}
 
   /// Create a context with a specific logger type.

esiaccel/include/esi/Design.h

@@ -73,9 +73,7 @@ public:
     return ret;
   }
   /// Access the module's ports by ID.
-  const std::map<AppID, const BundlePort &> &getPorts() const {
-    return portIndex;
-  }
+  const std::map<AppID, BundlePort &> &getPorts() const { return portIndex; }
   /// Access the services provided by this module.
   const std::vector<services::Service *> &getServices() const {
     return services;
@@ -86,13 +84,22 @@ public:
   /// the `poll` calls returns true.
   bool poll();
 
+  /// Attempt to resolve a path to a module instance. If a child is not found,
+  /// return null and set lastLookup to the path which wasn't found.
+  const HWModule *resolveInst(const AppIDPath &path,
+                              AppIDPath &lastLookup) const;
+
+  /// Attempt to resolve a path to a port. If a child or port is not found,
+  /// return null and set lastLookup to the path which wasn't found.
+  BundlePort *resolvePort(const AppIDPath &path, AppIDPath &lastLookup) const;
+
 protected:
   const std::optional<ModuleInfo> info;
   const std::vector<std::unique_ptr<Instance>> children;
   const std::map<AppID, Instance *> childIndex;
   const std::vector<services::Service *> services;
   const std::vector<std::unique_ptr<BundlePort>> ports;
-  const std::map<AppID, const BundlePort &> portIndex;
+  const std::map<AppID, BundlePort &> portIndex;
 };
 
 /// Subclass of `HWModule` which represents a submodule instance. Adds an AppID,

esiaccel/include/esi/Logging.h

@@ -165,6 +165,20 @@ private:
   std::ostream &errorStream;
 };
 
+/// A logger that writes to the console. Includes color support.
+class ConsoleLogger : public TSLogger {
+public:
+  /// Create a stream logger that logs to stdout, stderr.
+  ConsoleLogger(Level minLevel);
+  void logImpl(Level level, const std::string &subsystem,
+               const std::string &msg,
+               const std::map<std::string, std::any> *details) override;
+
+private:
+  /// The minimum log level to emit.
+  Level minLevel;
+};
+
 /// A logger that does nothing.
 class NullLogger : public Logger {
 public:

{esiaccel-0.0.17.dev618.dist-info → esiaccel-0.0.17.dev664.dist-info}/METADATA

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

esiaccel-0.0.17.dev664.dist-info/RECORD

@@ -0,0 +1,29 @@
+esiaccel/ESICppRuntime.dll,sha256=EgU-J8DQKZyMimMSuJUHFuT0dgEVdrzv1gJQCiB0gS4,3635712
+esiaccel/ESICppRuntime.lib,sha256=XVLmSmDIf_p23vZeN_4VXyLPeA7SfCWxRYmJCrEScy8,14292648
+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.cp311-win_amd64.pyd,sha256=6OZOQ564hORoAYohDpKVhgwJY0r0wrPOU6nuTW69XDI,438784
+esiaccel/types.py,sha256=quV7bQFrweocGVCvwX_8KZd-Wz3Y0Yvi2YGCmihKvZM,15132
+esiaccel/utils.py,sha256=nzar3WALJC_RfmM5v0GeUev5So1-EAYuAMxG9jLj3eQ,1062
+esiaccel/zlib1.dll,sha256=ZghNM5Ou-ExO63kYxhYrfPBa0CgIm96PSAAXFzfZWF8,90624
+esiaccel/bin/esiquery.exe,sha256=riqrGRbzyW-WRwe5F9qZRFIUUPTaWRVBhQK7edFvKoQ,424448
+esiaccel/cmake/esiaccelConfig.cmake,sha256=HcLuZRVSMGdr1ln6gsLTfo9iWCsAPf9wVLejnYqnpVE,564
+esiaccel/include/esi/Accelerator.h,sha256=RhkZ2HeMZ0iHc5BkHdDWXoeg9J9lyPQciH5bWq5Qc_w,9772
+esiaccel/include/esi/CLI.h,sha256=hqU1yAsp8tYmqvyeG-Ddi_mO0HxJ89KoQK2y-P6D6aQ,2317
+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/Logging.h,sha256=QUMzkFFIoPg8kERdvBSZ9OisBF_o18qRZm_6N8X-3V4,7441
+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=1bjsDS9JvrONlDTGyxkIXprQL2wGSWIayrlxstyaqw0,13278
+esiaccel/include/esi/Types.h,sha256=P4ExO8-zvm7qQocUmkM_ATIvamxtDZ8JT2ToLkFo1dk,5483
+esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,3061
+esiaccel/include/esi/backends/Trace.h,sha256=kx4wwLH3a0ndmRUdaDyYGZ1SP83zlpFrk30Nw8ZrJJA,3286
+esiaccel-0.0.17.dev664.dist-info/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
+esiaccel-0.0.17.dev664.dist-info/METADATA,sha256=AZJ-GKCEeciMZOmLfHu5V3f38_dGbB_0zTIPUPfoO8o,16128
+esiaccel-0.0.17.dev664.dist-info/WHEEL,sha256=badvNS-y9fEq0X-qzdZYvql_JFjI7Xfw-wR8FsjoK0I,102
+esiaccel-0.0.17.dev664.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
+esiaccel-0.0.17.dev664.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
+esiaccel-0.0.17.dev664.dist-info/RECORD,,

esiaccel-0.0.17.dev618.dist-info/RECORD

@@ -1,28 +0,0 @@
-esiaccel/ESICppRuntime.dll,sha256=61Cz0z8epfekGqAGDmgp2rieYmjK5_UoEGMNzk_ouCQ,3308032
-esiaccel/ESICppRuntime.lib,sha256=-foT3nic2AmfyKYxEDdxuBvmwoHAQJujGyqSjaEqTaU,13455416
-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.cp311-win_amd64.pyd,sha256=2QKBG095WxTEUdx94mTY9H_Ddqme3VC8eW46Jn1pn0U,429568
-esiaccel/types.py,sha256=quV7bQFrweocGVCvwX_8KZd-Wz3Y0Yvi2YGCmihKvZM,15132
-esiaccel/utils.py,sha256=nzar3WALJC_RfmM5v0GeUev5So1-EAYuAMxG9jLj3eQ,1062
-esiaccel/zlib1.dll,sha256=XY625nWryrAljnGQMMb0oDFriqs06it1uArnmy-04ok,90624
-esiaccel/bin/esiquery.exe,sha256=dEQWGfTpFEgNS4q-45OFmJp5QVPrwx5T6KO0SWnW3YI,45056
-esiaccel/cmake/esiaccelConfig.cmake,sha256=HcLuZRVSMGdr1ln6gsLTfo9iWCsAPf9wVLejnYqnpVE,564
-esiaccel/include/esi/Accelerator.h,sha256=s_3bYulDQUBnKYs43oG7r1AMycy588V103tbWFZEwvI,9664
-esiaccel/include/esi/Common.h,sha256=GyB9S4GJn-1K4bZNWi6Fc5ftKsL2Y362QOsNYuCqk6I,5078
-esiaccel/include/esi/Context.h,sha256=0o9desdPYzqTnZWqR74d6Mvg75PnoTAbr7tvJYclubc,2371
-esiaccel/include/esi/Design.h,sha256=DFcmUA7j-xWQO2L0rWnq5Jfc_BDXX90GD92pYS20CpY,4446
-esiaccel/include/esi/Logging.h,sha256=eAN4e_0l1-zKlbScsuwCm9wstjzw5-B8jAiS9EXB_xo,6984
-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=1bjsDS9JvrONlDTGyxkIXprQL2wGSWIayrlxstyaqw0,13278
-esiaccel/include/esi/Types.h,sha256=P4ExO8-zvm7qQocUmkM_ATIvamxtDZ8JT2ToLkFo1dk,5483
-esiaccel/include/esi/Utils.h,sha256=KPd75GajIFeTBVJocXBjwsJqhbZg-ShWZCIe3oQdBss,3061
-esiaccel/include/esi/backends/Trace.h,sha256=kx4wwLH3a0ndmRUdaDyYGZ1SP83zlpFrk30Nw8ZrJJA,3286
-esiaccel-0.0.17.dev618.dist-info/LICENSE,sha256=vtnVnB8_lN1yPYcA5MeT56R8UsQtBhyzZLBvu_KMf7I,13468
-esiaccel-0.0.17.dev618.dist-info/METADATA,sha256=eOgH-qTyEehQrCqRXXQ7zQSNK6UHKve0d3-Z0oVr6bo,16128
-esiaccel-0.0.17.dev618.dist-info/WHEEL,sha256=badvNS-y9fEq0X-qzdZYvql_JFjI7Xfw-wR8FsjoK0I,102
-esiaccel-0.0.17.dev618.dist-info/entry_points.txt,sha256=_CuNLV0fyTURxRREFwpzGycifZW_-7-MyuJNEwKK9J8,137
-esiaccel-0.0.17.dev618.dist-info/top_level.txt,sha256=fYWTWMDK4PDu4ePQ9NtcFHas2k8-d1kWhTs2avPpgB4,9
-esiaccel-0.0.17.dev618.dist-info/RECORD,,