qutip · BoxiLi · Mar 11, 2026 · Feb 15, 2026 · Feb 15, 2026 · Feb 15, 2026
diff --git a/doc/pulse-paper/qft.py b/doc/pulse-paper/qft.py
@@ -42,9 +42,9 @@ def get_control_latex(model):
     num_qubits = model.num_qubits
     num_coupling = model._get_num_coupling()
     return [
-        {f"sx{m}": r"$\sigma_x^{}$".format(m) for m in range(num_qubits)},
-        {f"sz{m}": r"$\sigma_z^{}$".format(m) for m in range(num_qubits)},
-        {f"g{m}": r"$g_{}$".format(m) for m in range(num_coupling)},
+        {f"sx{m}": rf"$\sigma_x^{m}$" for m in range(num_qubits)},
+        {f"sz{m}": rf"$\sigma_z^{m}$" for m in range(num_qubits)},
+        {f"g{m}": rf"$g_{m}$" for m in range(num_coupling)},
     ]
 
 

diff --git a/doc/source/apidoc/qutip_qip.operations.rst b/doc/source/apidoc/qutip_qip.operations.rst
@@ -50,6 +50,6 @@ qutip\_qip.operations
 
    .. autosummary::
 
-      controlled_gate
+      controlled_gate_unitary
       expand_operator
       gate_sequence_product
diff --git a/doc/source/qip-basics.rst b/doc/source/qip-basics.rst
@@ -139,38 +139,51 @@ The pre-defined gates for the class :class:`~.operations.Gate` are shown in the
 ====================  ========================================
 Gate name                           Description
 ====================  ========================================
-"RX"                  Rotation around x axis
-"RY"                  Rotation around y axis
-"RZ"                  Rotation around z axis
-"R"                   Arbitrary single qubit rotation
 "X"                   Pauli-X gate
 "Y"                   Pauli-Y gate
 "Z"                   Pauli-Z gate
+"H"                   Hadamard gate
 "S"                   Single-qubit rotation or Z90
+"Sdag"                Inverse of S gate
 "T"                   Square root of S gate
+"Tdag"                Inverse of T gate
 "SQRTX"               Square root of X gate
-"H"                   Hadamard gate
-"PHASEGATE"           Add a phase one the state 1
-"CRX"                 Controlled rotation around x axis
-"CRY"                 Controlled rotation around y axis
-"CRZ"                 Controlled rotation around z axis
-"CX"                  Controlled X gate (also called CNOT)
+"SQRTXdag"            Inverse of SQRTX gate
+"RX"                  Rotation around x axis
+"RY"                  Rotation around y axis
+"RZ"                  Rotation around z axis
+"PHASE"               Adds a relative phase to ket 1
+"R"                   Arbitrary single qubit rotation
+"QASMU"               U rotation gate used as a primitive in the QASM standard
+"CX"                  (CNOT) Controlled X gate
 "CY"                  Controlled Y gate
 "CZ"                  Controlled Z gate
+"CH"                  Controlled H gate
 "CS"                  Controlled S gate
+"CSdag"               Controlled Sdag gate
 "CT"                  Controlled T gate
-"CPHASE"              Controlled phase gate
-"QASMU"               U rotation gate used as a primitive in the QASM standard
-"BERKELEY"            Berkeley gate
-"SWAPalpha"           SWAPalpha gate
+"CTdag"               Controlled Tdag gate
+"CRX"                 Controlled rotation around x axis
+"CRY"                 Controlled rotation around y axis
+"CRZ"                 Controlled rotation around z axis
+"CPHASE"              Controlled Phase gate
+"CQASMU"              Controlled QASMU gate
 "SWAP"                Swap the states of two qubits
 "ISWAP"               Swap gate with additional phase for 01 and 10 states
+"ISWAPdag"            Inverse of ISWAP gate
 "SQRTSWAP"            Square root of the SWAP gate
+"SQRTSWAPdag"         Inverse of SQRTSWAP gate
 "SQRTISWAP"           Square root of the ISWAP gate
