Fix errors

Author: rwakizaka

src/providers/sqc_backend.hpp

@@ -17,46 +17,54 @@
 #ifndef __qiskitcpp_providers_SQC_backend_def_hpp__
 #define __qiskitcpp_providers_SQC_backend_def_hpp__
 
+#include <memory>
+
 #include "utils/types.hpp"
 #include "transpiler/target.hpp"
 #include "primitives/containers/sampler_pub.hpp"
-#include "providers/job.hpp"
+#include "providers/sqc_job.hpp"
 
+#include "sqc_ecode.h"
 #include "sqc_api.h"
 
 namespace Qiskit {
 namespace providers {
 
+/// @brief Convert a qiskit quantum circuit to a SQC circuit.
+/// @param A SQC circuit where a result is stored
+/// @param An original qiskit circuit
+/// @note This function destroys the original SQC circuit data.
+/// @note Currently parameterized circuits are not supported.
+bool qk_circ_to_sqc_circ(sqcQC* qc_handle, circuit::QuantumCircuit& qk_circ);
+
 /// @class SQCBackend
 /// @brief Backend class using SQC.
 class SQCBackend : public BackendV2 {
 private:
-    /// @note A circuit data will be built via qiskit-cpp, not SQC.
-    ///       A `qc_handle_` field is just used for an interface between qiskit-cpp and SQC.
-    sqcQC* qc_handle_;
     const sqcBackend backend_type_;
+    std::shared_ptr<transpiler::Target> target_;
 
 public:
     /// @brief Create a new SQCBackend. Internally this initializes SQC.
     SQCBackend()
-        : SQCBackend("unspecified") // @TODO
+        : SQCBackend("unspecified")
     {}
 
     /// @brief Create a new SQCBackend object
     /// @param backend_name a resource name for backend.
     SQCBackend(const std::string name)
-        : name_(name),
-          qc_handle_(NULL),
+        : BackendV2(name),
           backend_type_(SQC_RPC_SCHED_QC_TYPE_IBM_DACC),
-    {
-        
-        qc_handle_ = sqcQuantumCircuit(0);
-    }
+          target_(nullptr)
+    {}
 
-    ~SQCBackend()
-    {
-        sqcDestroyQuantumCircuit(qc_handle_);
-    }
+    SQCBackend(const SQCBackend& other)
+        : BackendV2(other.name_),
+          backend_type_(other.backend_type_),
+          target_(other.target_)
+    {}
+
+    ~SQCBackend() {}
 
     /// @brief Return a target properties for this backend.
     /// @return a target class (nullptr)
@@ -65,14 +73,14 @@ class SQCBackend : public BackendV2 {
         if(target_) return target_;
 
         // Create a dummy circuit to get target json files
-        std::unique_ptr<sqcQC> qc_handle(sqcQuantumCircuit(0), sqcDestroyQuantumCircuit);
+        std::unique_ptr<sqcQC, decltype(&sqcDestroyQuantumCircuit)> qc_handle(sqcQuantumCircuit(0), &sqcDestroyQuantumCircuit);
         if(sqcIbmdTranspileInfo(qc_handle.get(), backend_type_) != SQC_RESULT_OK) {
             std::cerr << "Failed to get the target information" << std::endl;
             return nullptr;
         }
 
         nlohmann::ordered_json target_json;
-        target_json["configuration"] = nlohmann::ordered_json::parse(qc_handle->backend_config_json)
+        target_json["configuration"] = nlohmann::ordered_json::parse(qc_handle->backend_config_json);
         target_json["properties"] = nlohmann::ordered_json::parse(qc_handle->backend_props_json);
         auto target = std::shared_ptr<transpiler::Target>();
         if(!target->from_json(target_json)) {
@@ -89,25 +97,28 @@ class SQCBackend : public BackendV2 {
     std::shared_ptr<providers::Job> run(std::vector<primitives::SamplerPub>& input_pubs, uint_t shots) override
     {
         auto circuit = input_pubs[0].circuit();
-        std::cout << "run qasm3: \n" << circuit.to_qasm3() << std::endl;
-
-        if(!qk_circ_to_sqc_circ(qc_handle_, circuit))
+        const auto qasm3_str = circuit.to_qasm3();
+        std::cout << "run qasm3: \n" << qasm3_str << std::endl;
+
+        // Create a sqcQC from a qiskit circuit
+        const uint_t qasm_len = qasm3_str.size() + 500;
+        std::unique_ptr<sqcQC, decltype(&sqcDestroyQuantumCircuit)> sqc_circ(sqcQuantumCircuit(0), &sqcDestroyQuantumCircuit);
+        sqc_circ->qasm = (char*)malloc(qasm_len);
+        if(!qk_circ_to_sqc_circ(sqc_circ.get(), circuit))
         {
             std::cerr << "Error: Failed to convert a given qiskit circuit to a SQC circuit." << std::endl;
             return nullptr;
         }
-
-        // @TODO: gateInfo2qasm3 is implemented in sqc_api.c, but not declared in the header file.
-        qc_handle_->qasm = gateInfo2qasm3(qc_handle_);
+        sqcConvQASMtoMemory(sqc_circ.get(), backend_type_, sqc_circ->qasm, qasm_len);
 
         std::unique_ptr<sqcRunOptions> run_options(new sqcRunOption);
         sqcInitializeRunOpt(run_options.get());
         run_options->nshots = shots;
-        run_options->qubits = qc_handle_->qubits;
+        run_options->qubits = sqc_circ->qubits;
         run_options->outFormat = SQC_OUT_RAW; // @TODO
 
-        std::unique_ptr<sqcOut> result(new sqcOut, [](sqcOut* out) { sqcFreeOut(out, SQC_OUT_RAW); });
-        int error_code = sqcQCRun(qc_handle_, backend_type_, *run_options, result);
+        std::shared_ptr<sqcOut> result(new sqcOut, [](sqcOut* out) { sqcFreeOut(out, SQC_OUT_RAW); });
+        int error_code = sqcQCRun(sqc_circ.get(), backend_type_, *run_options, result.get());
 
         if(error_code != SQC_RESULT_OK)
         {
@@ -122,12 +133,7 @@ class SQCBackend : public BackendV2 {
 };
 
 
-/// @brief Convert a qiskit quantum circuit to a SQC circuit.
-/// @param A SQC circuit where a result is stored
-/// @param An original qiskit circuit
-/// @note This function destroys the original SQC circuit data.
-/// @note Currently parameterized circuits are not supported.
-bool qk_circ_to_sqc_circ(sqcQC* qc_handle, const circuit::QuantumCircuit& qk_circ)
+bool qk_circ_to_sqc_circ(sqcQC* qc_handle, circuit::QuantumCircuit& qk_circ)
 {
     if(qc_handle == NULL)
     {
@@ -199,7 +205,8 @@ bool qk_circ_to_sqc_circ(sqcQC* qc_handle, const circuit::QuantumCircuit& qk_cir
         }
         else if(instr_name == "p")
         {
-            sqcU1Gate(qc_handle, qubits[0]);
+            const auto& instr = circ_instr.instruction();
+            sqcU1Gate(qc_handle, instr.params()[0], qubits[0]);
         }
         else if(instr_name == "reset")
         {

src/providers/sqc_job.hpp

@@ -38,7 +38,7 @@ class SQCJob : public Job {
 public:
     /// @brief Create a new SQCBackend
     SQCJob()
-        : SQCJob("")
+        : SQCJob(std::string{""})
     {}
 
     /// @brief Create a new SQCBackend object

src/service/qiskit_runtime_service_sqc.hpp

@@ -38,8 +38,6 @@ class QiskitRuntimeService {
         }
     }
 
-    QiskitRuntimeService(QiskitRuntimeService const&) = delete;
-
     ~QiskitRuntimeService()
     {
         sqcFinalize(init_options_);