Revert "Q-IRIS related changes to expose QIREE-QSIM and QIREE-XACC APIs to IRIS" (#26)

Revert "Q-IRIS related changes to expose QIREE-QSIM and QIREE-XACC APIs to IR…"

This reverts commit eb1c21e.

Author: sethrj

app/CMakeLists.txt

@@ -22,15 +22,8 @@ if(QIREE_USE_QSIM)
   qiree_add_executable(qir-qsim
     qir-qsim.cc
   )
-  qiree_add_library(qir.qsim.lib SHARED
-    qir-qsim-lib.cc
-  )
-  target_link_libraries(qir.qsim.lib
-    PUBLIC QIREE::qiree QIREE::qirqsim
-    PRIVATE CLI11::CLI11
-  )
   target_link_libraries(qir-qsim
-    PUBLIC QIREE::qiree QIREE::qirqsim qir.qsim.lib
+    PUBLIC QIREE::qiree QIREE::qirqsim
     PRIVATE CLI11::CLI11
   )
 endif()
@@ -43,15 +36,8 @@ if(QIREE_USE_XACC)
   qiree_add_executable(qir-xacc
     qir-xacc.cc
   )
-  qiree_add_library(qir.xacc.lib SHARED
-    qir-xacc-lib.cc
-  )
-  target_link_libraries(qir.xacc.lib
-    PUBLIC QIREE::qiree QIREE::qirxacc
-    PRIVATE CLI11::CLI11
-  )
   target_link_libraries(qir-xacc
-    PUBLIC QIREE::qiree QIREE::qirxacc qir.xacc.lib
+    PUBLIC QIREE::qiree QIREE::qirxacc
     PRIVATE CLI11::CLI11
   )
 endif()

app/qir-qsim-lib.cc

@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //---------------------------------------------------------------------------//
-//! \file app/qir-qsim.cc
+//! \file qir-xacc/qir-xacc.cc
 //---------------------------------------------------------------------------//
 #include <cstdlib>
 #include <iostream>
@@ -18,14 +18,57 @@
 
 using namespace std::string_view_literals;
 
-int parse_input(int argc, char* argv[]);
+namespace qiree
+{
+namespace app
+{
 //---------------------------------------------------------------------------//
+void run(std::string const& filename, int num_shots)
+{
+    // Load the input
+    Executor execute{Module{filename}};
+
+    // Set up qsim
+    QsimQuantum sim(std::cout, 0);
+    QsimDefaultRuntime rt(std::cout, sim);
+    ResultDistribution distribution;
+
+    // Run several time = shots (default 1)
+    for (int i = 0; i < num_shots; i++)
+    {
+        execute(sim, rt);
+        distribution.accumulate(rt.result());
+    }
+
+    std::cout << distribution.to_json() << std::endl;
+}
+
+//---------------------------------------------------------------------------//
+}  // namespace app
+}  // namespace qiree
 
 //---------------------------------------------------------------------------//
 /*!
  * Execute and run.
  */
 int main(int argc, char* argv[])
 {
-    return parse_input(argc, argv);
+    int num_shots{1};
+    std::string filename;
+
+    CLI::App app;
+
+    auto* filename_opt
+        = app.add_option("--input,-i,input", filename, "QIR input file");
+    filename_opt->required();
+
+    auto* nshot_opt
+        = app.add_option("-s,--shots", num_shots, "Number of shots");
+    nshot_opt->capture_default_str();
+
+    CLI11_PARSE(app, argc, argv);
+
+    qiree::app::run(filename, num_shots);
+
+    return EXIT_SUCCESS;
 }

app/qir-qsim.cc

@@ -3,7 +3,7 @@
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //---------------------------------------------------------------------------//
-//! \file app/qir-xacc.cc
+//! \file qir-xacc/qir-xacc.cc
 //---------------------------------------------------------------------------//
 #include <cstdlib>
 #include <iostream>
@@ -22,13 +22,76 @@
 
 using namespace std::string_view_literals;
 
-int parse_input(int argc, char* argv[]);
+namespace qiree
+{
+namespace app
+{
+//---------------------------------------------------------------------------//
+void run(std::string const& filename,
+         std::string const& accel_name,
+         int num_shots,
+         bool print_accelbuf,
+         bool group_tuples)
+{
+    // Load the input
+    Executor execute{Module{filename}};
+
+    // Set up XACC
+    XaccQuantum xacc(std::cout, accel_name, num_shots);
+    std::unique_ptr<RuntimeInterface> rt;
+    if (group_tuples)
+    {
+        rt = std::make_unique<XaccTupleRuntime>(
+            std::cout, xacc, print_accelbuf);
+    }
+    else
+    {
+        rt = std::make_unique<XaccDefaultRuntime>(
+            std::cout, xacc, print_accelbuf);
+    }
+
+    // Run
+    execute(xacc, *rt);
+}
+
+//---------------------------------------------------------------------------//
+}  // namespace app
+}  // namespace qiree
 
 //---------------------------------------------------------------------------//
 /*!
  * Execute and run.
  */
 int main(int argc, char* argv[])
 {
-    return parse_input(argc, argv);
+    int num_shots{1024};
+    std::string accel_name;
+    std::string filename;
+    bool no_print_accelbuf{false};
+    bool group_tuples{false};
+
+    CLI::App app;
+    auto* filename_opt
+        = app.add_option("--input,-i,input", filename, "QIR input file");
+    filename_opt->required();
+    auto* accel_opt
+        = app.add_option("-a,--accelerator", accel_name, "Accelerator name");
+    accel_opt->required();
+    auto* nshot_opt
+        = app.add_option("-s,--shots", num_shots, "Number of shots");
+    nshot_opt->capture_default_str();
+    app.add_flag("--no-print-xacc-accelbuf",
+                 no_print_accelbuf,
+                 "Do not print XACC AcceleratorBuffer");
+    app.add_flag("--group-tuples",
+                 group_tuples,
+                 "Print per-tuple/per-array measurement statistics rather "
+                 "than per-qubit");
+
+    CLI11_PARSE(app, argc, argv);
+
+    qiree::app::run(
+        filename, accel_name, num_shots, !no_print_accelbuf, group_tuples);
+
+    return EXIT_SUCCESS;
 }