Merge pull request #11 from wongey/bugfix/ionq

Update IonQ plugin
ORNL-QCI · Jun 25, 2024 · c746af6 · c746af6
2 parents 7b1cac0 + b240b76
commit c746af6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 10 deletions.
diff --git a/quantum/examples/base_api/CMakeLists.txt b/quantum/examples/base_api/CMakeLists.txt
@@ -36,4 +36,7 @@ add_executable(optimal_control_goat optimal_control_goat.cpp)
 target_link_libraries(optimal_control_goat PRIVATE xacc)
 
 add_executable(bell_azure bell_azure.cpp)
-target_link_libraries(bell_azure PRIVATE xacc)
+target_link_libraries(bell_azure PRIVATE xacc)
+
+add_executable(bell_ionq bell_ionq.cpp)
+target_link_libraries(bell_ionq PRIVATE xacc)
diff --git a/quantum/examples/base_api/bell_ionq.cpp b/quantum/examples/base_api/bell_ionq.cpp
@@ -0,0 +1,29 @@
+
+#include "xacc.hpp"
+
+int main(int argc, char **argv) {
+  xacc::Initialize(argc, argv);
+
+  // Get reference to the Accelerator
+  auto accelerator = xacc::getAccelerator("ionq", {{"shots", 1024}});
+
+  // Allocate some qubits
+  auto buffer = xacc::qalloc(2);
+
+  xacc::qasm(R"(
+.compiler xasm
+.circuit ansatz
+.qbit q
+H(q[0]);
+CX(q[0],q[1]);
+Measure(q[0]);
+Measure(q[1]);
+)");
+  auto ansatz = xacc::getCompiled("ansatz");
+
+  accelerator->execute(buffer, ansatz);
+
+  xacc::Finalize();
+
+  return 0;
+}
diff --git a/quantum/plugins/honeywell/honeywell.hpp b/quantum/plugins/honeywell/honeywell.hpp
@@ -116,7 +116,7 @@ class HoneywellAccelerator : public Accelerator {
   int shots = 1024;
   std::string backend = "";
   bool initialized = false;
-  static inline const std::string url = "https://qapi.honeywell.com/v1/";
+  static inline const std::string url = "https://qapi.quantinuum.com/v1/";
   // List of backend names:
   std::vector<std::string> available_backends;
   std::string post(const std::string &_url, const std::string &path,

diff --git a/quantum/plugins/ionq/ionq_accelerator.cpp b/quantum/plugins/ionq/ionq_accelerator.cpp
@@ -22,6 +22,8 @@
 #include <regex>
 #include <thread>
 
+#include <iostream>
+
 namespace xacc {
 namespace quantum {
 
@@ -41,9 +43,10 @@ void IonQAccelerator::initialize(const HeterogeneousMap &params) {
     headers.insert({"Authorization", "apiKey " + apiKey});
     headers.insert({"Content-Type", "application/json"});
 
-    auto calibrations = restClient->get(url, "/calibrations", headers);
-    auto j = nlohmann::json::parse(calibrations);
-    m_connectivity = j["calibrations"][0]["connectivity"].get<std::vector<std::pair<int,int>>>();
+    auto characterizations = restClient->get(url, "/jobs", headers);
+    auto j = nlohmann::json::parse(characterizations);
+    // std::cout << j.dump(1) << std::endl;
+    // m_connectivity = j["characterizations"][0]["connectivity"].get<std::vector<std::pair<int,int>>>();
 
     remoteUrl = url;
     postPath = "/jobs";
@@ -144,8 +147,8 @@ void IonQAccelerator::processResponse(std::shared_ptr<AcceleratorBuffer> buffer,
   // End the color log
   std::cout << "\033[0m" << "\n";
 
-  std::map<std::string, double> histogram =
-      j["data"]["histogram"].get<std::map<std::string, double>>();
+  auto results = handleExceptionRestClientGet(url, "/jobs/" + jobId + "/results", headers);
+  std::map<std::string, double> histogram = json::parse(results);
 
   int n = buffer->size();
   auto getBitStrForInt = [&](std::uint64_t i) {
@@ -217,3 +220,4 @@ void IonQAccelerator::findApiKeyInFile(std::string &apiKey, std::string &url,
 }
 } // namespace quantum
 } // namespace xacc
+
diff --git a/quantum/plugins/ionq/json/ionq_program.hpp b/quantum/plugins/ionq/json/ionq_program.hpp
@@ -144,14 +144,15 @@ namespace nlohmann {
         x.set_lang(j.at("lang").get<std::string>());
         x.set_target(j.at("target").get<std::string>());
         x.set_shots(j.at("shots").get<std::int64_t>());
-        x.set_body(j.at("body").get<xacc::ionq::Body>());
+        x.set_body(j.at("input").get<xacc::ionq::Body>());
     }
 
     inline void to_json(json & j, const xacc::ionq::IonQProgram & x) {
         j = json::object();
         j["lang"] = x.get_lang();
         j["target"] = x.get_target();
         j["shots"] = x.get_shots();
-        j["body"] = x.get_body();
+        j["input"] = x.get_body();
     }
 }
+
diff --git a/quantum/plugins/ionq/tests/IonQProgramTester.cpp b/quantum/plugins/ionq/tests/IonQProgramTester.cpp
@@ -20,7 +20,7 @@ TEST(IonQProgramTester, checkFromJson) {
     "lang": "json",
     "target": "qpu",
     "shots": 1000,
-    "body": {
+    "input": {
         "qubits": 2,
         "circuit": [
             {