Merge pull request #10 from QoroQuantum/nanobind

Nanobind for Python interface to Maestro

Author: aromanro

CMakeLists.txt

@@ -256,13 +256,8 @@ install(TARGETS maestroexe DESTINATION bin)
 
 if(OpenMP_CXX_FOUND)
     message("Setting OpenMP")
-	
-	if (QAER AND COMPILE_TESTS)
-		target_link_libraries(tests PUBLIC OpenMP::OpenMP_CXX)
-		target_link_libraries(tests PRIVATE ${OpenMP_CXX_FLAGS})
-		target_compile_options(tests PRIVATE ${OpenMP_CXX_FLAGS})
-    endif()
-	
+
+
     if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         find_program(BREW_CMD brew)
         if(BREW_CMD)
@@ -271,40 +266,59 @@ if(OpenMP_CXX_FOUND)
         endif()
 
         target_compile_options(maestro PUBLIC -Xpreprocessor -fopenmp)
+        if (QAER AND COMPILE_TESTS)
+            target_compile_options(tests PUBLIC -Xpreprocessor -fopenmp)
+        endif()
 
         if(LIBOMP_PREFIX)
             target_include_directories(maestro PUBLIC ${OpenMP_CXX_INCLUDE_DIRS} "${LIBOMP_PREFIX}/include")
             target_link_directories(maestro PUBLIC "${LIBOMP_PREFIX}/lib")
+            if (QAER AND COMPILE_TESTS)
+                target_include_directories(tests PUBLIC ${OpenMP_CXX_INCLUDE_DIRS} "${LIBOMP_PREFIX}/include")
+                target_link_directories(tests PUBLIC "${LIBOMP_PREFIX}/lib")
+            endif()
         else()
              target_include_directories(maestro PUBLIC ${OpenMP_CXX_INCLUDE_DIRS} "$ENV{OpenMP_ROOT}/include")
              target_link_directories(maestro PUBLIC "$ENV{OpenMP_ROOT}/lib")
+             if (QAER AND COMPILE_TESTS)
+                target_include_directories(tests PUBLIC ${OpenMP_CXX_INCLUDE_DIRS} "$ENV{OpenMP_ROOT}/include")
+                target_link_directories(tests PUBLIC "$ENV{OpenMP_ROOT}/lib")
+             endif()
         endif()
 
         target_link_libraries(maestro PUBLIC ${OpenMP_CXX_LIBRARIES})
+        if (QAER AND COMPILE_TESTS)
+            target_link_libraries(tests PUBLIC ${OpenMP_CXX_LIBRARIES})
+        endif()
     else()
         target_link_libraries(maestro PUBLIC OpenMP::OpenMP_CXX)
         target_link_libraries(maestro PRIVATE ${OpenMP_CXX_FLAGS})
         target_compile_options(maestro PRIVATE ${OpenMP_CXX_FLAGS})
+        if (QAER AND COMPILE_TESTS)
+            target_link_libraries(tests PUBLIC OpenMP::OpenMP_CXX)
+            target_link_libraries(tests PRIVATE ${OpenMP_CXX_FLAGS})
+            target_compile_options(tests PRIVATE ${OpenMP_CXX_FLAGS})
+        endif()
     endif()
 endif()
 
 IF(QAER AND BLAS_FOUND)
     message("Setting linking blas")
-	
+
 	if (QAER AND COMPILE_TESTS)
 		target_link_libraries(tests PUBLIC ${BLAS_LIBRARIES})
 	endif()
-	
+
     target_link_libraries(maestro PUBLIC ${BLAS_LIBRARIES})
 ENDIF()
 
 IF(SIMD_FLAGS)
     message("Setting SIMD flags")
-	
-	if (QAER AND COMPILE_TESTS)	
+
+	if (QAER AND COMPILE_TESTS)
 		target_compile_options(tests PUBLIC ${SIMD_FLAGS})
 	endif()
-	
+
     target_compile_options(maestro PUBLIC ${SIMD_FLAGS})
 ENDIF()
 
@@ -318,7 +332,7 @@ endif()
 
 IF(Boost_FOUND)
     if (COMPILE_TESTS)
-	    target_link_libraries(tests PRIVATE Boost::serialization)	
+	    target_link_libraries(tests PRIVATE Boost::serialization)
     endif()
     target_link_libraries(maestro PRIVATE Boost::serialization)
     target_link_libraries(maestroexe PRIVATE Boost::serialization)

Network/NetworkJob.h

