Display changes for basic bloqs

Author: mpharrigan

qualtran/bloqs/arithmetic/__init__.py

@@ -29,6 +29,7 @@
     LinearDepthHalfLessThanEqual,
     SingleQubitCompare,
 )
+from qualtran.bloqs.arithmetic.controlled_add_or_subtract import ControlledAddOrSubtract
 from qualtran.bloqs.arithmetic.controlled_addition import CAdd
 from qualtran.bloqs.arithmetic.conversions import (
     SignedIntegerToTwosComplement,

qualtran/bloqs/arithmetic/addition.py

@@ -480,6 +480,9 @@ def build_call_graph(self, ssa: 'SympySymbolAllocator') -> 'BloqCountDictT':
 
         return counts
 
+    def __str__(self):
+        return f'AddK(k={self.k})'
+
 
 @bloq_example(generalizer=ignore_split_join)
 def _add_k() -> AddK:

qualtran/bloqs/arithmetic/bitwise.py

@@ -231,6 +231,9 @@ def on_classical_vals(self, x: 'ClassicalValT') -> Dict[str, 'ClassicalValT']:
             x %= 2**self.dtype.bitsize
         return {'x': x}
 
+    def __str__(self):
+        return f'BitwiseNot({self.dtype.num_bits})'
+
 
 @bloq_example
 def _bitwise_not() -> BitwiseNot:

qualtran/bloqs/basic_gates/__init__.py

@@ -28,7 +28,7 @@
 from .identity import Identity
 from .on_each import OnEach
 from .power import Power
-from .rotation import CRz, CZPowGate, Rx, Ry, Rz, XPowGate, YPowGate, ZPowGate
+from .rotation import CRy, CRz, CZPowGate, Rx, Ry, Rz, XPowGate, YPowGate, ZPowGate
 from .s_gate import SGate
 from .su2_rotation import SU2RotationGate
 from .swap import CSwap, Swap, TwoBitCSwap, TwoBitSwap

qualtran/bloqs/basic_gates/global_phase.py

@@ -118,7 +118,7 @@ def _add_ctrled(
         return bloq, _add_ctrled
 
     def __str__(self) -> str:
-        return f'GPhase({self.coefficient})'
+        return f'GPhase({self.exponent})'
 
 
 @bloq_example

qualtran/bloqs/basic_gates/on_each.py

@@ -96,4 +96,4 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         return super().wire_symbol(reg, idx)
 
     def __str__(self):
-        return f'{self.gate}⨂{self.n}'
+        return f'{self.gate}(oneach={self.n})'

qualtran/bloqs/basic_gates/power.py

@@ -12,12 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 from functools import cached_property
-from typing import Dict, TYPE_CHECKING
+from typing import Dict, Optional, Tuple, TYPE_CHECKING
 
+import attrs
 import numpy as np
 from attrs import frozen
 
-from qualtran import Bloq, BloqBuilder, GateWithRegisters, Side, Signature, SoquetT
+from qualtran import Bloq, BloqBuilder, GateWithRegisters, Register, Side, Signature, SoquetT
+from qualtran.drawing import LarrowTextBox, RarrowTextBox, Text, TextBox, WireSymbol
 from qualtran.symbolics import is_symbolic, SymbolicInt
 
 if TYPE_CHECKING:
@@ -86,3 +88,21 @@ def _circuit_diagram_info_(
         wire_symbols = [f'{symbol}^{self.power}' for symbol in info.wire_symbols]
 
         return cirq.CircuitDiagramInfo(wire_symbols=wire_symbols)
+
+    def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -> 'WireSymbol':
+
+        if reg is None:
+            sub_title = self.bloq.wire_symbol(None, idx)
+            if not isinstance(sub_title, Text):
+                raise ValueError(
+                    f"{self.bloq} should return a `Text` object for reg=None wire symbol."
+                )
+            if sub_title.text == '':
+                return Text('')
+
+            return Text(f'{sub_title.text}**{self.power}')
+
+        ws = self.bloq.wire_symbol(reg, idx)
+        if isinstance(ws, (Text, TextBox, RarrowTextBox, LarrowTextBox)):
+            return attrs.evolve(ws, text=f'{ws.text}**{self.power}')
+        return ws

qualtran/bloqs/basic_gates/rotation.py

@@ -43,7 +43,7 @@
 """
 
 from functools import cached_property
-from typing import Dict, Iterable, Optional, Sequence, Tuple, TYPE_CHECKING, Union
+from typing import Callable, Dict, Iterable, Optional, Sequence, Tuple, Type, TYPE_CHECKING, Union
 
 import attrs
 import cirq
@@ -163,7 +163,7 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         return TextBox(f'Z^{self.exponent}')
 
     def __str__(self):
-        return f'Z**{self.exponent}'
+        return f'Z(pow={self.exponent})'
 
 
 @bloq_example
@@ -231,7 +231,7 @@ def adjoint(self) -> 'CZPowGate':
         return attrs.evolve(self, exponent=-self.exponent)
 
     def __str__(self):
-        return f'CZ**{self.exponent}'
+        return f'CZ(pow={self.exponent})'
 
 
 @bloq_example
@@ -306,7 +306,7 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         return TextBox(f'X^{self.exponent}')
 
     def __str__(self):
-        return f'X**{self.exponent}'
+        return f'X(pow={self.exponent})'
 
 
 @bloq_example
@@ -381,7 +381,7 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         return TextBox(f'Y^{self.exponent}')
 
     def __str__(self):
-        return f'Y**{self.exponent}'
+        return f'Y(pow={self.exponent})'
 
 
 @bloq_example
@@ -487,6 +487,22 @@ def _rz() -> Rz:
 
 _RZ_DOC = BloqDocSpec(bloq_cls=Rz, examples=[_rz], call_graph_example=None)
 
+_PowClsT = Union[Type[XPowGate], Type[YPowGate], Type[ZPowGate]]
+
+
+def _controlled_rp_circuit(
+    bb: 'BloqBuilder', /, *, single_q_pow_cls: _PowClsT, angle: float, eps: float, ctrl, q
+) -> Dict[str, Soquet]:
+    from qualtran.bloqs.basic_gates import CNOT
+
+    t = angle / np.pi
+    q = bb.add(single_q_pow_cls(t / 2, eps=eps / 2), q=q)
+    ctrl, q = bb.add(CNOT(), ctrl=ctrl, target=q)
+    q = bb.add(single_q_pow_cls(-t / 2, eps=eps / 2), q=q)
+    ctrl, q = bb.add(CNOT(), ctrl=ctrl, target=q)
+
+    return {'ctrl': ctrl, 'q': q}
+
 
 @frozen
 class CRz(Bloq):
@@ -532,15 +548,9 @@ def signature(self) -> 'Signature':
     def build_composite_bloq(
         self, bb: 'BloqBuilder', ctrl: 'Soquet', q: 'Soquet'
     ) -> Dict[str, 'SoquetT']:
-        from qualtran.bloqs.basic_gates import CNOT
-
-        t = self.angle / np.pi
-        q = bb.add(ZPowGate(t / 2, eps=self.eps / 2), q=q)
-        ctrl, q = bb.add(CNOT(), ctrl=ctrl, target=q)
-        q = bb.add(ZPowGate(-t / 2, eps=self.eps / 2), q=q)
-        ctrl, q = bb.add(CNOT(), ctrl=ctrl, target=q)
-
-        return {'ctrl': ctrl, 'q': q}
+        return _controlled_rp_circuit(
+            bb, single_q_pow_cls=ZPowGate, angle=self.angle, eps=self.eps, ctrl=ctrl, q=q
+        )
 
     def __str__(self):
         return f'CRz({self.angle})'
@@ -677,6 +687,20 @@ def as_pl_op(self, wires: 'Wires') -> 'Operation':
     def adjoint(self) -> 'Ry':
         return attrs.evolve(self, angle=-self.angle)
 
+    def get_ctrl_system(self, ctrl_spec: 'CtrlSpec') -> Tuple['Bloq', 'AddControlledT']:
+        if ctrl_spec != CtrlSpec():
+            return super().get_ctrl_system(ctrl_spec)
+
+        from qualtran.bloqs.mcmt.specialized_ctrl import get_ctrl_system_1bit_cv_from_bloqs
+
+        return get_ctrl_system_1bit_cv_from_bloqs(
+            bloq=self,
+            ctrl_spec=ctrl_spec,
+            current_ctrl_bit=None,
+            bloq_with_ctrl=CRy(self.angle, eps=self.eps),
+            ctrl_reg_name='ctrl',
+        )
+
     def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -> 'WireSymbol':
         if reg is None:
             return Text('')
@@ -696,3 +720,36 @@ def _rx() -> Rx:
 def _ry() -> Ry:
     ry = Ry(angle=np.pi / 4.0)
     return ry
+
+
+@frozen
+class CRy(Bloq):
+    r"""A controlled Ry rotation.
+
+    Args:
+        angle: The rotation angle in radians.
+        eps: The precision of the rotation. This parameter is for bookkeeping and does
+            not affect e.g. the tensor representation of this gate. When synthesizing
+            a rotation from a discrete gate set, you must fix a precision `eps`.
+
+    Registers:
+        ctrl: Whether the rotation is active.
+        q: The qubit on which we optionally perform the rotation.
+    """
+
+    angle: SymbolicFloat
+    eps: SymbolicFloat = 1e-11
+
+    @cached_property
+    def signature(self) -> 'Signature':
+        return Signature.build(ctrl=1, q=1)
+
+    def build_composite_bloq(
+        self, bb: 'BloqBuilder', ctrl: 'Soquet', q: 'Soquet'
+    ) -> Dict[str, 'SoquetT']:
+        return _controlled_rp_circuit(
+            bb, single_q_pow_cls=YPowGate, angle=self.angle, eps=self.eps, ctrl=ctrl, q=q
+        )
+
+    def __str__(self):
+        return f'CRy({self.angle})'

qualtran/bloqs/basic_gates/rotation_test.py

@@ -257,15 +257,15 @@ def test_pl_interop():
 
 
 def test_str():
-    assert str(ZPowGate()) == "Z**1.0"
-    assert str(XPowGate()) == "X**1.0"
-    assert str(YPowGate()) == "Y**1.0"
+    assert str(ZPowGate()) == "Z(pow=1.0)"
+    assert str(XPowGate()) == "X(pow=1.0)"
+    assert str(YPowGate()) == "Y(pow=1.0)"
     assert str(_ry()) == "Ry(0.7853981633974483)"
     assert str(_rx()) == "Rx(0.7853981633974483)"
     assert str(_rz()) == "Rz(a)"
 
-    assert str(CZPowGate(1.0)) == 'CZ**1.0'
-    assert str(CZPowGate(0.9)) == 'CZ**0.9'
+    assert str(CZPowGate(1.0)) == 'CZ(pow=1.0)'
+    assert str(CZPowGate(0.9)) == 'CZ(pow=0.9)'
 
 
 def test_rx(bloq_autotester):

qualtran/bloqs/basic_gates/swap.py

@@ -393,9 +393,9 @@ def wire_symbol(self, reg: Optional[Register], idx: Tuple[int, ...] = tuple()) -
         if reg is None:
             return Text('')
         if reg.name == 'x':
-            return TextBox('×(x)')
+            return TextBox('×')
         elif reg.name == 'y':
-            return TextBox('×(y)')
+            return TextBox('×')
         else:
             return Circle(filled=True)