cirq-core 1.5.0.dev20250115165326__py3-none-any.whl → 1.5.0.dev20250115173001__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.dev20250115165326"
+__version__ = "1.5.0.dev20250115173001"

cirq/_version_test.py

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

cirq/transformers/align.py

@@ -73,4 +73,14 @@ def align_right(
     """
     if context is not None and context.deep is True:
         context = dataclasses.replace(context, deep=False)
-    return align_left(circuit[::-1], context=context)[::-1]
+    # Reverse the circuit, align left, and reverse again. Note each moment also has to have its ops
+    # reversed internally, to avoid edge conditions where non-commuting but can-be-in-same-moment
+    # ops (measurements and classical controls, particularly) could end up getting swapped.
+    backwards = []
+    for moment in circuit[::-1]:
+        backwards.append(circuits.Moment(reversed(moment.operations)))
+    aligned_backwards = align_left(circuits.Circuit(backwards), context=context)
+    forwards = []
+    for moment in aligned_backwards[::-1]:
+        forwards.append(circuits.Moment(reversed(moment.operations)))
+    return circuits.Circuit(forwards)

cirq/transformers/align_test.py

@@ -208,3 +208,16 @@ def test_classical_control():
     )
     cirq.testing.assert_same_circuits(cirq.align_left(circuit), circuit)
     cirq.testing.assert_same_circuits(cirq.align_right(circuit), circuit)
+
+
+def test_measurement_and_classical_control_same_moment_preserve_order():
+    q0, q1 = cirq.LineQubit.range(2)
+    circuit = cirq.Circuit()
+    op_measure = cirq.measure(q0, key='m')
+    op_controlled = cirq.X(q1).with_classical_controls('m')
+    circuit.append(op_measure)
+    circuit.append(op_controlled, cirq.InsertStrategy.INLINE)
+    circuit = cirq.align_right(circuit)
+    ops_in_order = list(circuit.all_operations())
+    assert ops_in_order[0] == op_measure
+    assert ops_in_order[1] == op_controlled

{cirq_core-1.5.0.dev20250115165326.dist-info → cirq_core-1.5.0.dev20250115173001.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20250115165326
+Version: 1.5.0.dev20250115173001
 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.dev20250115165326.dist-info → cirq_core-1.5.0.dev20250115173001.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=4HKhyytzlgT5VUdif6rpA_yMAVt-W_kit7R-b8bzZW0,1206
-cirq/_version_test.py,sha256=MThOmEhx5kC-xVacYVPapna26JqSTe_ATeHYx_BrvgM,147
+cirq/_version.py,sha256=_WdhS8j0znfMx6r9XlD0gsh7QkhJv6_--hrzaX1NwDY,1206
+cirq/_version_test.py,sha256=HJi0piVqH8nTw5uqgy8onx-uWbPObXcxZpIuWHcl5xs,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=cpbvJMNIh0U-l1mEVb-TqhJUEXfm2vpuR3v432ORSmg,13702
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -1040,8 +1040,8 @@ cirq/testing/test_data/test_module_missing_json_test_data/__init__.py,sha256=47D
 cirq/testing/test_data/test_module_missing_testspec/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cirq/testing/test_data/test_module_missing_testspec/json_test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cirq/transformers/__init__.py,sha256=QjYovkmQHRi7D6nPHkWrszVBM_1__thvOXG4wcYvX_E,6905
-cirq/transformers/align.py,sha256=B4DuX84DWd4tLfMH21JviMZSOFYu7KCOMSEMALYsQpw,2727
-cirq/transformers/align_test.py,sha256=M4etT2cgESv1RdkKASguiGxEuqY7kmI1IswjSi-1jjY,7174
+cirq/transformers/align.py,sha256=5BCC61Vi__RaLkmX2Z9kQ8WpPGopcWnBPR7-yHz91zA,3330
+cirq/transformers/align_test.py,sha256=AI26PxERbtJDfjKtoz17xVAKn6TSr-9pyImqfr5LJWc,7686
 cirq/transformers/drop_empty_moments.py,sha256=Rtn_BrpwkLXyZBdLzwdnsnEGWTdYuf1xOPakzbpv7-w,1517
 cirq/transformers/drop_empty_moments_test.py,sha256=G8pZmTfi8NG2NpGz_K3LZu5NQoqa-xPMCuZjwEu07xk,1907
 cirq/transformers/drop_negligible_operations.py,sha256=8eyOMy7bra2wJAjORbk6QjwHiLdL5SfwRaz8D2Dazbw,2083
@@ -1203,8 +1203,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.dev20250115165326.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20250115165326.dist-info/METADATA,sha256=T30LV9EsQx6VJtuGT1nUh6s07YMRG6zLahSfPOci4TI,2105
-cirq_core-1.5.0.dev20250115165326.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cirq_core-1.5.0.dev20250115165326.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20250115165326.dist-info/RECORD,,
+cirq_core-1.5.0.dev20250115173001.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20250115173001.dist-info/METADATA,sha256=Uh02EbtQq89sDAEXNjBbQ4tv7qYpcSECWgTFklLPTDk,2105
+cirq_core-1.5.0.dev20250115173001.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20250115173001.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20250115173001.dist-info/RECORD,,