Add support for directional registers to enable lossless Cirq-FT inte…

…rop (#371)
quantumlib · Sep 30, 2023 · ed70b7e · ed70b7e
1 parent 9e6be51
commit ed70b7e
Show file tree

Hide file tree

Showing 17 changed files with 1,116 additions and 843 deletions.
diff --git a/dev_tools/requirements/deps/runtime.txt b/dev_tools/requirements/deps/runtime.txt
@@ -1,5 +1,5 @@
-cirq-core==1.3.0.dev20230925183640
-cirq-ft==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
+cirq-ft==1.3.0.dev20230928195458
 
 # drawing
 pydot

diff --git a/dev_tools/requirements/envs/dev.env.txt b/dev_tools/requirements/envs/dev.env.txt
@@ -48,15 +48,15 @@ cachetools==5.3.1
     # via cirq-ft
 certifi==2023.7.22
     # via requests
-cffi==1.15.1
+cffi==1.16.0
     # via cryptography
 charset-normalizer==3.2.0
     # via requests
-cirq-core==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
     # via
     #   -r deps/runtime.txt
     #   cirq-ft
-cirq-ft==1.3.0.dev20230925183640
+cirq-ft==1.3.0.dev20230928195458
     # via -r deps/runtime.txt
 click==8.1.7
     # via
@@ -169,7 +169,7 @@ jupyter-client==8.3.1
     # via
     #   ipykernel
     #   nbclient
-jupyter-core==5.3.1
+jupyter-core==5.3.2
     # via
     #   ipykernel
     #   jupyter-client
@@ -392,7 +392,7 @@ rpds-py==0.10.3
     # via
     #   jsonschema
     #   referencing
-scipy==1.11.2
+scipy==1.11.3
     # via
     #   cirq-core
     #   quimb
@@ -467,7 +467,7 @@ tqdm==4.66.1
     # via
     #   cirq-core
     #   quimb
-traitlets==5.10.0
+traitlets==5.10.1
     # via
     #   comm
     #   ipykernel

diff --git a/dev_tools/requirements/envs/docs.env.txt b/dev_tools/requirements/envs/docs.env.txt
@@ -66,12 +66,12 @@ charset-normalizer==3.2.0
     # via
     #   -c envs/dev.env.txt
     #   requests
-cirq-core==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
     #   cirq-ft
-cirq-ft==1.3.0.dev20230925183640
+cirq-ft==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
@@ -194,7 +194,7 @@ jupyter-client==8.3.1
     #   -c envs/dev.env.txt
     #   ipykernel
     #   nbclient
-jupyter-core==5.3.1
+jupyter-core==5.3.2
     # via
     #   -c envs/dev.env.txt
     #   ipykernel
@@ -426,7 +426,7 @@ rpds-py==0.10.3
     #   -c envs/dev.env.txt
     #   jsonschema
     #   referencing
-scipy==1.11.2
+scipy==1.11.3
     # via
     #   -c envs/dev.env.txt
     #   cirq-core
@@ -523,7 +523,7 @@ tqdm==4.66.1
     #   -c envs/dev.env.txt
     #   cirq-core
     #   quimb
-traitlets==5.10.0
+traitlets==5.10.1
     # via
     #   -c envs/dev.env.txt
     #   comm

diff --git a/dev_tools/requirements/envs/format.env.txt b/dev_tools/requirements/envs/format.env.txt
@@ -43,12 +43,12 @@ cachetools==5.3.1
     # via
     #   -c envs/dev.env.txt
     #   cirq-ft
-cirq-core==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
     #   cirq-ft
-cirq-ft==1.3.0.dev20230925183640
+cirq-ft==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
@@ -137,7 +137,7 @@ jupyter-client==8.3.1
     # via
     #   -c envs/dev.env.txt
     #   nbclient
-jupyter-core==5.3.1
+jupyter-core==5.3.2
     # via
     #   -c envs/dev.env.txt
     #   jupyter-client
@@ -319,7 +319,7 @@ rpds-py==0.10.3
     #   -c envs/dev.env.txt
     #   jsonschema
     #   referencing
-scipy==1.11.2
+scipy==1.11.3
     # via
     #   -c envs/dev.env.txt
     #   cirq-core
@@ -368,7 +368,7 @@ tqdm==4.66.1
     #   -c envs/dev.env.txt
     #   cirq-core
     #   quimb
-traitlets==5.10.0
+traitlets==5.10.1
     # via
     #   -c envs/dev.env.txt
     #   comm

diff --git a/dev_tools/requirements/envs/pylint.env.txt b/dev_tools/requirements/envs/pylint.env.txt
@@ -39,12 +39,12 @@ cachetools==5.3.1
     # via
     #   -c envs/dev.env.txt
     #   cirq-ft
-cirq-core==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
     #   cirq-ft
-cirq-ft==1.3.0.dev20230925183640
+cirq-ft==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
@@ -129,7 +129,7 @@ jupyter-client==8.3.1
     # via
     #   -c envs/dev.env.txt
     #   nbclient
-jupyter-core==5.3.1
+jupyter-core==5.3.2
     # via
     #   -c envs/dev.env.txt
     #   jupyter-client
@@ -315,7 +315,7 @@ rpds-py==0.10.3
     #   -c envs/dev.env.txt
     #   jsonschema
     #   referencing
-scipy==1.11.2
+scipy==1.11.3
     # via
     #   -c envs/dev.env.txt
     #   cirq-core
@@ -367,7 +367,7 @@ tqdm==4.66.1
     #   -c envs/dev.env.txt
     #   cirq-core
     #   quimb
-traitlets==5.10.0
+traitlets==5.10.1
     # via
     #   -c envs/dev.env.txt
     #   comm

diff --git a/dev_tools/requirements/envs/pytest.env.txt b/dev_tools/requirements/envs/pytest.env.txt
@@ -35,12 +35,12 @@ cachetools==5.3.1
     # via
     #   -c envs/dev.env.txt
     #   cirq-ft
-cirq-core==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
     #   cirq-ft
-cirq-ft==1.3.0.dev20230925183640
+cirq-ft==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
@@ -141,7 +141,7 @@ jupyter-client==8.3.1
     #   -c envs/dev.env.txt
     #   ipykernel
     #   nbclient
-jupyter-core==5.3.1
+jupyter-core==5.3.2
     # via
     #   -c envs/dev.env.txt
     #   ipykernel
@@ -349,7 +349,7 @@ rpds-py==0.10.3
     #   -c envs/dev.env.txt
     #   jsonschema
     #   referencing
-scipy==1.11.2
+scipy==1.11.3
     # via
     #   -c envs/dev.env.txt
     #   cirq-core
@@ -399,7 +399,7 @@ tqdm==4.66.1
     #   -c envs/dev.env.txt
     #   cirq-core
     #   quimb
-traitlets==5.10.0
+traitlets==5.10.1
     # via
     #   -c envs/dev.env.txt
     #   comm

diff --git a/dev_tools/requirements/envs/runtime.env.txt b/dev_tools/requirements/envs/runtime.env.txt
@@ -35,12 +35,12 @@ cachetools==5.3.1
     # via
     #   -c envs/dev.env.txt
     #   cirq-ft
-cirq-core==1.3.0.dev20230925183640
+cirq-core==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
     #   cirq-ft
-cirq-ft==1.3.0.dev20230925183640
+cirq-ft==1.3.0.dev20230928195458
     # via
     #   -c envs/dev.env.txt
     #   -r deps/runtime.txt
@@ -117,7 +117,7 @@ jupyter-client==8.3.1
     # via
     #   -c envs/dev.env.txt
     #   nbclient
-jupyter-core==5.3.1
+jupyter-core==5.3.2
     # via
     #   -c envs/dev.env.txt
     #   jupyter-client
@@ -290,7 +290,7 @@ rpds-py==0.10.3
     #   -c envs/dev.env.txt
     #   jsonschema
     #   referencing
-scipy==1.11.2
+scipy==1.11.3
     # via
     #   -c envs/dev.env.txt
     #   cirq-core
@@ -334,7 +334,7 @@ tqdm==4.66.1
     #   -c envs/dev.env.txt
     #   cirq-core
     #   quimb
-traitlets==5.10.0
+traitlets==5.10.1
     # via
     #   -c envs/dev.env.txt
     #   comm

diff --git a/qualtran/_infra/composite_bloq.py b/qualtran/_infra/composite_bloq.py
@@ -140,7 +140,7 @@ def to_cirq_circuit(
         """
         import cirq
 
-        from qualtran.cirq_interop._cirq_interop import _cbloq_to_cirq_circuit
+        from qualtran.cirq_interop._bloq_to_cirq import _cbloq_to_cirq_circuit
 
         if qubit_manager is None:
             qubit_manager = cirq.ops.SimpleQubitManager()

diff --git a/qualtran/bloqs/swap_network_cirq_test.py b/qualtran/bloqs/swap_network_cirq_test.py
@@ -74,7 +74,7 @@ def test_swap_with_zero_gate(selection_bitsize, target_bitsize, n_target_registe
 def test_swap_with_zero_gate_diagram():
     gate = SwapWithZeroGate(3, 2, 4)
     q = cirq.LineQubit.range(cirq.num_qubits(gate))
-    circuit = cirq.Circuit(gate.on_registers(**cirq_ft.infra.split_qubits(gate.registers, q)))
+    circuit = cirq.Circuit(gate.on_registers(**cirq_ft.infra.split_qubits(gate.signature, q)))
     cirq.testing.assert_has_diagram(
         circuit,
         """

diff --git a/qualtran/cirq_interop/__init__.py b/qualtran/cirq_interop/__init__.py
@@ -12,15 +12,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-"""Interoperability with Cirq
+"""Bi-directional interop between Qualtran & Cirq using Cirq-FT.
 
 isort:skip_file
 """
 
-from ._cirq_interop import (
-    CirqQuregT,
-    CirqGateAsBloq,
-    BloqAsCirqGate,
-    cirq_optree_to_cbloq,
-    decompose_from_cirq_op,
-)
+from ._cirq_to_bloq import CirqQuregT, CirqGateAsBloq, cirq_optree_to_cbloq, decompose_from_cirq_op
+
+from ._bloq_to_cirq import BloqAsCirqGate