cirq-core 1.7.0.dev20250908175529__py3-none-any.whl → 1.7.0.dev20250911065641__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 11, 0):  # pragma: no cover
         'of Cirq (e.g. "python -m pip install cirq==1.5.0")'
     )
 
-__version__ = "1.7.0.dev20250908175529"
+__version__ = "1.7.0.dev20250911065641"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version() -> None:
-    assert cirq.__version__ == "1.7.0.dev20250908175529"
+    assert cirq.__version__ == "1.7.0.dev20250911065641"

cirq/contrib/qasm_import/_lexer.py

@@ -48,6 +48,7 @@ class QasmLexer:
         'ID',
         'ARROW',
         'EQ',
+        'AND',
     ] + list(reserved.values())
 
     def t_newline(self, t):
@@ -101,6 +102,10 @@ class QasmLexer:
         """=="""
         return t
 
+    def t_AND(self, t):
+        """&&"""
+        return t
+
     def t_ID(self, t):
         r"""[a-zA-Z_][a-zA-Z\d_]*"""
         if t.value in QasmLexer.reserved:

cirq/contrib/qasm_import/_parser.py

@@ -1100,19 +1100,34 @@ class QasmParser:
 
         p[0] = [ops.ResetChannel().on(qreg[i]) for i in range(len(qreg))]
 
+    # condition list
+    # condition_list : carg EQ NATURAL_NUMBER
+    #                | condition_list AND carg EQ NATURAL_NUMBER
+
+    def p_condition_list_single(self, p):
+        """condition_list : carg EQ NATURAL_NUMBER"""
+        p[0] = [(p[1], p[3])]
+
+    def p_condition_list_and(self, p):
+        """condition_list : condition_list AND carg EQ NATURAL_NUMBER"""
+        p[0] = p[1] + [(p[3], p[5])]
+
     # if operations
     # if : IF '(' carg EQ NATURAL_NUMBER ')' ID qargs
 
     def p_if(self, p):
-        """if : IF '(' carg EQ NATURAL_NUMBER ')' gate_op"""
-        # We have to split the register into bits (since that's what measurement does above),
-        # and create one condition per bit, checking against that part of the binary value.
+        """if : IF '(' condition_list ')' gate_op"""
+        # For each condition, we have to split the register into bits (since that's what
+        # measurement does above), and create one condition per bit, checking against that part of
+        # the binary value.
         conditions = []
-        for i, key in enumerate(p[3]):
-            v = (p[5] >> i) & 1
-            conditions.append(sympy.Eq(sympy.Symbol(key), v))
+        for cond in p[3]:
+            carg, val = cond
+            for i, key in enumerate(carg):
+                v = (val >> i) & 1
+                conditions.append(sympy.Eq(sympy.Symbol(key), v))
         p[0] = [
-            ops.ClassicallyControlledOperation(conditions=conditions, sub_operation=tuple(p[7])[0])
+            ops.ClassicallyControlledOperation(conditions=conditions, sub_operation=tuple(p[5])[0])
         ]
 
     def p_gate_params_multiple(self, p):

cirq/contrib/qasm_import/_parser_test.py

@@ -294,12 +294,50 @@ def test_classical_control_multi_bit() -> None:
     ct.assert_same_circuits(parsed_qasm.circuit, expected_circuit)
     assert parsed_qasm.qregs == {'q': 2}
 
-    # Note that this will *not* round-trip, but there's no good way around that due to the
-    # difference in how Cirq and QASM do multi-bit measurements.
-    with pytest.raises(ValueError, match='QASM does not support multiple conditions'):
+    # Note that this will *not* round-trip in QASM 2.0, but there's no good way around that due
+    # to the difference in how Cirq and QASM 2.0 do multi-bit measurements.
+    # Exporting multi-controlled operations in QASM 3.0 is supported with explicit '&&' between
+    # conditions.
+    with pytest.raises(
+        ValueError,
+        match='QASM 2.0 does not support multiple conditions. Consider exporting with QASM 3.0.',
+    ):
         _ = cirq.qasm(parsed_qasm.circuit)
 
 
