Merge pull request #51 from danclaudino/ibm_update

Aer update
ORNL-QCI · Sep 16, 2024 · 702d8ec · 702d8ec
2 parents 1433ca7 + 2e79db2
commit 702d8ec
Show file tree

Hide file tree

Showing 164 changed files with 58 additions and 61,621 deletions.
diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
@@ -37,12 +37,12 @@ jobs:
 
       - name: Configure
         working-directory: build/
-        run: export SDKROOT="`xcrun --show-sdk-path`" && cmake -GNinja $GITHUB_WORKSPACE -DXACC_BUILD_TESTS=TRUE -DXACC_BUILD_EXAMPLES=TRUE
+        run: export SDKROOT="`xcrun --show-sdk-path`" && cmake -GNinja $GITHUB_WORKSPACE -DXACC_BUILD_TESTS=TRUE -DXACC_BUILD_EXAMPLES=TRUE -DCMAKE_PREFIX_PATH=$(brew --prefix libomp)
 
       - name: Build
         working-directory: build/
         run: export SDKROOT="`xcrun --show-sdk-path`" && cmake --build . --target install
 
       - name: Test
         working-directory: build/
-        run: export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$HOME/.xacc/lib && ctest --output-on-failure
+        run: export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$HOME/.xacc/lib && ctest --output-on-failure
diff --git a/.gitmodules b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "tpls/eigen"]
 	path = tpls/eigen
 	url = https://gitlab.com/libeigen/eigen.git
+[submodule "tpls/qiskit-aer"]
+	path = tpls/qiskit-aer
+	url = https://github.com/Qiskit/qiskit-aer.git
diff --git a/quantum/plugins/ibm/aer/CMakeLists.txt b/quantum/plugins/ibm/aer/CMakeLists.txt
@@ -1,41 +1,40 @@
 set(LIBRARY_NAME xacc-aer)
 
 if(NOT QIREE_MINIMAL_BUILD)
-add_subdirectory(py-aer)
+#add_subdirectory(py-aer)
 endif()
 
+set(AER_SOURCE_DIR ${CMAKE_SOURCE_DIR}/tpls/qiskit-aer)
+
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
   if (NOT CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
-    set(AER_SIMD_SOURCE_FILE src/simulators/statevector/qv_avx2.cpp)
+    set(AER_SIMD_SOURCE_FILE ${AER_SOURCE_DIR}/src/simulators/statevector/qv_avx2.cpp)
   endif()
 endif()
 
 file(GLOB SRC
-          accelerator/aer_accelerator.cpp
+          aer_accelerator.cpp
           ${AER_SIMD_SOURCE_FILE})
 
 usfunctiongetresourcesource(TARGET ${LIBRARY_NAME} OUT SRC)
 usfunctiongeneratebundleinit(TARGET ${LIBRARY_NAME} OUT SRC)
 
 add_library(${LIBRARY_NAME} SHARED ${SRC})
 
+find_package(Python COMPONENTS Interpreter Development)
+
 target_include_directories(${LIBRARY_NAME}
                              PUBLIC .
-                                    accelerator
-                                    src
-                                    ../common
-                                    ${CMAKE_SOURCE_DIR}/tpls)
+                                    ${AER_SOURCE_DIR}/src
+                                    ${CMAKE_SOURCE_DIR}/tpls
+                                    ${CMAKE_SOURCE_DIR}/tpls/pybind11/include
+                                    ${Python_INCLUDE_DIRS})
+
 target_link_libraries(${LIBRARY_NAME}
                         PUBLIC xacc
                                xacc-quantum-gate
+                               Python::Python
                         )
-
-if(NOT QIREE_MINIMAL_BUILD)
-  target_link_libraries(${LIBRARY_NAME}
-  PUBLIC xacc-py-aer-adapter
-  )
-endif(NOT QIREE_MINIMAL_BUILD)
-
 
 if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64")
   if(APPLE OR UNIX)
