Merge pull request #177 from OriginQ/develop

Develop

Author: shenzhi-git

Applications/B_V_Algorithm/BernsteinVaziraniAlgorithm.cpp

@@ -1,9 +1,9 @@
 /*
-Copyright (c) 2017-2020 Origin Quantum Computing. All Right Reserved.
+Copyright (c) 2017-2021 Origin Quantum Computing. All Right Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+You may obtain a copy of the License at    
 
 http://www.apache.org/licenses/LICENSE-2.0
 

Applications/Grover_Algorithm/Grover_Algorithm.cpp

@@ -21,7 +21,7 @@ limitations under the License.
 USING_QPANDA
 using namespace std;
 
-static size_t g_shot = 100000;
+static size_t g_shot = 10000;
 
 static uint32_t classcial_search(const std::vector<uint32_t>& search_space, const std::vector<uint32_t>& search_data,
 	std::vector<size_t>& search_result)
@@ -47,7 +47,10 @@ static uint32_t quantum_grover_search(const std::vector<uint32_t>& search_space,
 	uint32_t repeat_times = 0;
 	auto machine = initQuantumMachine(CPU);
 	machine->setConfigure({ 64,64 });
-	auto x = machine->allocateCBit();
+
+	CPUQVM _tmp_qvm;
+	_tmp_qvm.init();
+	auto x = _tmp_qvm.allocateCBit();
 
 	std::vector<size_t> search_result_for_check;
 	for (size_t i = 0; i < search_space.size(); ++i)
@@ -85,14 +88,20 @@ static uint32_t quantum_grover_search(const std::vector<uint32_t>& search_space,
 		printf("Strat measure.\n");
 		//auto result = probRunDict(grover_Qprog, measure_qubits);
 		grover_Qprog << MeasureAll(measure_qubits, c);
+		write_to_originir_file(grover_Qprog, machine, "Grover_prog.ir");
+
+		// just for test
+		//auto _grover_prog = convert_originir_to_qprog("Grover_prog.ir", machine);
+		//auto result = runWithConfiguration(_grover_prog, c, g_shot);
+
 		auto result = runWithConfiguration(grover_Qprog, c, g_shot);
 
 		//get result
 		std::map<string, double> normal_result;
 		for (const auto& _r : result){
 			normal_result.insert(std::make_pair(_r.first, (double)_r.second/(double)g_shot));
 		}
-		search_result = search_target_from_measure_result(normal_result);
+		search_result = search_target_from_measure_result(normal_result, measure_qubits.size());
 		if ((search_result.size() > 0)
 			|| ((search_result.size() == 0) && (max_repeat < repeat_times))){
 			break;
@@ -180,7 +189,7 @@ static uint32_t quantum_walk_search(const std::vector<uint32_t>& search_space, c
 		for (const auto& _r : result) {
 			normal_result.insert(std::make_pair(_r.first, (double)_r.second / (double)g_shot));
 		}
-		search_result = search_target_from_measure_result(normal_result);
+		search_result = search_target_from_measure_result(normal_result, measure_qubits.size());
 		if ((search_result.size() > 0)
 			|| ((search_result.size() == 0) && (4 < repeat_times))) {
 			break;
@@ -260,16 +269,18 @@ int main(int argc, char* argv[])
 {
 	const std::string parameter_descr_str = R"(
     The legal parameter form is as follows:
-    QGrover.exe [Option] [search-space-file] [search-data]
+    Grover_Algorithm.exe [Option] [search-space-file] [search-data]
     Option:
         -g: run Grover-search-algorithm
         -c: run classcial-search-algorithm
         -r: run quantum-walk-search-algorithm
     example:
-    To search for 100 in data.txt use Grover-search-algorithm, execute the following command:
-        Search.exe -g data.txt 100
+    To search for 2 in data.txt use Grover-search-algorithm, execute the following command:
+        Grover_Algorithm.exe -g data.txt 2
+    data.txt:
+    2,4,12,23,1,2,3,4,3,3,21,8,
     )";
-#if 1
+#if 0
 	/* read param
 	*/
 	int search_type = -1; /**< 0: classcial-search-algorithm; 1:Grover-search-algorithm; 2:quantum-walk-search-algorithm */
@@ -314,8 +325,8 @@ int main(int argc, char* argv[])
 		return -1;
 	}
 #else
