Removing cuda-mlir-runtime dependency on nvqir.

python/utils/LinkedLibraryHolder.h

@@ -13,6 +13,7 @@
 #include "cudaq/Support/TargetConfig.h"
 #include "cudaq/host_config.h"
 #include <filesystem>
+#include <functional>
 #include <map>
 #include <string>
 #include <unordered_map>

runtime/common/AnalogRemoteRESTQPU.h

@@ -54,7 +54,8 @@ class AnalogRemoteRESTQPU : public BaseRemoteRESTQPU {
     std::string strArgs = charArgs;
     nlohmann::json j;
     std::vector<std::size_t> mapping_reorder_idx;
-    codes.emplace_back(name, strArgs, std::nullopt, j, mapping_reorder_idx);
+    codes.emplace_back(name, strArgs, std::nullopt, std::nullopt, j,
+                       mapping_reorder_idx);
 
     if (executionContext) {
       executor->setShots(executionContext->shots);

runtime/common/BaseRemoteRESTQPU.h

@@ -32,7 +32,7 @@
 namespace nvqir {
 // QIR helper to retrieve the output log.
 std::string_view getQirOutputLog();
-cudaq::Resources *getResourceCounts();
+void setResourceCounts(cudaq::Resources &&);
 bool isUsingResourceCounterSimulator();
 } // namespace nvqir
 
@@ -342,7 +342,8 @@ class BaseRemoteRESTQPU : public QPU {
     if (executionContext->name == "resource-count") {
       cudaq::ExecutionContext context("resource-count");
       context.executionManager = cudaq::getDefaultExecutionManager();
-      assert(codes.size() == 1 && codes[0].jit);
+      assert(codes.size() == 1 && codes[0].jit && codes[0].resourceCounts);
+      nvqir::setResourceCounts(std::move(codes[0].resourceCounts.value()));
       cudaq::get_platform().with_execution_context(
           context, [&]() { codes[0].jit->run(kernelName); });
       return;

runtime/common/CMakeLists.txt

@@ -131,8 +131,7 @@ target_include_directories(cudaq-mlir-runtime
     ${CMAKE_SOURCE_DIR}/runtime)
 
 target_link_libraries(cudaq-mlir-runtime
-  PUBLIC
-    nvqir
+  PRIVATE
     CCDialect
     QuakeDialect
     OptCodeGen
@@ -149,7 +148,7 @@ target_link_libraries(cudaq-mlir-runtime
     MLIRTargetLLVMIRExport
     MLIRLLVMCommonConversion
     MLIRLLVMToLLVMIRTranslation
-  PRIVATE
+    cudaq-common
     CUDAQTargetConfigUtil
     cudaq-logger
 )

runtime/common/Compiler.cpp

@@ -44,13 +44,6 @@
 
 using namespace mlir;
 
-namespace nvqir {
-// QIR helper to retrieve the output log.
-std::string_view getQirOutputLog();
-cudaq::Resources *getResourceCounts();
-bool isUsingResourceCounterSimulator();
-} // namespace nvqir
-
 namespace {
 /// Conditionally form an output_names JSON object if this was for QIR
 nlohmann::json formOutputNames(const std::string &codegenTranslation,
@@ -359,14 +352,15 @@ std::vector<cudaq::KernelExecution> Compiler::lowerQuakeCodePart2(
   // We need to run resource counting preprocessing after the pass pipeline as
   // the pre-processing might change the IR structure (may interfere with
   // other passes).
+  std::unique_ptr<Resources> resourceCounts;
   if (executionContext && executionContext->name == "resource-count") {
+    resourceCounts = std::make_unique<Resources>();
     // Each pass may run in a separate thread, so we have to make sure to
     // grab this reference in this thread
-    auto resource_counts = nvqir::getResourceCounts();
     std::function<void(std::string, size_t, size_t)> f =
-        [&](std::string gate, size_t nControls, size_t count) {
+        [&resourceCounts](std::string gate, size_t nControls, size_t count) {
           CUDAQ_INFO("Appending: {}", gate);
-          resource_counts->appendInstruction(gate, nControls, count);
+          resourceCounts->appendInstruction(gate, nControls, count);
         };
     cudaq::opt::ResourceCountPreprocessOptions opt{f};
     mlir::PassManager pm(moduleOp.getContext());
@@ -520,7 +514,11 @@ std::vector<cudaq::KernelExecution> Compiler::lowerQuakeCodePart2(
     auto optionalJit = jitEngines.size() > iter.index()
                            ? std::optional(jitEngines[iter.index()])
                            : std::nullopt;
-    codes.emplace_back(name, codeStr, optionalJit, j, mapping_reorder_idx);
+    auto optionalResourceCounts = resourceCounts
+                                      ? std::optional(*resourceCounts.release())
+                                      : std::nullopt;
+    codes.emplace_back(name, codeStr, optionalJit, optionalResourceCounts, j,
+                       mapping_reorder_idx);
   }
 
   return codes;

runtime/common/Resources.h

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "Trace.h"
 #include <ostream>
 #include <unordered_map>
 #include <vector>
@@ -48,10 +47,6 @@ class Resources {
     bool operator==(const Instruction &other) const;
   };
 
-  Resources() = default;
-  Resources(Resources &) = default;
-  Resources(Resources &&) = default;
-
   /// @brief Return the number of times the given Instruction is
   /// used in the current kernel execution
   std::size_t count(const Instruction &instruction) const;

runtime/common/ServerHelper.h

@@ -12,6 +12,7 @@
 #include "Future.h"
 #include "JIT.h"
 #include "Registry.h"
+#include "Resources.h"
 #include "RuntimeTarget.h"
 #include "SampleResult.h"
 #include "common/RecordLogParser.h"
@@ -31,17 +32,20 @@ struct KernelExecution {
   std::string name;
   std::string code;
   std::optional<JitEngine> jit;
+  std::optional<Resources> resourceCounts;
   nlohmann::json output_names;
   std::vector<std::size_t> mapping_reorder_idx;
   nlohmann::json user_data;
   KernelExecution(std::string &n, std::string &c, std::optional<JitEngine> jit,
-                  nlohmann::json &o, std::vector<std::size_t> &m)
-      : name(n), code(c), jit(jit), output_names(o), mapping_reorder_idx(m) {}
+                  std::optional<Resources> rc, nlohmann::json &o,
+                  std::vector<std::size_t> &m)
+      : name(n), code(c), jit(jit), resourceCounts(rc), output_names(o),
+        mapping_reorder_idx(m) {}
   KernelExecution(std::string &n, std::string &c, std::optional<JitEngine> jit,
-                  nlohmann::json &o, std::vector<std::size_t> &m,
-                  nlohmann::json &ud)
-      : name(n), code(c), jit(jit), output_names(o), mapping_reorder_idx(m),
-        user_data(ud) {}
+                  std::optional<Resources> rc, nlohmann::json &o,
+                  std::vector<std::size_t> &m, nlohmann::json &ud)
+      : name(n), code(c), jit(jit), resourceCounts(rc), output_names(o),
+        mapping_reorder_idx(m), user_data(ud) {}
 };
 
 /// @brief Responses / Submissions to the Server are modeled via JSON

runtime/cudaq/algorithms/resource_estimation.h

@@ -17,6 +17,7 @@ void switchToResourceCounterSimulator();
 void stopUsingResourceCounterSimulator();
 void setChoiceFunction(std::function<bool()> choice);
 cudaq::Resources *getResourceCounts();
+void setResourceCounts(cudaq::Resources &&);
 } // namespace nvqir
 
 namespace cudaq {

runtime/cudaq/platform/default/rest/CMakeLists.txt

@@ -34,6 +34,7 @@ target_link_libraries(cudaq-rest-qpu
     fmt::fmt-header-only
     cudaq
     cudaq-platform-default
+    nvqir
     ${AWSSDK_LINK_LIBRARIES})
 
 install(TARGETS cudaq-rest-qpu DESTINATION lib)

runtime/cudaq/platform/fermioniq/CMakeLists.txt

@@ -25,7 +25,9 @@ target_link_libraries(${LIBRARY_NAME}
     cudaq-mlir-runtime 
     fmt::fmt-header-only
     cudaq 
-    cudaq-platform-default)
+    cudaq-platform-default
+    nvqir
+)
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib)
 

runtime/cudaq/platform/pasqal/CMakeLists.txt

@@ -31,6 +31,7 @@ target_link_libraries(${LIBRARY_NAME}
     fmt::fmt-header-only
     cudaq 
     cudaq-platform-default
+    nvqir
 ) 
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib)

runtime/cudaq/platform/quera/CMakeLists.txt

@@ -25,8 +25,10 @@ target_link_libraries(${LIBRARY_NAME}
     pthread
     cudaq-mlir-runtime 
     cudaq-logger
-    cudaq 
-    cudaq-platform-default)
+    cudaq
+    cudaq-platform-default
+    nvqir
+)
 
 install(TARGETS ${LIBRARY_NAME} DESTINATION lib)
 

runtime/nvqir/resourcecounter/ResourceCounter.cpp

@@ -27,4 +27,10 @@ cudaq::Resources *getResourceCounts() {
   getResourceCounterSimulator()->flushGateQueue();
   return getResourceCounterSimulator()->getResourceCounts();
 }
+
+void setResourceCounts(cudaq::Resources &&rc) {
+  getResourceCounterSimulator()->flushGateQueue();
+  getResourceCounterSimulator()->setResourceCounts(std::move(rc));
+}
+
 } // namespace nvqir

runtime/nvqir/resourcecounter/ResourceCounter.h

@@ -80,6 +80,9 @@ class ResourceCounter : public nvqir::CircuitSimulatorBase<double> {
   }
 
   cudaq::Resources *getResourceCounts() { return &this->resourceCounts; }
+  void setResourceCounts(cudaq::Resources &&rc) {
+    this->resourceCounts = std::move(rc);
+  }
 
   void setChoiceFunction(std::function<bool()> choice) {
     assert(choice);