+def test_classical_control_multi_cond_and() -> None:
+    qasm = """OPENQASM 3.0;
+        include "stdgates.inc";
+        qubit[2] q;
+        bit[2] a;
+
+        a[0] = measure q[0];
+        a[1] = measure q[1];
+
+        if (a[0]==1 && a[1]==0) cx q[0],q[1];
+    """
+    parser = QasmParser()
+
+    q_0 = cirq.NamedQubit('q_0')
+    q_1 = cirq.NamedQubit('q_1')
+
+    # Expect two independent conditions: a_0 == 1 and a_1 == 0
+    expected_circuit = cirq.Circuit(
+        cirq.measure(q_0, key='a_0'),
+        cirq.measure(q_1, key='a_1'),
+        cirq.CNOT(q_0, q_1).with_classical_controls(
+            sympy.Eq(sympy.Symbol('a_0'), 1), sympy.Eq(sympy.Symbol('a_1'), 0)
+        ),
+    )
+
+    parsed_qasm = parser.parse(qasm)
+
+    assert parsed_qasm.supportedFormat
+
+    ct.assert_same_circuits(parsed_qasm.circuit, expected_circuit)
+    assert parsed_qasm.qregs == {'q': 2}
+
+
 def test_CX_gate_not_enough_args() -> None:
     qasm = """OPENQASM 2.0;
      qreg q[2];

cirq/ops/classically_controlled_operation.py

@@ -234,9 +234,12 @@ class ClassicallyControlledOperation(raw_types.Operation):
 
     def _qasm_(self, args: cirq.QasmArgs) -> str | None:
         args.validate_version('2.0', '3.0')
-        if len(self._conditions) > 1:
-            raise ValueError('QASM does not support multiple conditions.')
+        if args.version == "2.0" and len(self._conditions) > 1:
+            raise ValueError(
+                'QASM 2.0 does not support multiple conditions. Consider exporting with QASM 3.0.'
+            )
         subop_qasm = protocols.qasm(self._sub_operation, args=args)
         if not self._conditions:
             return subop_qasm
-        return f'if ({protocols.qasm(self._conditions[0], args=args)}) {subop_qasm}'
+        condition_qasm = " && ".join(protocols.qasm(c, args=args) for c in self._conditions)
+        return f'if ({condition_qasm}) {subop_qasm}'

cirq/ops/classically_controlled_operation_test.py

@@ -281,8 +281,32 @@ def test_qasm_multiple_conditions() -> None:
             sympy.Eq(sympy.Symbol('a'), 0), sympy.Eq(sympy.Symbol('b'), 0)
         ),
     )
-    with pytest.raises(ValueError, match='QASM does not support multiple conditions'):
-        _ = cirq.qasm(circuit)
+    with pytest.raises(
+        ValueError,
+        match='QASM 2.0 does not support multiple conditions. Consider exporting with QASM 3.0.',
+    ):
+        _ = cirq.qasm(circuit, args=cirq.QasmArgs(version='2.0'))
+
+    qasm = cirq.qasm(circuit, args=cirq.QasmArgs(version='3.0'))
+    assert (
+        qasm
+        == f"""// Generated from Cirq v{cirq.__version__}
+
+OPENQASM 3.0;
+include "stdgates.inc";
+
+
+// Qubits: [q(0), q(1)]
+qubit[2] q;
+bit[1] m_a;
+bit[1] m_b;
+
+
+m_a[0] = measure q[0];
+m_b[0] = measure q[0];
+if (m_a==0 && m_b==0) x q[1];
+"""
+    )
 
 
 @pytest.mark.parametrize('sim', ALL_SIMULATORS)

{cirq_core-1.7.0.dev20250908175529.dist-info → cirq_core-1.7.0.dev20250911065641.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cirq-core
-Version: 1.7.0.dev20250908175529
+Version: 1.7.0.dev20250911065641
 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.7.0.dev20250908175529.dist-info → cirq_core-1.7.0.dev20250911065641.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=emXpdD5ZvwLRlFAoQB8YatmZyU3b4e9jg6FppMTUhkU,33900
 cirq/_doc.py,sha256=BrnoABo1hk5RgB3Cgww4zLHUfiyFny0F1V-tOMCbdaU,2909
 cirq/_import.py,sha256=ixBu4EyGl46Ram2cP3p5eZVEFDW5L2DS-VyTjz4N9iw,8429
 cirq/_import_test.py,sha256=oF4izzOVZLc7NZ0aZHFcGv-r01eiFFt_JORx_x7_D4s,1089
-cirq/_version.py,sha256=peD3jdd4i1zz-kBXjyBiWStm84FTXi0JoeG5K60G1Os,1206
-cirq/_version_test.py,sha256=irjfu-J0IKWfdEDgUtT48B73Y-gKsscTkP7J1vN8c0c,155
+cirq/_version.py,sha256=Go2wwqS6uXaLb2-LFRp-MU91zKOL-ZjCGSkbI9Xout4,1206
+cirq/_version_test.py,sha256=yoE7HlOdIzRCj0UO0qpo7Baaws-kh1jAkELb0op1LVc,155
 cirq/conftest.py,sha256=wSDKNdIQRDfLnXvOCWD3erheOw8JHRhdfQ53EyTUIXg,1239
 cirq/json_resolver_cache.py,sha256=A5DIgFAY1hUNt9vai_C3-gGBv24116CJMzQxMcXOax4,13726
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -117,10 +117,10 @@ cirq/contrib/paulistring/recombine_test.py,sha256=ydCc2JxmmjZ8TR-Ojyy5lIRed_P-n6
 cirq/contrib/paulistring/separate.py,sha256=h3UHkJp2dAQn9wrW57Z2s6GvfnPZwRMzTHULoyJVfkw,3955
 cirq/contrib/paulistring/separate_test.py,sha256=mp_ixjxS9-YypnJkgApFzSV0QGJt0SDG23S34Ni57QY,1311
 cirq/contrib/qasm_import/__init__.py,sha256=RKX0vGDC2Pe5rH5rM4ClXdvtrAU16ePFImQpiJtJVNo,744
-cirq/contrib/qasm_import/_lexer.py,sha256=myIldLE-8oBr6QdHbHk0_Ub1CuORbhU53vsGg04K1iw,2935
+cirq/contrib/qasm_import/_lexer.py,sha256=dG91z4Nsl3uXKjwXoYNnLEQhHovz7QNu49jBXJBt7Rk,3009
 cirq/contrib/qasm_import/_lexer_test.py,sha256=yaWshvgmwXNHPM6Gy01IPdv_baksSN5FGk1J6fhloRU,7341
-cirq/contrib/qasm_import/_parser.py,sha256=7mh7PB4ngub1K48RWulJ0adWx--LdkFKLBh7j6rhyEg,43526
-cirq/contrib/qasm_import/_parser_test.py,sha256=V96NsSVVAmDqFNz36KCzk0bAJg2UbBZOwIsWJnYpGaA,67648
+cirq/contrib/qasm_import/_parser.py,sha256=Q-OlSaaf0ORGhUMJmMRP_h5lRiyKZrWgMn1_hxJ8gjo,44024
+cirq/contrib/qasm_import/_parser_test.py,sha256=lhBVVkx8Yt5iqwvmgWR1XRKXdxCRiEMFrh-sEtJqlX0,68713
 cirq/contrib/qasm_import/exception.py,sha256=DdqXaHmZU1TaxaHqXW23yp9bqXxdxqkq4tErGd9VHj8,731
 cirq/contrib/qasm_import/qasm.py,sha256=k_uX-ITaxHRcrP87kuUNgudloG_ns0HURJLoyq4scqU,989
 cirq/contrib/qasm_import/qasm_test.py,sha256=mwgl7dIOt50hvxTVTiy1HpVxAjyBSb59R3_Hi-5LUIU,1906
@@ -287,8 +287,8 @@ cirq/ops/arithmetic_operation.py,sha256=cokwokyzKa3zJkyxopP81fTRMutHfI277ZObKw9E
 cirq/ops/arithmetic_operation_test.py,sha256=F5fPQF_sRWi8qyP_SgDzJ8kfX0jUVMj59_VOPpbXH_0,4938
 cirq/ops/boolean_hamiltonian.py,sha256=x25fraM9NNs-XzDKDl2AZ1AMpkVovfe-dNm_0wOolyI,14927
 cirq/ops/boolean_hamiltonian_test.py,sha256=_4mFFrbO9C21oZYutr_pl01_bqDDxvgY_h4DWKGkse0,8630
-cirq/ops/classically_controlled_operation.py,sha256=Oro9yC5-2p7_O5IpHz-qHAmnry79qOfiRL-BKmVbnpQ,10290
-cirq/ops/classically_controlled_operation_test.py,sha256=OedFFoAwS4WnHKG58xgjhbKFgKebhYyP8I7AU4a0m9k,50425
+cirq/ops/classically_controlled_operation.py,sha256=EjhW86dz6d6EwEupM6Rb9MWedb6nRusLOlaaFudEVbk,10445
+cirq/ops/classically_controlled_operation_test.py,sha256=-LDfOotkjxdXJXACVoteWkgmyaTuCcmV4Vy3DHZaWvY,50861
 cirq/ops/clifford_gate.py,sha256=F4RiKZcf8PT1oUR0PfXPrIgDUcr9FJkwppPW39dpM2M,40078
 cirq/ops/clifford_gate_test.py,sha256=nuIGDqc7AWf5KJY3JJSe4mt8egLlcyuf5oorX_aBdsU,41268
 cirq/ops/common_channels.py,sha256=ZZa2JCyPtrKfGhcAGCUUzA4qym8S9isKs-xs-TEkhKs,37022
@@ -1234,8 +1234,8 @@ cirq/work/sampler.py,sha256=rxbMWvrhu3gfNSBjZKozw28lLKVvBAS_1EGyPdYe8Xg,19041
 cirq/work/sampler_test.py,sha256=SsMrRvLDYELyOAWLKISjkdEfrBwLYWRsT6D8WrsLM3Q,13533
 cirq/work/zeros_sampler.py,sha256=Fs2JWwq0n9zv7_G5Rm-9vPeHUag7uctcMOHg0JTkZpc,2371
 cirq/work/zeros_sampler_test.py,sha256=lQLgQDGBLtfImryys2HzQ2jOSGxHgc7-koVBUhv8qYk,3345
-cirq_core-1.7.0.dev20250908175529.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.7.0.dev20250908175529.dist-info/METADATA,sha256=fXvmqayZ0OHs9WbYqQ-ujSuM3BgFtd91eDyQEKUEHCY,4758
-cirq_core-1.7.0.dev20250908175529.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cirq_core-1.7.0.dev20250908175529.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.7.0.dev20250908175529.dist-info/RECORD,,
+cirq_core-1.7.0.dev20250911065641.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.7.0.dev20250911065641.dist-info/METADATA,sha256=Q3XoM__mKjWrpwbt7HxfpuE92Ou3ZRczDtgV5v2zRBs,4758
+cirq_core-1.7.0.dev20250911065641.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cirq_core-1.7.0.dev20250911065641.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.7.0.dev20250911065641.dist-info/RECORD,,