Merge pull request #564 from qiboteam/fixadd

Fix sampling when using `circuit.add()`

Author: scarrazza

src/qibo/abstractions/circuit.py

@@ -148,6 +148,10 @@ def __add__(self, circuit):
                 newcircuit.check_measured(v)
                 newcircuit.measurement_tuples[k] = v
             newcircuit.measurement_gate.add(circuit.measurement_gate)
+
+        # Re-execute full circuit when sampling if one of the circuit has repeated_execution True
+        newcircuit.repeated_execution = self.repeated_execution or circuit.repeated_execution
+
         return newcircuit
 
     def on_qubits(self, *q):

src/qibo/tests/test_core_circuit_noise.py

@@ -160,3 +160,37 @@ def test_density_matrix_circuit_errors():
     c = Circuit(5)
     with pytest.raises(ValueError):
         c.add(gates.KrausChannel([((0,), np.eye(2))]))
+
+
+def test_circuit_add_sampling(backend):
+    """Check measurements when simulating added circuits with noise"""
+    # Create random noisy circuit and add noiseless inverted circuit
+    gates_set = [gates.X, gates.Y, gates.Z, gates.H, gates.S, gates.SDG, gates.I]
+    circ = Circuit(1)
+    circ_no_noise = Circuit(1)
+
+    for _ in range(10):
+        new_gate = np.random.choice(gates_set)(0)
+        circ.add(gates.PauliNoiseChannel(0, pz=0.01))
+        circ.add(new_gate)
+        circ_no_noise.add(new_gate)
+
+    circ.add(gates.PauliNoiseChannel(0, pz=0.01))
+    circ += circ_no_noise.invert()
+    circ.add(gates.M(0))
+
+    # Sampling using 10 shots
+    np.random.seed(123)
+    K.set_seed(123)
+    samples = circ(nshots=10).samples()
+
+    # Sampling using 1 shot in for loop
+    target_samples = []
+    K.set_seed(123)
+    np.random.seed(123)
+    for _ in range(10):
+        target_samples.append(circ(nshots=1).samples())
+
+    target_samples = np.stack(target_samples)
+
+    K.assert_allclose(samples, target_samples[:, 0])