Move Cirq-FT infrastructure to Qualtran #393

tanujkhattar · 2023-10-12T18:57:33Z

This PR is the first big PR that moves code from Cirq-FT to Qualtran as part of Qualtran & Cirq-FT Integration

Some key features:

GateWithRegisters now exists in Qualtran and is both a cirq.Gate and a Bloq.
As a proof of concept, And and MultiAnd bloq's in Qualtran now derive from the GateWithRegisters class. They pass all existing tests and are used in cirq-ft style tests as well.
CirqGateAsBloq and BloqAsCirqGate don't depend upon cirq_ft at the top-level anymore. There still exists some temporary glue code that needs to support both cirq_ft.GateWithRegisters and qualtran.GateWithRegisters as part of the transition period, but that'll be gone once the migration is completed.
Other cirq infra code, like TComplexity, decompose_protocol etc. also make their way into qualtran as part of the cirq_interop repository. In follow-up PRs, we can rearrange this code (for example: move all or parts of TComplexity to resource_counting/ instead of cirq_interop).

cc @fdmalone @mpharrigan

…te_with_registers

mpharrigan

Can you comment on lingering compatibility issues? It looks like Signature is almost the same but not quite

mpharrigan · 2023-10-12T22:50:22Z

qualtran/_infra/registers.py

@@ -19,7 +19,7 @@
 from typing import Dict, Iterable, Iterator, List, overload, Tuple, TYPE_CHECKING

 import numpy as np
-from attr import frozen
+from attr import field, frozen


I guess this has already snuck through, but try to change these to attrs when you see one

qualtran/_infra/registers.py

qualtran/bloqs/arithmetic_test.py

mpharrigan · 2023-10-12T22:54:54Z

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.signature, q)))
+    circuit = cirq.Circuit(gate.on_registers(**split_qubits(gate.signature, q)))


What are your intentions with this module (as well as swap_network.py). These are sortof half-hearted attempts at providing a bloq user-api from cirq gates from some time ago.

Both of these would be removed and replaced with swap_network.py from Cirq-FT which already derives from GateWithRegisters and thus would be a Bloq.

are you going to do this?

qualtran/cirq_interop/_bloq_to_cirq.py

qualtran/cirq_interop/_cirq_to_bloq.py

mpharrigan · 2023-10-12T23:01:10Z

qualtran/cirq_interop/decompose_protocol.py

+_FREDKIN_GATESET = cirq.Gateset(cirq.FREDKIN, unroll_circuit_op=False)
+
+
+def _fredkin(qubits: Sequence[cirq.Qid], context: cirq.DecompositionContext) -> cirq.OP_TREE:


reminder that per our agreement if this code still exists like 1 month from now I will unceremoniously remove it

I don't want to keep this code either. The project that takes care of supporting different decompositions when counting resources should remove this code as a first proof of concept. Whoever removes this code should make sure the T-counts of higher level primitives remain the same, and then I'm happy.

tanujkhattar · 2023-10-13T17:36:49Z

It looks like Signature is almost the same but not quite

Cirq-FT signature is lacking a few accessor methods (like signature.lefts() / signature.rights()) but it's a strict subset of Qualtran.Signature. Apart from that there should no difference. Is there a specific compatibility issue that you are concerned about?

tanujkhattar · 2023-10-13T17:37:59Z

@mpharrigan I've addressed all your comments. This is ready for another look.

mpharrigan · 2023-10-13T17:55:29Z

Apart from that there should no difference. Is there a specific compatibility issue that you are concerned about?

The Side enum thing is a difference I wouldn't have expected, a priori.

mpharrigan

sweeeeeeeeet

…te_with_registers

…rk Bloq to resolve merge conflict

…ualtran into gate_with_registers

tanujkhattar added 2 commits October 12, 2023 11:48

Move Cirq-FT infrastructure to Qualtran

8842c4d

Merge branch 'main' of https://github.com/quantumlib/Qualtran into ga…

66279c9

…te_with_registers

tanujkhattar requested a review from mpharrigan October 12, 2023 18:57

tanujkhattar assigned mpharrigan and fdmalone Oct 12, 2023

tanujkhattar added 4 commits October 12, 2023 12:08

Fix tests and pylint

2737f00

Use qualtran instead of cirq_ft for decompose_protocol_test

5a361fc

Replace usages of cirq_ft with qualtran for TComplexity and And gates.

b43a2e7

Fix formatting

5237b22

mpharrigan reviewed Oct 12, 2023

View reviewed changes

mpharrigan mentioned this pull request Oct 13, 2023

Trotter Costs #359

Merged

Resolve Matt's comments and add a bunch of TODO's

29793e4

mpharrigan approved these changes Oct 13, 2023

View reviewed changes

mpharrigan and others added 4 commits October 13, 2023 10:56

Merge branch 'main' into gate_with_registers

b9db480

Merge branch 'main' of https://github.com/quantumlib/Qualtran into ga…

ecff935

…te_with_registers

Use qualtran.TComplexity instead of cirq_ft.TComplexity in swap_netwo…

06a56a9

…rk Bloq to resolve merge conflict

Merge branch 'gate_with_registers' of https://github.com/quantumlib/Q…

c8d8a6f

…ualtran into gate_with_registers

tanujkhattar enabled auto-merge (squash) October 13, 2023 18:56

Fix pylint

25daf87

tanujkhattar merged commit cf25d4f into main Oct 13, 2023
8 checks passed

mpharrigan deleted the gate_with_registers branch November 22, 2023 18:19

mpharrigan mentioned this pull request Mar 19, 2024

Remove sneaky fredkin decomposition #803

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Cirq-FT infrastructure to Qualtran #393

Move Cirq-FT infrastructure to Qualtran #393

tanujkhattar commented Oct 12, 2023 •

edited

Loading

mpharrigan left a comment

mpharrigan Oct 12, 2023

tanujkhattar Oct 13, 2023

mpharrigan Oct 12, 2023

tanujkhattar Oct 13, 2023

mpharrigan Oct 13, 2023

tanujkhattar Oct 13, 2023

mpharrigan Oct 12, 2023

tanujkhattar Oct 13, 2023

tanujkhattar commented Oct 13, 2023

tanujkhattar commented Oct 13, 2023

mpharrigan commented Oct 13, 2023

mpharrigan left a comment

		_FREDKIN_GATESET = cirq.Gateset(cirq.FREDKIN, unroll_circuit_op=False)


		def _fredkin(qubits: Sequence[cirq.Qid], context: cirq.DecompositionContext) -> cirq.OP_TREE:

Move Cirq-FT infrastructure to Qualtran #393

Move Cirq-FT infrastructure to Qualtran #393

Conversation

tanujkhattar commented Oct 12, 2023 • edited Loading

mpharrigan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tanujkhattar commented Oct 13, 2023

tanujkhattar commented Oct 13, 2023

mpharrigan commented Oct 13, 2023

mpharrigan left a comment

Choose a reason for hiding this comment

tanujkhattar commented Oct 12, 2023 •

edited

Loading