-	int search_type = 2;
-	std::string data_file = "data1.txt";
+	int search_type = 1;
+	std::string data_file = "F:\\data.txt";
 	std::vector<uint32_t> search_data = {21};
 #endif
 	/* run search algorithm

Core/QuantumCircuit/QGate.cpp

@@ -2,6 +2,8 @@
 #include "Core/Utilities/QProgInfo/ConfigMap.h"
 #include "Core/Utilities/Tools/QPandaException.h"
 #include <type_traits>
+#include "Core/Utilities/Tools/QStatMatrix.h"
+
 using namespace QGATE_SPACE;
 using namespace std;
 USING_QPANDA
@@ -604,7 +606,7 @@ QGate QPanda::U3(Qubit* qubit, double theta, double phi, double lambda)
 
 QCircuit QPanda::U3(const QVec& qubits, double theta, double phi, double lambda)
 {
-	string name = "RX";
+	string name = "U3";
 	QCircuit cir = QCircuit();
 	for (auto &qubit : qubits)
 	{
@@ -621,7 +623,7 @@ QGate QPanda::U3(Qubit* qubit, QStat& matrix)
 
 QCircuit QPanda::U3(const QVec& qubits, QStat& matrix)
 {
-	string name = "RX";
+	string name = "U3";
 	QCircuit cir = QCircuit();
 	for (auto &qubit : qubits)
 	{
@@ -2225,10 +2227,10 @@ QGate QPanda::Toffoli(int qaddr0, int qaddr1, int target_qaddr)
 
 QGate QPanda::QOracle(const QVec &qubits, const QStat &matrix)
 {
-    for (size_t i = 0; i < qubits.size() - 1; i++)
-    {
-        QPANDA_ASSERT(qubits[i]->get_phy_addr() >= qubits[i+1]->get_phy_addr(), "Error: QOracle qvec");
-    }
+	if (!is_unitary_matrix_by_eigen(matrix))
+	{
+		QCERR_AND_THROW_ERRSTR(invalid_argument, "Non-unitary matrix for QOracle-gate.");
+	}
 
     auto value = matrix.size();
     for (size_t i = 0; i < qubits.size(); i++)

Core/QuantumCircuit/QNode.cpp

@@ -116,6 +116,21 @@ NodeIter NodeIter::getNextIter()
     }
 }
 
+NodeIter NodeIter::getPreIter()
+{
+	if (nullptr != m_pCur)
+	{
+		auto pItem = m_pCur->getPre();
+		NodeIter temp(pItem);
+		return temp;
+	}
+	else
+	{
+		NodeIter temp(nullptr);
+		return temp;
+	}
+}
+
 bool NodeIter::operator!=(NodeIter  iter) const
 {
     return this->m_pCur != iter.m_pCur;

Core/QuantumCircuit/QProgram.cpp

@@ -470,9 +470,6 @@ size_t OriginProgram::get_qgate_num()
 
 bool OriginProgram::is_measure_last_pos()
 {
-	if (m_last_measure.empty())
-		return false;
-
 	for (auto iter : m_last_measure)
 	{
 		if (iter.second == false)

Core/QuantumMachine/OriginQVM.cpp

@@ -27,7 +27,9 @@ limitations under the License.
 #include "Core/QuantumMachine/QProgExecution.h"
 #include "Core/Utilities/Tools/Uinteger.h"
 #include "Core/QuantumMachine/QProgCheck.h"
+#include "Core/Utilities/QProgInfo/QProgProgress.h"
 #include <set>
+#include <thread>
 
 
 
@@ -462,7 +464,10 @@ void QVM::run(QProg& node)
 		_pGates->initState(0, 1, node.get_max_qubit_addr() + 1);
 
 		QProgExecution prog_exec;
+		_ExecId = uint64_t(&prog_exec);
+		QProgProgress::getInstance().prog_start(_ExecId);
 		prog_exec.execute(node.getImplementationPtr(), nullptr, config, _pGates);
+		QProgProgress::getInstance().prog_end(_ExecId);
 
 		std::map<string, bool>result;
 		prog_exec.get_return_value(result);
@@ -548,6 +553,15 @@ QResult* QVM::getResult()
 
 void QVM::finalize()
 {
+	if (nullptr != _AsyncTask)
+	{	
+		// if( !_AsyncTask->is_finished())
+		// {
+			_AsyncTask->wait();
+		// }
+		delete _AsyncTask;
+	}
+
 	if (nullptr != _Qubit_Pool)
 	{
 		delete _Qubit_Pool;
@@ -578,6 +592,8 @@ void QVM::finalize()
 	_QResult = nullptr;
 	_QMachineStatus = nullptr;
 	_pGates = nullptr;
+	_AsyncTask = nullptr;
+	_ExecId = 0;
 }
 
 size_t QVM::getAllocateQubit()
@@ -1057,6 +1073,26 @@ double QVM::get_expectation(QProg prog, const QHamiltonian& hamiltonian, const Q
 	return total_expectation;
 }
 
+size_t QVM::get_processed_qgate_num()
+{
+	return _AsyncTask->get_process(QProgProgress::getInstance(), _ExecId);
+}
+
+void QVM::async_run(QProg& qProg)
+{
+	_AsyncTask->run(this, qProg);
+}
+
+bool QVM::is_async_finished()
+{
+	return _AsyncTask->is_finished();
+}
+
+std::map<std::string, bool> QVM::get_async_result()
+{
+	return _AsyncTask->result();
+}
+
 static void accumulateProbability(prob_vec& probList, prob_vec& accumulateProb)
 {
 	accumulateProb.clear();