+"SQRTISWAPdag"        Inverse of SQRTISWAP gate
+"BERKELEY"            Berkeley gate
+"BERKELEYdag"         Inverse of BERKELEY gate
+"SWAPALPHA"           SWAPALPHA gate
 "MS"                  Mølmer-Sørensen gate
+"RZX"                 RZX gate
+"TOFFOLI"             (CCX) Toffoli gate
 "FREDKIN"             Fredkin gate
-"TOFFOLI"             Toffoli gate
-"GLOBALPHASE"         Global phase
+"GLOBALPHASE"         Global phase gate
+"IDENTITY"            Identity gate
 ====================  ========================================
 
 For some of the gates listed above, :class:`.QubitCircuit` also has a primitive :func:`.QubitCircuit.resolve_gates()` method that decomposes them into elementary gate sets such as CX or SWAP with single-qubit gates (RX, RY and RZ). However, this method is not fully optimized. It is very likely that the depth of the circuit can be further reduced by merging quantum gates. It is required that the gate resolution be carried out before the measurements to the circuit are added.

diff --git a/tests/pytest.ini → pytest.ini b/tests/pytest.ini → pytest.ini
@@ -1,22 +1,19 @@
 [pytest]
 markers =
     slow: Mark a test as taking a long time to run, and so can be skipped with `pytest -m "not slow"`.
-    repeat(n): Repeat the given test 'n' times.
     requires_cython: Mark that the given test requires Cython to be installed.  Such tests will be skipped if Cython is not available.
+
 filterwarnings =
     error
     ; ImportWarning: PyxImporter.find_spec() not found
     ignore:PyxImporter:ImportWarning
-    ; DeprecationWarning: Please use `upcast` from the `scipy.sparse` namespace
-    ignore::DeprecationWarning:qutip.fastsparse*:
+    ignore::UserWarning:
     ignore:matplotlib not found:UserWarning
     ignore:the imp module is deprecated in favour of importlib:DeprecationWarning
     ignore:Dedicated options class are no longer needed, options should be passed as dict to solvers.:FutureWarning
     ignore::DeprecationWarning:qiskit.utils.algorithm_globals:
-    # Deprecation warning for python = 3.9 with matplotlib 3.9.4
-    ignore:'mode' parameter is deprecated
     # Deprecation warning for scipy disp interface, will be removed in scipy 1.18
     ignore:.*`disp` and `iprint` options.*L-BFGS-B.*deprecated.*:DeprecationWarning
 
-
-
+pythonpath = src
+testpaths = tests
diff --git a/src/qutip_qip/algorithms/bit_flip.py b/src/qutip_qip/algorithms/bit_flip.py
@@ -1,5 +1,5 @@
 from qutip_qip.circuit import QubitCircuit
-from qutip_qip.operations import CX, TOFFOLI, X
+from qutip_qip.operations.gates import CX, TOFFOLI, X
 
 
 class BitFlipCode:

diff --git a/src/qutip_qip/algorithms/phase_flip.py b/src/qutip_qip/algorithms/phase_flip.py
@@ -1,5 +1,5 @@
 from qutip_qip.circuit import QubitCircuit
-from qutip_qip.operations import CX, H
+from qutip_qip.operations.gates import CX, H
 
 
 class PhaseFlipCode:

