Create ModSub and CModSub (#1332)

Author: NoureldinYosri

dev_tools/autogenerate-bloqs-notebooks-v2.py

@@ -505,6 +505,8 @@
         bloq_specs=[
             qualtran.bloqs.mod_arithmetic.mod_subtraction._MOD_NEG_DOC,
             qualtran.bloqs.mod_arithmetic.mod_subtraction._CMOD_NEG_DOC,
+            qualtran.bloqs.mod_arithmetic.mod_subtraction._MOD_SUB_DOC,
+            qualtran.bloqs.mod_arithmetic.mod_subtraction._CMOD_SUB_DOC,
         ],
     ),
     NotebookSpecV2(

qualtran/bloqs/factoring/ecc/ec_add.py

@@ -19,8 +19,8 @@
 
 from qualtran import Bloq, bloq_example, BloqDocSpec, QUInt, Register, Signature
 from qualtran.bloqs.arithmetic._shims import MultiCToffoli
-from qualtran.bloqs.mod_arithmetic import CModAdd, CModNeg, ModAdd, ModNeg
-from qualtran.bloqs.mod_arithmetic._shims import CModSub, ModDbl, ModInv, ModMul, ModSub
+from qualtran.bloqs.mod_arithmetic import CModAdd, CModNeg, CModSub, ModAdd, ModNeg, ModSub
+from qualtran.bloqs.mod_arithmetic._shims import ModDbl, ModInv, ModMul
 from qualtran.resource_counting import BloqCountT, SympySymbolAllocator
 
 
@@ -70,8 +70,8 @@ def build_call_graph(self, ssa: 'SympySymbolAllocator') -> Set['BloqCountT']:
             (MultiCToffoli(n=self.n), 18),
             (ModAdd(bitsize=self.n, mod=self.mod), 3),
             (CModAdd(QUInt(self.n), mod=self.mod), 2),
-            (ModSub(n=self.n, mod=self.mod), 2),
-            (CModSub(n=self.n, mod=self.mod), 4),
+            (ModSub(QUInt(self.n), mod=self.mod), 2),
+            (CModSub(QUInt(self.n), mod=self.mod), 4),
             (ModNeg(QUInt(self.n), mod=self.mod), 2),
             (CModNeg(QUInt(self.n), mod=self.mod), 1),
             (ModDbl(n=self.n, mod=self.mod), 2),

qualtran/bloqs/mod_arithmetic/__init__.py

@@ -12,6 +12,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from ._shims import CModSub, ModDbl, ModInv, ModMul, ModSub
+from ._shims import ModDbl, ModInv, ModMul
 from .mod_addition import CModAdd, CModAddK, CtrlScaleModAdd, ModAdd, ModAddK
-from .mod_subtraction import CModNeg, ModNeg
+from .mod_subtraction import CModNeg, CModSub, ModNeg, ModSub

qualtran/bloqs/mod_arithmetic/_shims.py

@@ -26,56 +26,17 @@
 
 from attrs import frozen
 
-from qualtran import Bloq, QBit, QUInt, Register, Signature
+from qualtran import Bloq, QUInt, Register, Signature
 from qualtran.bloqs.arithmetic import Add, AddK, Negate, Subtract
 from qualtran.bloqs.arithmetic._shims import CHalf, Lt, MultiCToffoli
 from qualtran.bloqs.basic_gates import CNOT, CSwap, Swap, Toffoli
-from qualtran.drawing import Circle, Text, TextBox, WireSymbol
+from qualtran.drawing import Text, TextBox, WireSymbol
 from qualtran.symbolics import ceil, log2
 
 if TYPE_CHECKING:
     from qualtran.resource_counting import BloqCountT, SympySymbolAllocator
 
 
-@frozen
-class ModSub(Bloq):
-    n: int
-    mod: int
-
-    @cached_property
-    def signature(self) -> 'Signature':
-        return Signature([Register('x', QUInt(self.n)), Register('y', QUInt(self.n))])
-
-
-@frozen
-class CModSub(Bloq):
-    n: int
-    mod: int
-
-    @cached_property
-    def signature(self) -> 'Signature':
-        return Signature(
-            [Register('ctrl', QBit()), Register('x', QUInt(self.n)), Register('y', QUInt(self.n))]
-        )
-
-    def build_call_graph(self, ssa: 'SympySymbolAllocator') -> Set['BloqCountT']:
-        # Roetteler
-        return {(Toffoli(), ceil(16 * self.n * log2(self.n) - 23.8 * self.n))}
-
-    def wire_symbol(
-        self, reg: Optional['Register'], idx: Tuple[int, ...] = tuple()
-    ) -> 'WireSymbol':
-        if reg is None:
-            return Text("")
-        if reg.name == 'ctrl':
-            return Circle()
-        elif reg.name == 'x':
-            return TextBox('x')
-        elif reg.name == 'y':
-            return TextBox('x-y')
-        raise ValueError(f'Unrecognized register name {reg.name}')
-
-
 @frozen
 class _ModInvInner(Bloq):
     n: int