@@ -74,7 +74,8 @@ class ExecuteJob {
       if (optimiseMultipleShots) {
         executedGates = dcirc->ExecuteNonMeasurements(optSim, state);
 
-        if (!specialOptimizationForStatevector && !specialOptimizationForMPS && curCnt > 1)
+        if (!specialOptimizationForStatevector && !specialOptimizationForMPS &&
+            curCnt > 1)
           optSim->SaveState();
       }
     }
@@ -188,27 +189,24 @@ class ExecuteJob {
         if (optimiseMultipleShots) {
           executedGates = dcirc->ExecuteNonMeasurements(optSim, state);
 
-          if (!specialOptimizationForStatevector && !specialOptimizationForMPS && curCnt > 1)
+          if (!specialOptimizationForStatevector &&
+              !specialOptimizationForMPS && curCnt > 1)
             optSim->SaveState();
         }
-      }
-      else if (executedGates.size() == dcirc->size())
-      {
+      } else if (executedGates.size() == dcirc->size()) {
         // special case for when the simulator is passed from the network
         // and no gates were executed yet
         bool needToExecuteGates = true;
-        for (const bool val : executedGates)
-        {
-          if (val)
-          {
+        for (const bool val : executedGates) {
+          if (val) {
             needToExecuteGates = false;
             break;
           }
         }
-        if (needToExecuteGates && optimiseMultipleShots)
-        {
+        if (needToExecuteGates && optimiseMultipleShots) {
           executedGates = dcirc->ExecuteNonMeasurements(optSim, state);
-          if (!specialOptimizationForStatevector && !specialOptimizationForMPS && curCnt > 1)
+          if (!specialOptimizationForStatevector &&
+              !specialOptimizationForMPS && curCnt > 1)
             optSim->SaveState();
         }
       }
@@ -233,7 +231,8 @@ class ExecuteJob {
       if (optimiseMultipleShots) {
         executedGates = dcirc->ExecuteNonMeasurements(optSim, state);
 
-        if (!specialOptimizationForStatevector && !specialOptimizationForMPS && curCnt > 1)
+        if (!specialOptimizationForStatevector && !specialOptimizationForMPS &&
+            curCnt > 1)
           optSim->SaveState();
       }
     }

Network/SimpleDisconnectedNetwork.h

@@ -364,8 +364,7 @@ class SimpleDisconnectedNetwork : public INetwork<Time> {
     if (!controller || !circuit) return {};
 
     distCirc = controller->DistributeCircuit(BaseClass::getptr(), circuit);
-    if (!distCirc) 
-        return {};
+    if (!distCirc) return {};
 
 #ifdef _DEBUG
     for (auto q : distCirc->AffectedQubits()) {
@@ -423,7 +422,8 @@ class SimpleDisconnectedNetwork : public INetwork<Time> {
 
     // do that only if the optimization for simulator is on and the estimator is
     // available, ortherwise an 'optimal' simulator won't be created
-    if (optimizeSimulator && simulatorsEstimator && simulatorsEstimator->IsInitialized()) {
+    if (optimizeSimulator && simulatorsEstimator &&
+        simulatorsEstimator->IsInitialized()) {
       simulator->Clear();
       GetState().Clear();
     }
@@ -457,8 +457,9 @@ class SimpleDisconnectedNetwork : public INetwork<Time> {
       // created in the threads if optimization already exists, it will be
       // cloned in the threads, otherwise a new one will be created in the
       // threads
-      if (!optimizeSimulator ||
-          !simulatorsEstimator || !simulatorsEstimator->IsInitialized())  // otherwise it was already cleared
+      if (!optimizeSimulator || !simulatorsEstimator ||
+          !simulatorsEstimator
+               ->IsInitialized())  // otherwise it was already cleared
       {
         simulator->Clear();
         GetState().Clear();
@@ -514,7 +515,8 @@ class SimpleDisconnectedNetwork : public INetwork<Time> {
           // use the already created simulator
           optSim = simulator;
           job->optSim = optSim;
-          job->executedGates.resize(distCirc->size(), false);  // no gates executed yet
+          job->executedGates.resize(distCirc->size(),
+                                    false);  // no gates executed yet
           simulator = nullptr;
         }
       }
@@ -1725,7 +1727,8 @@ class SimpleDisconnectedNetwork : public INetwork<Time> {
       bool dontRunCircuitStart = false) const override {
     if (!optimizeSimulator) return nullptr;
 
-    if ((!simulatorsEstimator || !simulatorsEstimator->IsInitialized()) && simulatorsForOptimizations.size() != 1)
+    if ((!simulatorsEstimator || !simulatorsEstimator->IsInitialized()) &&
+        simulatorsForOptimizations.size() != 1)
       return nullptr;
 
     // when multithreading is set to true it means it needs a multithreaded
@@ -1823,10 +1826,11 @@ class SimpleDisconnectedNetwork : public INetwork<Time> {
         simulatorTypes.emplace_back(
             Simulators::SimulatorType::kGpuSim,
             Simulators::SimulationType::kMatrixProductState);
-      if (OptimizationSimulatorExists(Simulators::SimulatorType::kGpuSim,
+      if (OptimizationSimulatorExists(
+              Simulators::SimulatorType::kGpuSim,
               Simulators::SimulationType::kTensorNetwork))
         simulatorTypes.emplace_back(Simulators::SimulatorType::kGpuSim,
-            Simulators::SimulationType::kTensorNetwork);
+                                    Simulators::SimulationType::kTensorNetwork);
     }
 #endif
 

Simulators/Factory.cpp

@@ -30,7 +30,9 @@
 #include "Factory.h"
 
 #define INCLUDED_BY_FACTORY
+#ifndef NO_QISKIT_AER
 #include "AerSimulator.h"
+#endif
 #include "QCSimSimulator.h"
 #include "Composite.h"
 #include "GpuSimulator.h"
@@ -111,7 +113,8 @@ std::shared_ptr<ISimulator> SimulatorsFactory::CreateSimulator(
     case SimulatorType::kGpuSim:
       if (gpuLibrary && gpuLibrary->IsValid() &&
           (m == SimulationType::kStatevector ||
-           m == SimulationType::kMatrixProductState || m == SimulationType::kTensorNetwork)) {
+           m == SimulationType::kMatrixProductState ||
+           m == SimulationType::kTensorNetwork)) {
         auto sim = std::make_shared<Private::GpuSimulator>();
         if (m == SimulationType::kMatrixProductState)
           sim->Configure("method", "matrix_product_state");
@@ -171,7 +174,8 @@ std::unique_ptr<ISimulator> SimulatorsFactory::CreateSimulatorUnique(
     case SimulatorType::kGpuSim:
       if (gpuLibrary && gpuLibrary->IsValid() &&
           (m == SimulationType::kStatevector ||
-           m == SimulationType::kMatrixProductState || m == SimulationType::kTensorNetwork)) {
+           m == SimulationType::kMatrixProductState ||
+           m == SimulationType::kTensorNetwork)) {
         auto sim = std::make_unique<Private::GpuSimulator>();
         if (m == SimulationType::kMatrixProductState)
           sim->Configure("method", "matrix_product_state");

Simulators/GpuLibTNSim.h

@@ -127,7 +127,7 @@ class GpuLibTNSim {
                  double *imaginary) const {
     if (obj)
       return lib->TNAmplitude(obj, numFixedValues, fixedValues, real,
-                               imaginary);
+                              imaginary);
 
     return false;
   }
@@ -189,15 +189,15 @@ class GpuLibTNSim {
   }
 
   std::unique_ptr<GpuLibTNSim> Clone() const {
-    //if (obj) return std::make_unique<GpuLibTNSim>(lib, lib->TNClone(obj));
+    // if (obj) return std::make_unique<GpuLibTNSim>(lib, lib->TNClone(obj));
 
     return nullptr;
   }
 
   double ExpectationValue(const std::string &pauliString) const {
     if (obj)
       return lib->TNExpectationValue(obj, pauliString.c_str(),
-                                      pauliString.length());
+                                     pauliString.length());
 
     return 0.0;
   }
@@ -373,22 +373,21 @@ class GpuLibTNSim {
                double theta, double phi, double lambda, double gamma) {
     if (obj)
       return lib->TNApplyCU(obj, controlQubit, targetQubit, theta, phi, lambda,
-                             gamma);
+                            gamma);
 
     return false;
   }
 
   bool ApplyCCX(unsigned int controlQubit1, unsigned int controlQubit2,
-                 unsigned int targetQubit) {
+                unsigned int targetQubit) {
     if (obj)
       return lib->TNApplyCCX(obj, controlQubit1, controlQubit2, targetQubit);
     return false;
   }
 
   bool ApplyCSwap(unsigned int controlQubit, unsigned int qubit1,
                   unsigned int qubit2) {
-    if (obj)
-      return lib->TNApplyCSwap(obj, controlQubit, qubit1, qubit2);
+    if (obj) return lib->TNApplyCSwap(obj, controlQubit, qubit1, qubit2);
     return false;
   }