cirq-core 1.5.0.dev20241207174114__py3-none-any.whl → 1.5.0.dev20241209192542__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 10, 0):  # pragma: no cover
         'of cirq (e.g. "python -m pip install cirq==1.1.*")'
     )
 
-__version__ = "1.5.0.dev20241207174114"
+__version__ = "1.5.0.dev20241209192542"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version():
-    assert cirq.__version__ == "1.5.0.dev20241207174114"
+    assert cirq.__version__ == "1.5.0.dev20241209192542"

cirq/contrib/qasm_import/_parser.py

@@ -243,6 +243,24 @@ class QasmParser:
         'ch': QasmGateStatement(
             qasm_gate='ch', cirq_gate=ops.ControlledGate(ops.H), num_params=0, num_args=2
         ),
+        'cu1': QasmGateStatement(
+            qasm_gate='cu1',
+            num_params=1,
+            num_args=2,
+            cirq_gate=(lambda params: ops.ControlledGate(QasmUGate(0, 0, params[0] / np.pi))),
+        ),
+        'cu3': QasmGateStatement(
+            qasm_gate='cu3',
+            num_params=3,
+            num_args=2,
+            cirq_gate=(lambda params: ops.ControlledGate(QasmUGate(*[p / np.pi for p in params]))),
+        ),
+        'crz': QasmGateStatement(
+            qasm_gate='crz',
+            num_params=1,
+            num_args=2,
+            cirq_gate=(lambda params: ops.ControlledGate(ops.rz(params[0]))),
+        ),
         'swap': QasmGateStatement(qasm_gate='swap', cirq_gate=ops.SWAP, num_params=0, num_args=2),
         'cswap': QasmGateStatement(
             qasm_gate='cswap', num_params=0, num_args=3, cirq_gate=ops.CSWAP

cirq/contrib/qasm_import/_parser_test.py

@@ -924,16 +924,24 @@ two_qubit_gates = [
 ]
 
 
+# Mapping of two-qubit gates and `num_params`
+two_qubit_param_gates = {
+    ('cu1', cirq.ControlledGate(QasmUGate(0, 0, 0.1 / np.pi))): 1,
+    ('cu3', cirq.ControlledGate(QasmUGate(0.1 / np.pi, 0.2 / np.pi, 0.3 / np.pi))): 3,
+    ('crz', cirq.ControlledGate(cirq.rz(0.1))): 1,
+}
+
+
 @pytest.mark.parametrize('qasm_gate,cirq_gate', two_qubit_gates)
 def test_two_qubit_gates(qasm_gate: str, cirq_gate: cirq.testing.TwoQubitGate):
     qasm = f"""
-     OPENQASM 2.0;
-     include "qelib1.inc";
-     qreg q1[2];
-     qreg q2[2];
-     {qasm_gate} q1[0], q1[1];
-     {qasm_gate} q1, q2[0];
-     {qasm_gate} q2, q1;
+    OPENQASM 2.0;
+    include "qelib1.inc";
+    qreg q1[2];
+    qreg q2[2];
+    {qasm_gate} q1[0], q1[1];
+    {qasm_gate} q1, q2[0];
+    {qasm_gate} q2, q1;
 """
     parser = QasmParser()
 
@@ -961,11 +969,85 @@ def test_two_qubit_gates(qasm_gate: str, cirq_gate: cirq.testing.TwoQubitGate):
     assert parsed_qasm.qregs == {'q1': 2, 'q2': 2}
 
 
-@pytest.mark.parametrize('qasm_gate', [g[0] for g in two_qubit_gates])
+@pytest.mark.parametrize(
+    'qasm_gate,cirq_gate,num_params',
+    [
+        (gate_map[0], gate_map[1], num_param)
+        for gate_map, num_param in two_qubit_param_gates.items()
+    ],
+)
+def test_two_qubit_param_gates(
+    qasm_gate: str, cirq_gate: cirq.testing.TwoQubitGate, num_params: int
+):
+    params = '(0.1, 0.2, 0.3)' if num_params == 3 else '(0.1)'
+    qasm = f"""
+    OPENQASM 2.0;
+    include "qelib1.inc";
+    qreg q1[2];
+    qreg q2[2];
+    {qasm_gate}{params} q1[0], q1[1];
+    {qasm_gate}{params} q1, q2[0];
+    {qasm_gate}{params} q2, q1;
+    """
+    parser = QasmParser()
+
+    q1_0 = cirq.NamedQubit('q1_0')
+    q1_1 = cirq.NamedQubit('q1_1')
+    q2_0 = cirq.NamedQubit('q2_0')
+    q2_1 = cirq.NamedQubit('q2_1')
+
+    expected_circuit = cirq.Circuit()
+    expected_circuit.append(cirq_gate.on(q1_0, q1_1))
+    expected_circuit.append(cirq_gate.on(q1_0, q2_0))
+    expected_circuit.append(cirq_gate.on(q1_1, q2_0))
+    expected_circuit.append(cirq_gate.on(q2_0, q1_0))
+    expected_circuit.append(cirq_gate.on(q2_1, q1_1))
+    parsed_qasm = parser.parse(qasm)
+
+    assert parsed_qasm.supportedFormat
+    assert parsed_qasm.qelib1Include
+
+    ct.assert_same_circuits(parsed_qasm.circuit, expected_circuit)
+    assert parsed_qasm.qregs == {'q1': 2, 'q2': 2}
+
+
+@pytest.mark.parametrize(
+    'qasm_gate', [g[0] for g in two_qubit_gates] + [g[0] for g in two_qubit_param_gates.keys()]
+)
+def test_two_qubit_gates_not_enough_qubits(qasm_gate: str):
+    if qasm_gate in ('cu1', 'crz'):
+        qasm = f"""
+        OPENQASM 2.0;
+        include "qelib1.inc";
+        qreg q[2];
+        {qasm_gate}(0.1) q[0];
+    """
+    elif qasm_gate == 'cu3':
+        qasm = f"""
+        OPENQASM 2.0;
+        include "qelib1.inc";
+        qreg q[2];
+        {qasm_gate}(0.1, 0.2, 0.3) q[0];
+    """
+    else:
+        qasm = f"""
+        OPENQASM 2.0;
+        include "qelib1.inc";
+        qreg q[2];
+        {qasm_gate} q[0];
+    """
+
+    parser = QasmParser()
+
+    with pytest.raises(QasmException, match=rf".*{qasm_gate}.* takes 2 arg\(s\).*got.*1.*line 5"):
+        parser.parse(qasm)
+
+
+@pytest.mark.parametrize('qasm_gate', [g[0] for g in two_qubit_param_gates.keys()])
 def test_two_qubit_gates_not_enough_args(qasm_gate: str):
     qasm = f"""
-     OPENQASM 2.0;    
-     include "qelib1.inc";             
+     OPENQASM 2.0;
+     include "qelib1.inc";
      qreg q[2];
      {qasm_gate} q[0];
 """
@@ -976,19 +1058,27 @@ def test_two_qubit_gates_not_enough_args(qasm_gate: str):
         parser.parse(qasm)
 
 
-@pytest.mark.parametrize('qasm_gate', [g[0] for g in two_qubit_gates])
+@pytest.mark.parametrize(
+    'qasm_gate', [g[0] for g in two_qubit_gates] + [g[0] for g in two_qubit_param_gates.keys()]
+)
 def test_two_qubit_gates_with_too_much_parameters(qasm_gate: str):
+    if qasm_gate in ('cu1', 'cu3', 'crz'):
+        num_params_needed = 3 if qasm_gate == 'cu3' else 1
+    else:
+        num_params_needed = 0
+
     qasm = f"""
-     OPENQASM 2.0;    
-     include "qelib1.inc";             
-     qreg q[2];
-     {qasm_gate}(pi) q[0],q[1];
-"""
+        OPENQASM 2.0;
+        include "qelib1.inc";
+        qreg q[2];
+        {qasm_gate}(pi, pi/2, pi/3, pi/4) q[0],q[1];
+    """
 
     parser = QasmParser()
 
     with pytest.raises(
-        QasmException, match=rf".*{qasm_gate}.* takes 0 parameter\(s\).*got.*1.*line 5"
+        QasmException,
+        match=rf".*{qasm_gate}*. takes {num_params_needed} parameter\(s\).*got.*4.*line 5",
     ):
         parser.parse(qasm)
 

{cirq_core-1.5.0.dev20241207174114.dist-info → cirq_core-1.5.0.dev20241209192542.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20241207174114
+Version: 1.5.0.dev20241209192542
 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.dev20241207174114.dist-info → cirq_core-1.5.0.dev20241209192542.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=A1qNRdgJODR_Wy5kBLRlVgJNks--0in6YvmUS5F2rpw,1206
-cirq/_version_test.py,sha256=mvMHDO3Ij5dj8js-w0cA8h2l4jZ7ohKrSCr7admuD6Q,147
+cirq/_version.py,sha256=oixWi6sQgXRWW0C2yWJvKmlxsHZd1zBeIcVaNAzG5KU,1206
+cirq/_version_test.py,sha256=cZzmqjzEi-UgTZ8_h7wOX7aNBzAmNTCsR303SwiVtVA,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=03MVo6Y-UYrzt9CKHmwpiBLN2ixL6uSU-OWnKZXfG7k,13302
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -105,8 +105,8 @@ cirq/contrib/paulistring/separate_test.py,sha256=FzR78MSHDhNJxizbXreK6u3BeYhT7xn
 cirq/contrib/qasm_import/__init__.py,sha256=RKX0vGDC2Pe5rH5rM4ClXdvtrAU16ePFImQpiJtJVNo,744
 cirq/contrib/qasm_import/_lexer.py,sha256=J0ExK_6VGMoql0ha0hrxHzbFuqFYazHSSruhgznI66Y,3366
 cirq/contrib/qasm_import/_lexer_test.py,sha256=iiz-cmIt5hnhHBc4ub4btqHnbi4EPaO7BE7bsJKPet8,4142
-cirq/contrib/qasm_import/_parser.py,sha256=3hTbb7ZzEIS8OoGPo2efemzDQT_dTUS9Yjxt3IP6A4s,20416
-cirq/contrib/qasm_import/_parser_test.py,sha256=XwQ6KrrKCgQwXK4u6-I3suFWGdtScNZdTdQT_ykCcuQ,29108
+cirq/contrib/qasm_import/_parser.py,sha256=JroR-z7EcUhVd2-556h007H7SnzmmbqM4tsSOwsvwNw,21061
+cirq/contrib/qasm_import/_parser_test.py,sha256=EliIovGMcHYxgyxm12D41dN7LCM4oBL1okhSsUw0BzM,31706
 cirq/contrib/qasm_import/exception.py,sha256=Wm6cwUPIkNMPjkv-ELpQ-zSoXaiLOddOQ4iYybwuS6I,695
 cirq/contrib/qasm_import/qasm.py,sha256=CP444IWCw4zlDNA7HxsTJ2xIak4mZhQv62ZiLlUc2zo,914
 cirq/contrib/qasm_import/qasm_test.py,sha256=e5b7LVn_6FIFZ6kINqMzJFIjzgtTgutVhgXgX_DcTc0,1861
@@ -1189,8 +1189,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.dev20241207174114.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20241207174114.dist-info/METADATA,sha256=GXOgvkVTPhl38qPeUxSwCABUFmCW-Dow6rJFVCrWvz8,1992
-cirq_core-1.5.0.dev20241207174114.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20241207174114.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20241207174114.dist-info/RECORD,,
+cirq_core-1.5.0.dev20241209192542.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20241209192542.dist-info/METADATA,sha256=fwCbJHlnyj84m62Ft8iabnsYuC3NeRYdFzpZsS-53Is,1992
+cirq_core-1.5.0.dev20241209192542.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20241209192542.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20241209192542.dist-info/RECORD,,