Fix Quirk import extra gates bug

quantumlib · Jun 12, 2020 · c866d23 · c866d23
1 parent d3ce7cc
commit c866d23
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/cirq/interop/quirk/url_to_circuit.py b/cirq/interop/quirk/url_to_circuit.py
@@ -182,9 +182,10 @@ def msg(error):
     # Collect registry of quirk cell types.
     if isinstance(extra_cell_makers, Mapping):
         extra_makers = [
-            CellMaker(identifier=identifier,
-                      size=protocols.num_qubits(gate),
-                      maker=lambda args: gate(*args.qubits))
+            CellMaker(
+                identifier=identifier,
+                size=protocols.num_qubits(gate),
+                maker=(lambda gate: lambda args: gate(*args.qubits))(gate))
             for identifier, gate in extra_cell_makers.items()
         ]
     else:

diff --git a/cirq/interop/quirk/url_to_circuit_test.py b/cirq/interop/quirk/url_to_circuit_test.py
@@ -110,6 +110,32 @@ def test_extra_cell_makers():
         extra_cell_makers={'iswap': cirq.ISWAP}) == cirq.Circuit(
             cirq.ISWAP(*cirq.LineQubit.range(2)))
 
+    assert cirq.quirk_url_to_circuit(
+        'http://algassert.com/quirk#circuit={"cols":[["iswap"], ["toffoli"]]}',
+        extra_cell_makers=[
+            cirq.interop.quirk.cells.CellMaker(
+                identifier='iswap',
+                size=2,
+                maker=lambda args: cirq.ISWAP(*args.qubits)),
+            cirq.interop.quirk.cells.CellMaker(
+                identifier='toffoli',
+                size=3,
+                maker=lambda args: cirq.TOFFOLI(*args.qubits))
+        ]) == cirq.Circuit([
+            cirq.ISWAP(*cirq.LineQubit.range(2)),
+            cirq.TOFFOLI(*cirq.LineQubit.range(3))
+        ])
+
+    assert cirq.quirk_url_to_circuit(
+        'http://algassert.com/quirk#circuit={"cols":[["iswap"], ["toffoli"]]}',
+        extra_cell_makers={
+            'iswap': cirq.ISWAP,
+            'toffoli': cirq.TOFFOLI
+        }) == cirq.Circuit([
+            cirq.ISWAP(*cirq.LineQubit.range(2)),
+            cirq.TOFFOLI(*cirq.LineQubit.range(3))
+        ])
+
 
 def test_init():
     b, c, d, e, f = cirq.LineQubit.range(1, 6)