Add Add.controlled() -> CAdd (#1576)

cadd

Author: mpharrigan

qualtran/bloqs/arithmetic/addition.py

@@ -44,6 +44,7 @@
 )
 from qualtran.bloqs.basic_gates import CNOT
 from qualtran.bloqs.mcmt.and_bloq import And
+from qualtran.bloqs.mcmt.specialized_ctrl import get_ctrl_system_1bit_cv
 from qualtran.cirq_interop import decompose_from_cirq_style_method
 from qualtran.drawing import directional_text_box, Text
 from qualtran.resource_counting.generalizers import ignore_split_join
@@ -129,7 +130,6 @@ def _circuit_diagram_info_(self, _) -> cirq.CircuitDiagramInfo:
         return cirq.CircuitDiagramInfo(wire_symbols=wire_symbols)
 
     def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -> 'WireSymbol':
-
         if reg is None:
             return Text("")
         if reg.name == 'a':
@@ -203,6 +203,19 @@ def build_call_graph(self, ssa: 'SympySymbolAllocator') -> 'BloqCountDictT':
         n_cnot = (n - 2) * 6 + 3
         return {And(): n - 1, And().adjoint(): n - 1, CNOT(): n_cnot}
 
+    def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlledT']:
+        from qualtran.bloqs.arithmetic import CAdd
+
+        return get_ctrl_system_1bit_cv(
+            bloq=self,
+            ctrl_spec=ctrl_spec,
+            current_ctrl_bit=None,
+            get_ctrl_bloq_and_ctrl_reg_name=lambda cv: (
+                CAdd(a_dtype=self.a_dtype, b_dtype=self.b_dtype, cv=cv),
+                "ctrl",
+            ),
+        )
+
 
 @bloq_example(generalizer=ignore_split_join)
 def _add_symb() -> Add:

qualtran/bloqs/arithmetic/addition_test.py

@@ -407,3 +407,18 @@ def test_outofplaceadder_classical_action(bitsize):
     cb = b.decompose_bloq()
     for x, y in itertools.product(range(2**bitsize), repeat=2):
         assert b.call_classically(a=x, b=y, c=x + y) == cb.call_classically(a=x, b=y, c=x + y)
+
+
+def test_controlled_add_from_add():
+    add = Add(QUInt(32))
+    cadd = add.controlled(CtrlSpec(cvs=0))
+
+    ctrl, a, b = cadd.call_classically(ctrl=1, a=5, b=10)
+    assert ctrl == 1
+    assert a == 5
+    assert b == 10
+
+    ctrl, a, b = cadd.call_classically(ctrl=0, a=5, b=10)
+    assert ctrl == 0
+    assert a == 5
+    assert b == 15

qualtran/bloqs/arithmetic/controlled_add_or_subtract_test.py

@@ -92,7 +92,6 @@ def build_composite_bloq(
         return {'ctrl': ctrl, 'a': a, 'b': b}
 
 
-@pytest.mark.slow
 @pytest.mark.parametrize("dtype", [QUInt(3), QUInt(4)])
 def test_tensor(dtype):
     bloq = ControlledAddOrSubtract(dtype, dtype)