@@ -70,6 +69,9 @@ if(APPLE)
                         PROPERTIES INSTALL_RPATH "@loader_path/../lib")
   set_target_properties(${LIBRARY_NAME}
                         PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+  if(OpenMP_CXX_FOUND)
+    target_include_directories(${LIBRARY_NAME} PUBLIC . ${OpenMP_CXX_INCLUDE_DIRS})
+  endif()
 else()
   if(LAPACK_FOUND)
    target_link_libraries(${LIBRARY_NAME} PRIVATE ${LAPACK_LIBRARIES})

diff --git a/...s/ibm/aer/accelerator/aer_accelerator.cpp → quantum/plugins/ibm/aer/aer_accelerator.cpp b/...s/ibm/aer/accelerator/aer_accelerator.cpp → quantum/plugins/ibm/aer/aer_accelerator.cpp
@@ -20,6 +20,7 @@
 
 #include "controllers/aer_controller.hpp"
 #include "controllers/controller_execute.hpp"
+#include "framework/circuit.hpp"
 #include "noise/readout_error.hpp"
 
 #include "cppmicroservices/BundleActivator.h"
@@ -31,8 +32,8 @@
 
 #include <bitset>
 #include <optional>
-#include "QObjGenerator.hpp"
-#include "py-aer/aer_python_adapter.hpp"
+//#include "QObjGenerator.hpp"
+//#include "py-aer/aer_python_adapter.hpp"
 
 namespace xacc {
 namespace quantum {
@@ -193,6 +194,7 @@ void AerAccelerator::initialize(const HeterogeneousMap &params) {
   AER::Hacks::maybe_load_openmp("");
   initialized = true;
 }
+
 double AerAccelerator::calcExpectationValueZ(
     const std::vector<std::pair<double, double>> &in_stateVec,
     const std::vector<std::size_t> &in_bits) {
@@ -246,6 +248,7 @@ double AerAccelerator::calcExpectationValueZFromDensityMatrix(
 void AerAccelerator::execute(
     std::shared_ptr<AcceleratorBuffer> buffer,
     const std::shared_ptr<CompositeInstruction> program) {
+
   if (m_simtype == "qasm") {
     auto qobj_str = xacc_to_qobj->translate(program);
 
@@ -303,8 +306,8 @@ void AerAccelerator::execute(
         op.qubits.emplace_back(q);
       }
       op.params = intial_state;
-      qobj.circuits[0].ops.insert(qobj.circuits[0].ops.begin(), op);
-      qobj.circuits[0].set_params(false);
+      qobj.circuits[0]->ops.insert(qobj.circuits[0]->ops.begin(), op);
+      qobj.circuits[0]->set_params(false);
     }
 
     // Run qobj circuits
@@ -332,7 +335,7 @@ void AerAccelerator::execute(
       }
       buffer->appendMeasurement(actual, nOccurrences);
     }
-  } else if (m_simtype == "pulse") {
+  } /*else if (m_simtype == "pulse") {
     // Get the correct QObject Generator
     auto qobjGen = xacc::getService<QObjGenerator>("pulse");
     auto chosenBackend = nlohmann::json::parse(physical_backend_properties.getString("config-json"));
@@ -403,7 +406,7 @@ void AerAccelerator::execute(
 
     auto state_vector = result_json["statevector"].get<std::vector<std::pair<double, double>>>();
     buffer->addExtraInfo("state", state_vector);
-  } else if (m_simtype == "density_matrix") {
+  }*/ else if (m_simtype == "density_matrix") {
     // remove all measures, don't need them
     auto tmp = xacc::ir::asComposite(program->clone());
     tmp->clear();
@@ -430,9 +433,10 @@ void AerAccelerator::execute(
     // std::cout << "QObj:\n" << qobj_str << "\n";
     assert(qobj.circuits.size() == 1);
     auto circ = qobj.circuits[0];
+    //std::shared_ptr<AER::Circuit> circ = std::make_shared<AER::Circuit>(qObjJson);
     // Output data container
     AER::ExperimentResult data;
-    densityMat.initialize_creg(circ.num_memory, circ.num_registers);
+    densityMat.initialize_creg(circ->num_memory, circ->num_registers);
     densityMat.initialize_qreg(buffer->size());
     if (m_options.keyExists<std::vector<std::complex<double>>>(
             "initial_state")) {
@@ -452,21 +456,22 @@ void AerAccelerator::execute(
       }
       densityMat.qreg().initialize_from_vector(intial_state);
     }
+
     // std::cout << "Num op: " << circ.ops.size() << "\n";
     if (!noise_model.empty()) {
       auto noise = qobj.noise_model;
       noise.enable_superop_method();
       auto opt_circ = noise.sample_noise(
-          circ, rng, AER::Noise::NoiseModel::Method::superop);
+          *circ, rng, AER::Noise::NoiseModel::Method::superop);
       densityMat.apply_ops(opt_circ.ops.begin(), opt_circ.ops.end(), data, rng);
     } else {
-      densityMat.apply_ops(circ.ops.begin(), circ.ops.end(), data, rng);
+      densityMat.apply_ops(circ->ops.begin(), circ->ops.end(), data, rng);
     }
     // std::cout << "Result: \n" << data.to_json().dump() << "\n";
     const double exp_val = densityMat.qreg().expval_pauli(
         measured_bits, std::string(measured_bits.size(), 'Z'));
 
-    auto dmData = densityMat.move_to_matrix(0);
+    auto dmData = densityMat.move_to_matrix();
     const auto length = dmData.size();
     assert(length == (1ULL << buffer->size()) * (1ULL << buffer->size()));
     std::complex<double> *dmPtr = dmData.move_to_buffer();
@@ -488,15 +493,18 @@ void AerAccelerator::execute(
         {ExecutionInfo::DmKey,
          std::make_shared<ExecutionInfo::DensityMatrixType>(std::move(dm))}};
     buffer->addExtraInfo("exp-val-z", exp_val);
-  }
-  else {
+
+  } else {
+
     assert(m_simtype == "statevector");
+
     // statevector
     // remove all measures, don't need them
     auto tmp = xacc::ir::asComposite(program->clone());
     tmp->clear();
     AER::reg_t measured_bits;
     InstructionIterator iter(program);
+
     while (iter.hasNext()) {
       auto next = iter.next();
       if (!next->isComposite() && next->name() != "Measure") {
@@ -505,19 +513,20 @@ void AerAccelerator::execute(
         measured_bits.push_back(next->bits()[0]);
       }
     }
+
     auto qobj_str = xacc_to_qobj->translate(tmp);
     nlohmann::json qObjJson = nlohmann::json::parse(qobj_str)["qObject"];
     qObjJson["config"]["method"] = "statevector";
     qObjJson["config"]["enable_truncation"] = false;
     AER::Statevector::State<AER::QV::QubitVector<double>> stateVec;
     AER::RngEngine rng;
     AER::Qobj qobj(qObjJson);
-    // std::cout << "QObj:\n" << qobj_str << "\n";
+
     assert(qobj.circuits.size() == 1);
     auto circ = qobj.circuits[0];
     // Output data container
     AER::ExperimentResult data;
-    stateVec.initialize_creg(circ.num_memory, circ.num_registers);
+    stateVec.initialize_creg(circ->num_memory, circ->num_registers);
     stateVec.initialize_qreg(buffer->size());
     if (m_options.keyExists<std::vector<std::complex<double>>>(
             "initial_state")) {
@@ -537,13 +546,12 @@ void AerAccelerator::execute(
       }
       stateVec.qreg().initialize_from_vector(intial_state);
     }
-    // std::cout << "Num op: " << circ.ops.size() << "\n";
-    stateVec.apply_ops(circ.ops.begin(), circ.ops.end(), data, rng);
-    // std::cout << "Result: \n" << data.to_json().dump() << "\n";
+
+    stateVec.apply_ops(circ->ops.begin(), circ->ops.end(), data, rng);
     const double exp_val = stateVec.qreg().expval_pauli(
         measured_bits, std::string(measured_bits.size(), 'Z'));
 
-    auto stateVecData = stateVec.move_to_vector(0);
+    auto stateVecData = stateVec.move_to_vector();
     const auto length = stateVecData.size();
     std::complex<double> *statePtr = stateVecData.move_to_buffer();
     ExecutionInfo::WaveFuncType wavefn(statePtr, statePtr + length);
@@ -572,17 +580,21 @@ void AerAccelerator::execute(
 
 void AerAccelerator::apply(std::shared_ptr<AcceleratorBuffer> buffer,
                            std::shared_ptr<Instruction> inst) {
+
   static AER::Statevector::State<AER::QV::QubitVector<double>> stateVec;
   static auto provider = xacc::getIRProvider("quantum");
   static AER::RngEngine rng;
   static std::set<AcceleratorBuffer*> knownBuffers;
+
   if (!xacc::container::contains(knownBuffers, buffer.get())) {
     stateVec.initialize_qreg(buffer->size());
     knownBuffers.emplace(buffer.get());
   }
+
   if (inst->isComposite() || inst->isAnalog()) {
     xacc::error("Only gates are allowed.");
   }
+
   xacc::info("Apply: " + inst->toString());
   if (inst->name() != "Measure") {
     auto tempComp = provider->createComposite("tmp");
@@ -591,22 +603,13 @@ void AerAccelerator::apply(std::shared_ptr<AcceleratorBuffer> buffer,
     auto qObjJson = nlohmann::json::parse(qobj_str)["qObject"];
     qObjJson["config"]["enable_truncation"] = false;
     AER::Qobj qobj(qObjJson);
-    // std::cout << "QObj:\n" << qobj_str << "\n";
     assert(qobj.circuits.size() == 1);
     auto circ = qobj.circuits[0];
     // Output data container
     AER::ExperimentResult data;
-    // std::cout << "Num op: " << circ.ops.size() << "\n";
-    stateVec.apply_ops(circ.ops.begin(), circ.ops.end(), data, rng);
-    // std::cout << "Result: \n" << data.to_json().dump() << "\n";
-    // auto wavefn = stateVec.copy_to_vector(0);
-    // std::cout << "HOWDY: " << wavefn.size() << "\n";
-    // for (int i = 0; i < wavefn.size(); ++i) {
-    //   std::cout << wavefn[i] << "\n";
-    // }
+    stateVec.apply_ops(circ->ops.begin(), circ->ops.end(), data, rng);
   }
-  //   stateVec.add_creg_to_data(data);
-  // If it was a Measure op:
+
   else {
     AER::reg_t measured_bits{inst->bits()[0]};
     const auto probs = stateVec.qreg().probabilities(measured_bits);
@@ -904,12 +907,14 @@ IbmqNoiseModel::getNoiseChannels(xacc::quantum::Gate &gate) const {
 std::string IbmqNoiseModel::toJson() const {
   // First, check if Qiskit is available,
   // try to use Qiskit util if possible.
+  /*
   const std::string noiseModelJson =
       xacc::aer::noiseModelFromBackendProperties(m_backendPropertiesJson);
   if (!noiseModelJson.empty()) {
     xacc::info("Qiskit generated noise model:\n" + noiseModelJson);
     return noiseModelJson;
   }
+  */
 
   // No Qiskit, create the noise model by ourselves from the backend properties.
   // Aer noise model Json

diff --git a/...s/ibm/aer/accelerator/aer_accelerator.hpp → quantum/plugins/ibm/aer/aer_accelerator.hpp b/...s/ibm/aer/accelerator/aer_accelerator.hpp → quantum/plugins/ibm/aer/aer_accelerator.hpp
diff --git a/...s/ibm/aer/accelerator/aer_noise_model.hpp → quantum/plugins/ibm/aer/aer_noise_model.hpp b/...s/ibm/aer/accelerator/aer_noise_model.hpp → quantum/plugins/ibm/aer/aer_noise_model.hpp
diff --git a/quantum/plugins/ibm/aer/py-aer/CMakeLists.txt b/quantum/plugins/ibm/aer/py-aer/CMakeLists.txt
diff --git a/quantum/plugins/ibm/aer/py-aer/aer_python_adapter.hpp b/quantum/plugins/ibm/aer/py-aer/aer_python_adapter.hpp