diff --git a/src/qutip_qip/algorithms/qft.py b/src/qutip_qip/algorithms/qft.py
@@ -3,10 +3,11 @@
 """
 
 import numpy as np
-from qutip_qip.operations import H, RZ, CX, CPHASE, SWAP, expand_operator
-from qutip_qip.circuit import QubitCircuit
 from qutip import Qobj
+from qutip_qip.circuit import QubitCircuit
 from qutip_qip.decompose import decompose_one_qubit_gate
+from qutip_qip.operations import expand_operator
+from qutip_qip.operations.gates import H, RZ, CX, CPHASE, SWAP
 
 
 def qft(N=1):
@@ -66,7 +67,7 @@ def qft_steps(N=1, swapping=True):
             for j in range(i):
                 U_step_list.append(
                     expand_operator(
-                        CPHASE(np.pi / (2 ** (i - j))).get_qobj(),
+                        CPHASE(theta=np.pi / (2 ** (i - j))).get_qobj(),
                         dims=[2] * N,
                         targets=[i, j],
                     )
@@ -113,7 +114,10 @@ def qft_gate_sequence(N=1, swapping=True, to_cnot=False):
             for j in range(i):
                 if not to_cnot:
                     qc.add_gate(
-                        CPHASE(np.pi / (2 ** (i - j)), arg_label=r"{\pi/2^{%d}}" % (i - j)),
+                        CPHASE(
+                            theta=np.pi / (2 ** (i - j)),
+                            arg_label=r"{\pi/2^{%d}}" % (i - j),
+                        ),
                         targets=[j],
                         controls=[i],
                     )
@@ -136,6 +140,6 @@ def _cphase_to_cnot(targets, controls, arg_value, qc: QubitCircuit):
     qc.add_gate(decomposed_gates[4], targets=targets)
     qc.add_gate(CX, targets=targets, controls=controls)
     qc.add_gate(RZ(arg_value / 2), targets=controls)
-    gate = decomposed_gates[7]
-    gate.arg_value[0] += arg_value / 4
+    gate = decomposed_gates[7]  # This is a GLOBALPHASE Gate
+    gate.arg_value = gate.arg_value[0] + arg_value / 4
     qc.add_gate(gate, targets=targets)
diff --git a/src/qutip_qip/algorithms/qpe.py b/src/qutip_qip/algorithms/qpe.py
@@ -1,7 +1,8 @@
 import numpy as np
-from qutip_qip.circuit import QubitCircuit
 from qutip_qip.algorithms import qft_gate_sequence
-from qutip_qip.operations import custom_gate_factory, controlled_gate_factory, H
+from qutip_qip.circuit import QubitCircuit
+from qutip_qip.operations import get_unitary_gate, get_controlled_gate
+from qutip_qip.operations.gates import H
 
 
 def qpe(U, num_counting_qubits, target_qubits=None, to_cnot=False):
@@ -41,7 +42,7 @@ def qpe(U, num_counting_qubits, target_qubits=None, to_cnot=False):
         target_qubits = list(
             range(num_counting_qubits, num_counting_qubits + num_target_qubits)
         )
-    elif isinstance(target_qubits, int):
+    elif type(target_qubits) is int:
         target_qubits = [target_qubits]
         num_target_qubits = 1
     else:
@@ -61,11 +62,11 @@ def qpe(U, num_counting_qubits, target_qubits=None, to_cnot=False):
         U_power = U if power == 1 else U**power
 
         # Add controlled-U^power gate
-        controlled_u = controlled_gate_factory(
-            gate=custom_gate_factory(
-                gate_name="U^power gate",
+        controlled_u = get_controlled_gate(
+            gate=get_unitary_gate(
+                gate_name=f"U^{power}",
                 U=U_power,
-            )(),
+            ),
         )
         qc.add_gate(controlled_u, targets=target_qubits, controls=[i])
 

diff --git a/src/qutip_qip/circuit/__init__.py b/src/qutip_qip/circuit/__init__.py
@@ -1,40 +1,12 @@
 """Circuit representation and simulation at the gate level."""
 
-import warnings
-
 from .instruction import (
     CircuitInstruction,
     GateInstruction,
     MeasurementInstruction,
 )
 from .simulator import CircuitResult, CircuitSimulator
 from .circuit import QubitCircuit
-from qutip_qip.operations import Gate, Measurement
-
-
-def _add_deprecation(fun, msg):
-    def newfun(*args, **kwargs):
-        warnings.warn(
-            msg,
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return fun(*args, **kwargs)
-
-    return newfun
-
-
-Gate = _add_deprecation(
-    Gate,
-    "The class Gate has been moved to qutip_qip.operations."
-    "Please use update the import statement.\n",
-)
-Measurement = _add_deprecation(
-    Measurement,
-    "The class Measurement has been moved to qutip_qip.operations."
-    "Please use update the import statement.\n",
-)
-
 
 __all__ = [
     "CircuitSimulator",