[QI-NNN] Add reset gate to circuit parser (#163)

Author: QFer

src/quantuminspire/qiskit/backend_qx.py

@@ -54,8 +54,8 @@ class QuantumInspireBackend(Backend):  # type: ignore
         backend_name='qi_simulator',
         backend_version=quantum_inspire_version,
         n_qubits=26,
-        basis_gates=['x', 'y', 'z', 'h', 'rx', 'ry', 'rz', 's', 'sdg', 't', 'tdg', 'cx', 'ccx', 'p',
-                     'id', 'swap', 'cz', 'snapshot', 'delay', 'barrier'],
+        basis_gates=['x', 'y', 'z', 'h', 'rx', 'ry', 'rz', 's', 'sdg', 't', 'tdg', 'cx', 'ccx', 'p', 'u',
+                     'id', 'swap', 'cz', 'snapshot', 'delay', 'barrier', 'reset'],
         gates=[GateConfig(name='NotUsed', parameters=['NaN'], qasm_def='NaN')],
         local=False,
         simulator=True,

src/quantuminspire/qiskit/circuit_parser.py

@@ -18,8 +18,6 @@
 from io import StringIO
 from typing import Optional, Tuple, List
 
-import numpy as np
-
 from qiskit.qobj import QasmQobjInstruction
 from quantuminspire.exceptions import ApiError
 from quantuminspire.qiskit.measurements import Measurements
@@ -37,7 +35,6 @@ def __init__(self, basis_gates: List[str], measurements: Measurements, full_stat
         self.basis_gates = basis_gates.copy()
         if len(self.basis_gates) > 0:
             self.basis_gates.append("measure")
-            self.basis_gates.append("u")
         self.bfunc_instructions: List[QasmQobjInstruction] = []
         self.full_state_projection = full_state_projection
         self.measurements = measurements
@@ -566,6 +563,15 @@ def _c_barrier(stream: StringIO, instruction: QasmQobjInstruction, binary_contro
 
         """
 
+    def _reset(self, stream: StringIO, instruction: QasmQobjInstruction) -> None:
+        """ Translates the reset element.
+
+        :param stream: The string-io stream to where the resulting cQASM is written.
+        :param instruction: The Qiskit instruction to translate to cQASM.
+
+        """
+        stream.write('prep_z q[{0}]\n'.format(*instruction.qubits))
+
     @staticmethod
     def _delay(stream: StringIO, instruction: QasmQobjInstruction) -> None:
         """ Translates the delay element for a qubit. In cQASM wait parameter is int and the unit is hardware cycles.

src/quantuminspire/qiskit/quantum_inspire_provider.py

@@ -92,7 +92,7 @@ def _adjust_backend_configuration(config: QasmBackendConfiguration, backend: Dic
             config.basis_gates = []
             for keys in backend['allowed_operations']:
                 if keys in ['single_gates', 'parameterized_single_gates', 'dual_gates',
-                            'parameterized_dual_gates', 'triple_gates', 'wait', 'barrier']:
+                            'parameterized_dual_gates', 'triple_gates', 'wait', 'barrier', 'prep']:
                     for gate in backend['allowed_operations'][keys]:
                         if gate in ['x', 'y', 'z', 'h', 's', 't', 'rx', 'ry', 'rz', 'swap', 'cz', 'barrier']:
                             config.basis_gates += [gate]
@@ -108,7 +108,10 @@ def _adjust_backend_configuration(config: QasmBackendConfiguration, backend: Dic
                             config.basis_gates += ['cx']
                         elif gate == 'toffoli':
                             config.basis_gates += ['ccx']
+                        elif gate == 'prep' or gate == 'prep_z':
+                            config.basis_gates += ['reset']
             if 'rz' in config.basis_gates and 'ry' in config.basis_gates:
+                config.basis_gates += ['u']
                 config.basis_gates += ['p']
 
         config.simulator = not backend['is_hardware_backend']

src/tests/quantuminspire/qiskit/test_backend_qx.py

@@ -86,8 +86,8 @@ def test_backend_default_configuration(self):
             backend_name='qi_simulator',
             backend_version=quantum_inspire_version,
             n_qubits=26,
-            basis_gates=['x', 'y', 'z', 'h', 'rx', 'ry', 'rz', 's', 'sdg', 't', 'tdg', 'cx', 'ccx', 'p',
-                         'id', 'swap', 'cz', 'snapshot', 'delay', 'barrier'],
+            basis_gates=['x', 'y', 'z', 'h', 'rx', 'ry', 'rz', 's', 'sdg', 't', 'tdg', 'cx', 'ccx', 'p', 'u',
+                         'id', 'swap', 'cz', 'snapshot', 'delay', 'barrier', 'reset'],
             gates=[GateConfig(name='NotUsed', parameters=['NaN'], qasm_def='NaN')],
             conditional=True,
             simulator=True,

src/tests/quantuminspire/qiskit/test_circuit_parser.py

@@ -270,6 +270,28 @@ def test_generate_cqasm_correct_output_delay_units_in_s(self):
         self.assertTrue('wait q[2], 1\n' in result)
         self.assertTrue('wait q[3], 1\n' in result)
 
+    def test_generate_cqasm_correct_output_reset_qubit(self):
+        q1 = QuantumRegister(1, "q1")
+        q2 = QuantumRegister(2, "q2")
+        c1 = ClassicalRegister(1, "c1")
+        c2 = ClassicalRegister(2, "c2")
+        qc = QuantumCircuit(q1, q2, c1, c2, name="test")
+
+        qc.reset(q1)
+        result = self._generate_cqasm_from_circuit(qc)
+        self.assertTrue('prep_z q[0]\n' in result)
+
+    def test_generate_cqasm_correct_output_reset_qubits(self):
+        q1 = QuantumRegister(1, "q1")
+        q2 = QuantumRegister(2, "q2")
+        c1 = ClassicalRegister(1, "c1")
+        c2 = ClassicalRegister(2, "c2")
+        qc = QuantumCircuit(q1, q2, c1, c2, name="test")
+
+        qc.reset(q2)
+        result = self._generate_cqasm_from_circuit(qc)
+        self.assertTrue('prep_z q[1]\nprep_z q[2]\n' in result)
+
     def test_generate_cqasm_correct_output_identity(self):
         qc = QuantumCircuit(2, 2)
         qc.i(0)

src/tests/quantuminspire/qiskit/test_quantum_inspire_provider.py

@@ -56,6 +56,7 @@ class TestQuantumInspireProvider(unittest.TestCase):
                               'allowed_operations': {
                                   'measure': ['measure_z', 'measure_x'],
                                   'measure_all': ['measure_all'],
+                                  'prep': ['prep_z'],
                                   'parameterized_single_gates': ['rx', 'ry', 'rz'],
                                   'single_gates': ['x', 'y', 'z', 'h', 'i', 't', 'tdag', 's', 'sdag'],
                                   'dual_gates': ['cz', 'cr', 'cnot', 'swap'],
@@ -127,8 +128,8 @@ def test_simulator_backend(self):
             self.assertTrue(backend.configuration().multiple_measurements)
             self.assertFalse(backend.configuration().parallel_computing)
             self.assertEqual(backend.configuration().basis_gates, ['x', 'y', 'z', 'h', 'rx', 'ry', 'rz', 's', 'sdg',
-                                                                   't', 'tdg', 'cx', 'ccx', 'p', 'id',
-                                                                   'swap', 'cz', 'snapshot', 'delay', 'barrier'])
+                                                                   't', 'tdg', 'cx', 'ccx', 'p', 'u', 'id',
+                                                                   'swap', 'cz', 'snapshot', 'delay', 'barrier', 'reset'])
 
     def test_hardware_backend(self):
         with mock.patch('quantuminspire.qiskit.quantum_inspire_provider.QuantumInspireAPI') as api:
@@ -177,9 +178,10 @@ def test_hardware_backend2(self):
             self.assertFalse(backend.configuration().conditional)
             self.assertTrue(backend.configuration().multiple_measurements)
             self.assertFalse(backend.configuration().parallel_computing)
-            self.assertEqual(backend.configuration().basis_gates, ['rx', 'ry', 'rz', 'x', 'y', 'z', 'h', 'id', 't',
+            self.assertEqual(backend.configuration().basis_gates, ['reset', 'rx', 'ry', 'rz', 'x', 'y', 'z',
+                                                                   'h', 'id', 't',
                                                                    'tdg', 's', 'sdg', 'cz', 'cx', 'swap',
-                                                                   'ccx', 'barrier', 'delay', 'p'])
+                                                                   'ccx', 'barrier', 'delay', 'u', 'p'])
 
     def test_set_authentication_details(self):
         with mock.patch('quantuminspire.qiskit.quantum_inspire_provider.QuantumInspireAPI') as api: