cirq-core 1.5.0.dev20250324231907__py3-none-any.whl → 1.5.0.dev20250325011740__py3-none-any.whl

cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py

@@ -11,11 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import itertools
 import pytest
 
-import cirq
 import numpy as np
+import cirq
 
 from cirq.experiments.single_qubit_readout_calibration_test import NoisySingleQubitReadoutSampler
 from cirq.experiments import random_quantum_circuit_generation as rqcg
@@ -23,26 +23,34 @@ from cirq.experiments import SingleQubitReadoutCalibrationResult
 from cirq.study import ResultDict
 
 
+def _create_test_circuits(qubits: list[cirq.Qid], n_circuits: int) -> list[cirq.Circuit]:
+    """Helper function to generate circuits for testing."""
+    if len(qubits) < 2:
+        raise ValueError(
+            "Need at least two qubits to generate two-qubit circuits."
+        )  # pragma: no cover
+    two_qubit_gates = [cirq.ISWAP**0.5, cirq.CNOT**0.5]
+    input_circuits = []
+    qubit_pairs = list(itertools.combinations(qubits, 2))
+    num_pairs = len(qubit_pairs)
+    for i in range(n_circuits):
+        gate = two_qubit_gates[i % len(two_qubit_gates)]
+        q0, q1 = qubit_pairs[i % num_pairs]
+        circuits = rqcg.generate_library_of_2q_circuits(
+            n_library_circuits=5, two_qubit_gate=gate, q0=q0, q1=q1
+        )
+        for circuit in circuits:
+            circuit.append(cirq.measure(*qubits, key="m"))
+        input_circuits.extend(circuits)
+    return input_circuits
+
+
 def test_shuffled_circuits_with_readout_benchmarking_errors_no_noise():
     """Test shuffled circuits with readout benchmarking with no noise from sampler."""
     qubits = cirq.LineQubit.range(5)
 
     # Generate random input circuits
-    input_circuits = []
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[0], q1=qubits[2]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.CNOT**0.5, q0=qubits[1], q1=qubits[3]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.CNOT**0.5, q0=qubits[0], q1=qubits[4]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[2], q1=qubits[4]
-    )
-    for circuit in input_circuits:
-        circuit.append(cirq.measure(*qubits, key="m"))
+    input_circuits = _create_test_circuits(qubits, 3)
 
     sampler = cirq.Simulator()
     circuit_repetitions = 1
@@ -64,12 +72,15 @@ def test_shuffled_circuits_with_readout_benchmarking_errors_no_noise():
     for measurement in measurements:
         assert isinstance(measurement, ResultDict)
 
-    assert isinstance(readout_calibration_results, SingleQubitReadoutCalibrationResult)
+    for qlist, readout_calibration_result in readout_calibration_results.items():
+        assert isinstance(qlist, tuple)
+        assert all(isinstance(q, cirq.Qid) for q in qlist)
+        assert isinstance(readout_calibration_result, SingleQubitReadoutCalibrationResult)
 
-    assert readout_calibration_results.zero_state_errors == {q: 0 for q in qubits}
-    assert readout_calibration_results.one_state_errors == {q: 0 for q in qubits}
-    assert readout_calibration_results.repetitions == readout_repetitions
-    assert isinstance(readout_calibration_results.timestamp, float)
+        assert readout_calibration_result.zero_state_errors == {q: 0 for q in qubits}
+        assert readout_calibration_result.one_state_errors == {q: 0 for q in qubits}
+        assert readout_calibration_result.repetitions == readout_repetitions
+        assert isinstance(readout_calibration_result.timestamp, float)
 
 
 def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise():
@@ -77,24 +88,7 @@ def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise():
     qubits = cirq.LineQubit.range(6)
 
     # Generate random input circuits
-    input_circuits = []
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[0], q1=qubits[1]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.CNOT**0.5, q0=qubits[1], q1=qubits[3]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.CNOT**0.5, q0=qubits[0], q1=qubits[4]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[2], q1=qubits[4]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[2], q1=qubits[5]
-    )
-    for circuit in input_circuits:
-        circuit.append(cirq.measure(*qubits, key="m"))
+    input_circuits = _create_test_circuits(qubits, 6)
 
     sampler = NoisySingleQubitReadoutSampler(p0=0.1, p1=0.2, seed=1234)
     circuit_repetitions = 1
@@ -115,14 +109,17 @@ def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise():
     for measurement in measurements:
         assert isinstance(measurement, ResultDict)
 
-    assert isinstance(readout_calibration_results, SingleQubitReadoutCalibrationResult)
+    for qlist, readout_calibration_result in readout_calibration_results.items():
+        assert isinstance(qlist, tuple)
+        assert all(isinstance(q, cirq.Qid) for q in qlist)
+        assert isinstance(readout_calibration_result, SingleQubitReadoutCalibrationResult)
 
-    for error in readout_calibration_results.zero_state_errors.values():
-        assert 0.08 < error < 0.12
-    for error in readout_calibration_results.one_state_errors.values():
-        assert 0.18 < error < 0.22
-    assert readout_calibration_results.repetitions == readout_repetitions
-    assert isinstance(readout_calibration_results.timestamp, float)
+        for error in readout_calibration_result.zero_state_errors.values():
+            assert 0.08 < error < 0.12
+        for error in readout_calibration_result.one_state_errors.values():
+            assert 0.18 < error < 0.22
+        assert readout_calibration_result.repetitions == readout_repetitions
+        assert isinstance(readout_calibration_result.timestamp, float)
 
 
 def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise_and_input_qubits():
@@ -131,24 +128,50 @@ def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise_and_input
     readout_qubits = qubits[:4]
 
     # Generate random input circuits
-    input_circuits = []
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[0], q1=qubits[1]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.CNOT**0.5, q0=qubits[1], q1=qubits[3]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.CNOT**0.5, q0=qubits[0], q1=qubits[4]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[2], q1=qubits[4]
-    )
-    input_circuits += rqcg.generate_library_of_2q_circuits(
-        n_library_circuits=5, two_qubit_gate=cirq.ISWAP**0.5, q0=qubits[2], q1=qubits[5]
+    input_circuits = _create_test_circuits(qubits, 6)
+
+    sampler = NoisySingleQubitReadoutSampler(p0=0.1, p1=0.3, seed=1234)
+    circuit_repetitions = 1
+    rng = np.random.default_rng()
+    readout_repetitions = 1000
+
+    measurements, readout_calibration_results = (
+        cirq.contrib.shuffle_circuits.run_shuffled_with_readout_benchmarking(
+            input_circuits,
+            sampler,
+            circuit_repetitions,
+            rng,
+            num_random_bitstrings=100,
+            readout_repetitions=readout_repetitions,
+            qubits=readout_qubits,
+        )
     )
-    for circuit in input_circuits:
-        circuit.append(cirq.measure(*qubits, key="m"))
+
+    for measurement in measurements:
+        assert isinstance(measurement, ResultDict)
+
+    for qlist, readout_calibration_result in readout_calibration_results.items():
+        assert isinstance(qlist, tuple)
+        assert all(isinstance(q, cirq.Qid) for q in qlist)
+        assert isinstance(readout_calibration_result, SingleQubitReadoutCalibrationResult)
+
+        for error in readout_calibration_result.zero_state_errors.values():
+            assert 0.08 < error < 0.12
+        for error in readout_calibration_result.one_state_errors.values():
+            assert 0.28 < error < 0.32
+        assert readout_calibration_result.repetitions == readout_repetitions
+        assert isinstance(readout_calibration_result.timestamp, float)
+
+
+def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise_and_lists_input_qubits():
+    """Test shuffled circuits with readout benchmarking with noise from sampler and input qubits."""
+    qubits_1 = cirq.LineQubit.range(3)
+    qubits_2 = cirq.LineQubit.range(4)
+
+    readout_qubits = [qubits_1, qubits_2]
+
+    # Generate random input circuits and append measurements
+    input_circuits = _create_test_circuits(qubits_1, 6) + _create_test_circuits(qubits_2, 4)
 
     sampler = NoisySingleQubitReadoutSampler(p0=0.1, p1=0.3, seed=1234)
     circuit_repetitions = 1
@@ -170,14 +193,50 @@ def test_shuffled_circuits_with_readout_benchmarking_errors_with_noise_and_input
     for measurement in measurements:
         assert isinstance(measurement, ResultDict)
 
-    assert isinstance(readout_calibration_results, SingleQubitReadoutCalibrationResult)
+    for qlist, readout_calibration_result in readout_calibration_results.items():
+        assert isinstance(qlist, tuple)
+        assert all(isinstance(q, cirq.Qid) for q in qlist)
+        assert isinstance(readout_calibration_result, SingleQubitReadoutCalibrationResult)
+
+        for error in readout_calibration_result.zero_state_errors.values():
+            assert 0.08 < error < 0.12
+        for error in readout_calibration_result.one_state_errors.values():
+            assert 0.28 < error < 0.32
+        assert readout_calibration_result.repetitions == readout_repetitions
+        assert isinstance(readout_calibration_result.timestamp, float)
+
+
+def test_can_handle_zero_random_bitstring():
+    """Test shuffled circuits without readout benchmarking."""
+    qubits_1 = cirq.LineQubit.range(3)
+    qubits_2 = cirq.LineQubit.range(4)
 
-    for error in readout_calibration_results.zero_state_errors.values():
-        assert 0.08 < error < 0.12
-    for error in readout_calibration_results.one_state_errors.values():
-        assert 0.28 < error < 0.32
-    assert readout_calibration_results.repetitions == readout_repetitions
-    assert isinstance(readout_calibration_results.timestamp, float)
+    readout_qubits = [qubits_1, qubits_2]
+
+    # Generate random input circuits and append measurements
+    input_circuits = _create_test_circuits(qubits_1, 6) + _create_test_circuits(qubits_2, 4)
+
+    sampler = NoisySingleQubitReadoutSampler(p0=0.1, p1=0.3, seed=1234)
+    circuit_repetitions = 1
+    rng = np.random.default_rng()
+    readout_repetitions = 1000
+
+    measurements, readout_calibration_results = (
+        cirq.contrib.shuffle_circuits.run_shuffled_with_readout_benchmarking(
+            input_circuits,
+            sampler,
+            circuit_repetitions,
+            rng,
+            num_random_bitstrings=0,
+            readout_repetitions=readout_repetitions,
+            qubits=readout_qubits,
+        )
+    )
+
+    for measurement in measurements:
+        assert isinstance(measurement, ResultDict)
+    # Check that the readout_calibration_results is empty
+    assert len(readout_calibration_results.items()) == 0
 
 
 def test_empty_input_circuits():
@@ -256,16 +315,16 @@ def test_mismatch_circuit_repetitions():
 
 
 def test_zero_num_random_bitstrings():
-    """Test that the number of random bitstrings is zero."""
+    """Test that the number of random bitstrings is smaller than zero."""
     q = cirq.LineQubit(0)
     circuit = cirq.Circuit(cirq.H(q), cirq.measure(q))
-    with pytest.raises(ValueError, match="Must provide non-zero num_random_bitstrings."):
+    with pytest.raises(ValueError, match="Must provide zero or more num_random_bitstrings."):
         cirq.contrib.shuffle_circuits.run_shuffled_with_readout_benchmarking(
             [circuit],
             cirq.ZerosSampler(),
             circuit_repetitions=10,
             rng_or_seed=np.random.default_rng(456),
-            num_random_bitstrings=0,
+            num_random_bitstrings=-1,
             readout_repetitions=100,
         )
 

{cirq_core-1.5.0.dev20250324231907.dist-info → cirq_core-1.5.0.dev20250325011740.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20250324231907
+Version: 1.5.0.dev20250325011740
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.5.0.dev20250324231907.dist-info → cirq_core-1.5.0.dev20250325011740.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=Qq3ZcfgD-Nb81cEppQdJqhAyrVqXKtfXZYGXT0p-Wh0,34718
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=p9gMHJscbtDDkfHOaulvd3Aer0pwUF5AXpL89XR8dNw,8402
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=bXNm9wjRS2yb59ChuevzXgXEMJfZ495Vr0XGpe7pXyA,1206
-cirq/_version_test.py,sha256=Uyl5_9YIV7Gbj5Q40b3AiRwCbRVzsPO9dGLL4XWBfj8,147
+cirq/_version.py,sha256=d-6sJd05uGoRTtsLD5RUAfMZ_Loij6nd7W38mRx6_jM,1206
+cirq/_version_test.py,sha256=eUtDoSz2ow6ApcO_ln5Iy6ysSFcqsRy-LDjKQb01-Vk,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=p-vEOa-8GQ2cFIAdze-kd6C1un1uRvtujVPljVKaHBg,13557
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -87,7 +87,7 @@ cirq/contrib/hacks/disable_validation_test.py,sha256=nuDfktj3bD7oFlae3R0Jf_qcAo8
 cirq/contrib/noise_models/__init__.py,sha256=O3wvaQ6kyNZzwsCnMMZvr2EyS76LpO9xnVZ69a2obv0,957
 cirq/contrib/noise_models/noise_models.py,sha256=qFisVwg94-YqGoru5z5bqy_9_PHBI124rI4Gy34ogHI,7658
 cirq/contrib/noise_models/noise_models_test.py,sha256=nELHWYWbRp6RCurjTSEAumpZPMY2gNN3S4Mhho3pwJ0,10488
-cirq/contrib/paulistring/__init__.py,sha256=5KmN-WfpVgQoHJEznRZA-gBXOP5i7hn42juzUEcWlto,1618
+cirq/contrib/paulistring/__init__.py,sha256=1k2_MYLTMPn8AFoJvSgpN-F-6xgmDjKXRhb-FdDsFoQ,1761
 cirq/contrib/paulistring/clifford_optimize.py,sha256=q2lTMivOGoxncxnQ8CxnwlV9kSsHzETsTWG705FG9qw,7849
 cirq/contrib/paulistring/clifford_optimize_test.py,sha256=IttwXaYRftUb84Sz3fEJFDl9fZ8NwzcbNsuFAJeLR_8,3890
 cirq/contrib/paulistring/clifford_target_gateset.py,sha256=r2Nkq3gbENGyeRrRHtjdx5_uoSR0UfXojlTLhNNGTL8,6353
@@ -96,6 +96,8 @@ cirq/contrib/paulistring/optimize.py,sha256=qhBOGxLYovUua_xVqXWgVDPRRmv4VOmyFgKV
 cirq/contrib/paulistring/optimize_test.py,sha256=jie0UomSCIj90TMv3MIi4hd32iTjttQ8-zr7ZDs0tug,3560
 cirq/contrib/paulistring/pauli_string_dag.py,sha256=vg0994h84zHIejSdwfqR-mdwmHOWWOAOOcGuStfKPdk,1106
 cirq/contrib/paulistring/pauli_string_dag_test.py,sha256=rlwbuh0DvFv1GlJIqEG1OI_geY77dzxo4bb7qqDkz8M,1125
+cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation.py,sha256=ULhFIH8LBbDNHpPd0ulXTCm-hGqpbZBxrQLolSKfBg4,15675
+cirq/contrib/paulistring/pauli_string_measurement_with_readout_mitigation_test.py,sha256=srkjiczY5WLfwzltmc0cn0J6atZyJ8qWL-oiUZuGPDI,21717
 cirq/contrib/paulistring/pauli_string_optimize.py,sha256=81MDk6rKl0jmw7DXFkA02YmluiXLLznuuCTvca7mVoY,2815
 cirq/contrib/paulistring/pauli_string_optimize_test.py,sha256=f1BWjg8IGw5ChXFYNVhYKNIrFul8PgvpnOEadkRm-3Q,2897
 cirq/contrib/paulistring/recombine.py,sha256=SU6DNj3Y9Wicf9pMP3IYzdWV7Fuz1DA_1v2AtUVnuF4,4355
@@ -147,8 +149,8 @@ cirq/contrib/routing/swap_network_test.py,sha256=XxbjIvOowvtOVwT2RN4e7YWlLebLm98
 cirq/contrib/routing/utils.py,sha256=P0_PnaGfy4Rm6CVl9FE7RpdZ0YzGtimcW1acduvp5rU,3761
 cirq/contrib/routing/utils_test.py,sha256=1oGEDAd70uQ2OrBwbaQd1DYoPcMSZsBQ2l5VLJBtXBM,2021
 cirq/contrib/shuffle_circuits/__init__.py,sha256=AL-V3OaZiaF596WTLlyxDPk0t1WMpTHpQrpRW_A9t48,832
-cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking.py,sha256=ly4O2xhukp8xkBbk-a0ukSykd1G1yR-L91XNxdePBWU,9660
-cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py,sha256=3SQO5bjrfs1ZRbDNTa_D90f8gx_HL6WCZs1d0IPdEMQ,11790
+cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking.py,sha256=eQmB7hoWaPqqUV3xgcUKIPTtGpv0ze_dM01ygQt33XU,10844
+cirq/contrib/shuffle_circuits/shuffle_circuits_with_readout_benchmarking_test.py,sha256=L2Mx3LV_chDxg_v4NDnIF7ciHYqvKt04ulgwu0J4vMM,13862
 cirq/contrib/svg/__init__.py,sha256=m7d-CNT2j74uNQdmM2xJ1a7HG6v0FZMt8eAwW4rPJpI,148
 cirq/contrib/svg/svg.py,sha256=d4_XgDNb8o1lDINVJA44XXunGmK71qTAlqw2sc_UnAo,9366
 cirq/contrib/svg/svg_test.py,sha256=gBHXeosNRHzrKWVo-JwhZLguHbksKQSiFwZ8fUXp-a8,2379
@@ -1204,8 +1206,8 @@ cirq/work/sampler.py,sha256=bE5tmVkcR6cZZMLETxDfHehdsYUMbx2RvBeIBetehI4,19187
 cirq/work/sampler_test.py,sha256=hL2UWx3dz2ukZVNxWftiKVvJcQoLplLZdQm-k1QcA40,13282
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.5.0.dev20250324231907.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20250324231907.dist-info/METADATA,sha256=4ul72ja6IXP4tgU4GvJCa5ZNQYD7lG8zztvDAeuL5LU,4817
-cirq_core-1.5.0.dev20250324231907.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20250324231907.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20250324231907.dist-info/RECORD,,
+cirq_core-1.5.0.dev20250325011740.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20250325011740.dist-info/METADATA,sha256=7i9e7_hzorhn4V5_bHicUgFm5Y4ysVIm5S6lRkWNl84,4817
+cirq_core-1.5.0.dev20250325011740.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20250325011740.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20250325011740.dist-info/RECORD,,