Move power bloq to basic_gates (#1007)

* Move power bloq to basic_gates

* Fix mypy and pylint

Author: tanujkhattar

qualtran/_infra/gate_with_registers.py

@@ -368,7 +368,7 @@ def __pow__(self, power: int) -> 'GateWithRegisters':
         if abs(power) == 1:
             return bloq
         if all(reg.side == Side.THRU for reg in self.signature):
-            from qualtran.bloqs.bookkeeping import Power
+            from qualtran.bloqs.basic_gates import Power
 
             return Power(bloq, abs(power))
         raise NotImplementedError(f"{self} does not implemented __pow__ for {power=}.")

qualtran/_infra/gate_with_registers_test.py

@@ -29,8 +29,7 @@
     Signature,
     SoquetT,
 )
-from qualtran.bloqs.basic_gates import XGate, YGate, ZGate
-from qualtran.bloqs.bookkeeping import Power
+from qualtran.bloqs.basic_gates import Power, XGate, YGate, ZGate
 from qualtran.testing import execute_notebook
 
 if TYPE_CHECKING:

qualtran/bloqs/basic_gates/__init__.py

@@ -26,6 +26,7 @@
 from .hadamard import Hadamard
 from .identity import Identity
 from .on_each import OnEach
+from .power import Power
 from .rotation import CZPowGate, Rx, Ry, Rz, XPowGate, YPowGate, ZPowGate
 from .s_gate import SGate
 from .su2_rotation import SU2RotationGate

qualtran/bloqs/bookkeeping/power.py qualtran/bloqs/basic_gates/power.pyqualtran/bloqs/bookkeeping/power.py renamed to qualtran/bloqs/basic_gates/power.py

@@ -17,7 +17,7 @@
 import pytest
 
 from qualtran._infra.gate_with_registers import GateWithRegisters
-from qualtran.bloqs.bookkeeping import Power
+from qualtran.bloqs.basic_gates import Power
 from qualtran.bloqs.for_testing import TestAtom, TestMultiRegister
 from qualtran.bloqs.for_testing.atom import TestGWRAtom
 
@@ -88,4 +88,4 @@ def to_cirq_circuit(bloq: GateWithRegisters) -> cirq.Circuit:
 
 
 def test_no_circular_import():
-    subprocess.check_call(['python', '-c', 'from qualtran.bloqs.bookkeeping import power'])
+    subprocess.check_call(['python', '-c', 'from qualtran.bloqs.basic_gates import power'])

qualtran/bloqs/bookkeeping/power_test.py qualtran/bloqs/basic_gates/power_test.pyqualtran/bloqs/bookkeeping/power_test.py renamed to qualtran/bloqs/basic_gates/power_test.py

@@ -19,5 +19,4 @@
 from qualtran.bloqs.bookkeeping.free import Free
 from qualtran.bloqs.bookkeeping.join import Join
 from qualtran.bloqs.bookkeeping.partition import Partition
-from qualtran.bloqs.bookkeeping.power import Power
 from qualtran.bloqs.bookkeeping.split import Split

qualtran/bloqs/bookkeeping/__init__.py

@@ -31,4 +31,4 @@ def test_reflection_t_counts():
 
 @pytest.mark.notebook
 def test_notebook():
-    execute_notebook('reflection')
+    execute_notebook('reflections')

qualtran/bloqs/reflections/reflection_test.py

@@ -175,7 +175,7 @@ def __pow__(self, power, modulo=None):
         if power == -1:
             return self.bloq.adjoint()
 
-        from qualtran.bloqs.bookkeeping import Power
+        from qualtran.bloqs.basic_gates import Power
 
         bloq = self.bloq if power > 0 else self.bloq.adjoint()
 

qualtran/cirq_interop/_bloq_to_cirq.py

@@ -179,6 +179,7 @@
     "qualtran.bloqs.basic_gates.z_basis.ZGate": qualtran.bloqs.basic_gates.z_basis.ZGate,
     "qualtran.bloqs.basic_gates.z_basis.ZeroEffect": qualtran.bloqs.basic_gates.z_basis.ZeroEffect,
     "qualtran.bloqs.basic_gates.z_basis.ZeroState": qualtran.bloqs.basic_gates.z_basis.ZeroState,
+    "qualtran.bloqs.basic_gates.power.Power": qualtran.bloqs.basic_gates.power.Power,
     "qualtran.bloqs.block_encoding.lcu_block_encoding.LCUBlockEncoding": qualtran.bloqs.block_encoding.lcu_block_encoding.LCUBlockEncoding,
     "qualtran.bloqs.block_encoding.lcu_block_encoding.LCUBlockEncodingZeroState": qualtran.bloqs.block_encoding.lcu_block_encoding.LCUBlockEncodingZeroState,
     "qualtran.bloqs.block_encoding.lcu_block_encoding.BlackBoxPrepare": qualtran.bloqs.block_encoding.lcu_block_encoding.BlackBoxPrepare,
@@ -190,7 +191,6 @@
     "qualtran.bloqs.bookkeeping.free.Free": qualtran.bloqs.bookkeeping.free.Free,
     "qualtran.bloqs.bookkeeping.join.Join": qualtran.bloqs.bookkeeping.join.Join,
     "qualtran.bloqs.bookkeeping.partition.Partition": qualtran.bloqs.bookkeeping.partition.Partition,
-    "qualtran.bloqs.bookkeeping.power.Power": qualtran.bloqs.bookkeeping.power.Power,
     "qualtran.bloqs.bookkeeping.split.Split": qualtran.bloqs.bookkeeping.split.Split,
     "qualtran.bloqs.chemistry.black_boxes.ApplyControlledZs": qualtran.bloqs.chemistry.black_boxes.ApplyControlledZs,
     "qualtran.bloqs.chemistry.black_boxes.QROAM": qualtran.bloqs.chemistry.black_boxes.QROAM,