qiskit 2.0.2__cp39-abi3-macosx_11_0_arm64.whl → 2.1.0rc1__cp39-abi3-macosx_11_0_arm64.whl

qiskit/circuit/library/boolean_logic/inner_product.py

@@ -64,9 +64,9 @@ class InnerProduct(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.InnerProductGate instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(self, num_qubits: int) -> None:
         """Return a circuit to compute the inner product of 2 n-qubit registers.

qiskit/circuit/library/boolean_logic/quantum_and.py

@@ -54,9 +54,9 @@ class AND(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.AndGate instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/boolean_logic/quantum_or.py

@@ -55,9 +55,9 @@ class OR(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.OrGate instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,
@@ -135,7 +135,7 @@ class OrGate(Gate):
     .. plot::
        :alt: Diagram illustrating the previously described circuit.
 
-       from qiskit.circuit import QuantumCircuit
+       from qiskit import QuantumCircuit
        from qiskit.circuit.library import OrGate
        from qiskit.visualization.library import _generate_circuit_library_visualization
        circuit = QuantumCircuit(6)

qiskit/circuit/library/boolean_logic/quantum_xor.py

@@ -30,10 +30,10 @@ class XOR(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Instead, for xor-ing with a specified amount, use BitwiseXorGate,"
         "and for xor-ing with a random amount, use random_bitwise_xor.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/data_preparation/_z_feature_map.py

@@ -76,12 +76,12 @@ class ZFeatureMap(PauliFeatureMap):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg=(
             "Use the z_feature_map function as a replacement. Note that this will no longer "
             "return a BlueprintCircuit, but just a plain QuantumCircuit."
         ),
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/data_preparation/_zz_feature_map.py

@@ -96,12 +96,12 @@ class ZZFeatureMap(PauliFeatureMap):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg=(
             "Use the z_feature_map function as a replacement. Note that this will no longer "
             "return a BlueprintCircuit, but just a plain QuantumCircuit."
         ),
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/data_preparation/pauli_feature_map.py

@@ -408,12 +408,12 @@ class PauliFeatureMap(NLocal):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg=(
             "Use the pauli_feature_map function as a replacement. Note that this will no longer "
             "return a BlueprintCircuit, but just a plain QuantumCircuit."
         ),
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/fourier_checking.py

@@ -54,9 +54,9 @@ class FourierChecking(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.fourier_checking instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(self, f: Sequence[int], g: Sequence[int]) -> None:
         """Create Fourier checking circuit.

qiskit/circuit/library/generalized_gates/diagonal.py

@@ -34,7 +34,11 @@ _EPS = 1e-10
 class Diagonal(QuantumCircuit):
     """Circuit implementing a diagonal transformation."""
 
-    @deprecate_func(since="1.3", additional_msg="Use DiagonalGate instead.", pending=True)
+    @deprecate_func(
+        since="2.1",
+        additional_msg="Use DiagonalGate instead.",
+        removal_timeline="in Qiskit 3.0",
+    )
     def __init__(self, diag: Sequence[complex]) -> None:
         r"""
         Args:

qiskit/circuit/library/generalized_gates/gms.py

@@ -78,7 +78,11 @@ class GMS(QuantumCircuit):
     `arXiv:1707.06356 <https://arxiv.org/abs/1707.06356>`_
     """
 
-    @deprecate_func(since="1.3", additional_msg="Use the MSGate instead.", pending=True)
+    @deprecate_func(
+        since="2.1",
+        additional_msg="Use the MSGate instead.",
+        removal_timeline="in Qiskit 3.0",
+    )
     def __init__(self, num_qubits: int, theta: list[list[float]] | np.ndarray) -> None:
         """Create a new Global Mølmer–Sørensen (GMS) gate.
 

qiskit/circuit/library/generalized_gates/linear_function.py

@@ -227,9 +227,9 @@ class LinearFunction(Gate):
         self.definition = synth_cnot_count_full_pmh(self.linear)
 
     @deprecate_func(
-        since="1.3",
-        pending=True,
+        since="2.1",
         additional_msg="Call LinearFunction.definition instead, or compile the circuit.",
+        removal_timeline="in Qiskit 3.0",
     )
     def synthesize(self):
         """Synthesizes the linear function into a quantum circuit.

qiskit/circuit/library/generalized_gates/permutation.py

@@ -28,7 +28,11 @@ from qiskit.utils.deprecation import deprecate_func
 class Permutation(QuantumCircuit):
     """An n_qubit circuit that permutes qubits."""
 
-    @deprecate_func(since="1.3", pending=True, additional_msg="Use PermutationGate instead.")
+    @deprecate_func(
+        since="2.1",
+        additional_msg="Use PermutationGate instead.",
+        removal_timeline="in Qiskit 3.0",
+    )
     def __init__(
         self,
         num_qubits: int,

qiskit/circuit/library/generalized_gates/uc.py

@@ -286,7 +286,7 @@ class UCGate(Gate):
         This method finds the single qubit gate arising in the decomposition of UCGates given in
         https://arxiv.org/pdf/quant-ph/0410066.pdf.
         """
-        single_qubit_gates = [gate.astype(complex) for gate in self.params]
+        single_qubit_gates = [np.asarray(gate, dtype=complex, order="f") for gate in self.params]
         if self.simp_contr[0]:
             return uc_gate.dec_ucg_help(single_qubit_gates, len(self.simp_contr[1]) + 1)
         return uc_gate.dec_ucg_help(single_qubit_gates, self.num_qubits)

qiskit/circuit/library/generalized_gates/unitary.py

@@ -161,6 +161,15 @@ class UnitaryGate(Gate):
             )
 
             self.definition = qs_decomposition(self.to_matrix())
+            # Since iterative cosine-sine decomposition may provide imprecise matrices,
+            # we use the Isometry decomposition in this case
+            # pylint: disable=cyclic-import
+            from qiskit.quantum_info.operators import Operator
+
+            if not (
+                matrix_equal(Operator(self.definition).to_matrix(), self.to_matrix(), atol=1e-7)
+            ):
+                self.definition = Isometry(self.matrix, 0, 0).definition
 
     def control(
         self,
@@ -185,14 +194,24 @@ class UnitaryGate(Gate):
         if not annotated:
             mat = self.to_matrix()
             cmat = _compute_control_matrix(mat, num_ctrl_qubits, ctrl_state=None)
-            iso = Isometry(cmat, 0, 0)
+            from qiskit.synthesis.unitary.qsd import qs_decomposition
+
+            cmat_def = qs_decomposition(cmat, opt_a1=True, opt_a2=False)
+            # Since iterative cosine-sine decomposition may provide imprecise matrices,
+            # we use the Isometry decomposition in this case
+            # pylint: disable=cyclic-import
+            from qiskit.quantum_info.operators import Operator
+
+            if not matrix_equal(Operator(cmat_def).to_matrix(), cmat, atol=1e-7):
+                self.definition = Isometry(cmat, 0, 0).definition
+
             gate = ControlledGate(
                 "c-unitary",
                 num_qubits=self.num_qubits + num_ctrl_qubits,
                 params=[mat],
                 label=label,
                 num_ctrl_qubits=num_ctrl_qubits,
-                definition=iso.definition,
+                definition=cmat_def,
                 ctrl_state=ctrl_state,
                 base_gate=self.copy(),
             )

qiskit/circuit/library/graph_state.py

@@ -60,9 +60,9 @@ class GraphState(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.GraphStateGate instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(self, adjacency_matrix: list | np.ndarray) -> None:
         """Create graph state preparation circuit.

qiskit/circuit/library/grover_operator.py

@@ -428,9 +428,9 @@ class GroverOperator(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.grover_operator instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/hidden_linear_function.py

@@ -70,9 +70,9 @@ class HiddenLinearFunction(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.hidden_linear_function instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(self, adjacency_matrix: list | np.ndarray) -> None:
         """Create new HLF circuit.

qiskit/circuit/library/iqp.py

@@ -65,9 +65,9 @@ class IQP(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use the qiskit.circuit.library.iqp function instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(self, interactions: list | np.ndarray) -> None:
         """Create IQP circuit.

qiskit/circuit/library/n_local/efficient_su2.py

@@ -194,9 +194,9 @@ class EfficientSU2(TwoLocal):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use the function qiskit.circuit.library.efficient_su2 instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/n_local/evolved_operator_ansatz.py

@@ -263,7 +263,7 @@ def hamiltonian_variational_ansatz(
 
     """
     # If a single operator is given, check if it is a sum of operators (a SparsePauliOp),
-    # and split it into commuting terms. Otherwise treat it as single operator.
+    # and split it into commuting terms. Otherwise, treat it as single operator.
     if isinstance(hamiltonian, SparsePauliOp):
         hamiltonian = hamiltonian.group_commuting()
 

qiskit/circuit/library/n_local/excitation_preserving.py

@@ -17,7 +17,7 @@ from collections.abc import Callable, Iterable
 from numpy import pi
 
 from qiskit.circuit import QuantumCircuit, Parameter
-from qiskit.circuit.library.standard_gates import RZGate
+from qiskit.circuit.library.standard_gates import RZGate, XXPlusYYGate
 from qiskit.utils.deprecation import deprecate_func
 from .n_local import n_local, BlockEntanglement
 from .two_local import TwoLocal
@@ -79,7 +79,7 @@ def excitation_preserving(
             ansatz = excitation_preserving(3, reps=1, insert_barriers=True, entanglement="linear")
             ansatz.draw("mpl")
 
-        The entanglement structure can be explicitly specified with the ``entanglement`` 
+        The entanglement structure can be explicitly specified with the ``entanglement``
         argument. The ``"fsim"`` mode includes an additional parameterized :class:`.CPhaseGate`
         in each block:
 
@@ -116,8 +116,7 @@ def excitation_preserving(
     theta = Parameter("θ")
     if num_qubits > 1:
         swap = QuantumCircuit(2, name="Interaction")
-        swap.rxx(theta, 0, 1)
-        swap.ryy(theta, 0, 1)
+        swap.append(XXPlusYYGate(2 * theta), [0, 1])
         if mode == "fsim":
             phi = Parameter("φ")
             swap.cp(phi, 0, 1)
@@ -209,15 +208,15 @@ class ExcitationPreserving(TwoLocal):
 
     .. seealso::
 
-        The :func:`.excitation_preserving` function constructs a functionally equivalent circuit, 
+        The :func:`.excitation_preserving` function constructs a functionally equivalent circuit,
         but faster.
 
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use the function qiskit.circuit.library.excitation_preserving instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,
@@ -272,8 +271,7 @@ class ExcitationPreserving(TwoLocal):
 
         theta = Parameter("θ")
         swap = QuantumCircuit(2, name="Interaction")
-        swap.rxx(theta, 0, 1)
-        swap.ryy(theta, 0, 1)
+        swap.append(XXPlusYYGate(2 * theta), [0, 1])
         if mode == "fsim":
             phi = Parameter("φ")
             swap.cp(phi, 0, 1)

qiskit/circuit/library/n_local/n_local.py

@@ -309,9 +309,10 @@ class NLocal(BlueprintCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
-        additional_msg="Use the function qiskit.circuit.library.n_local instead.",
-        pending=True,
+        since="2.1",
+        additional_msg="This applies to NLocal subclasses too. Use the corresponding function "
+        "from the module qiskit.circuit.library.n_local instead.",
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/n_local/pauli_two_design.py

@@ -170,9 +170,9 @@ class PauliTwoDesign(TwoLocal):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use the function qiskit.circuit.library.pauli_two_design instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/n_local/real_amplitudes.py

@@ -238,9 +238,9 @@ class RealAmplitudes(TwoLocal):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use the function qiskit.circuit.library.real_amplitudes instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/n_local/two_local.py

@@ -138,9 +138,9 @@ class TwoLocal(NLocal):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use the function qiskit.circuit.library.n_local instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/overlap.py

@@ -60,9 +60,9 @@ class UnitaryOverlap(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.unitary_overlap instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/pauli_evolution.py

@@ -21,6 +21,7 @@ from qiskit.circuit.gate import Gate
 from qiskit.circuit.quantumcircuit import ParameterValueType
 from qiskit.circuit.parameterexpression import ParameterExpression
 from qiskit.quantum_info import Pauli, SparsePauliOp, SparseObservable
+import qiskit.quantum_info
 
 if TYPE_CHECKING:
     from qiskit.synthesis.evolution import EvolutionSynthesis
@@ -91,10 +92,10 @@ class PauliEvolutionGate(Gate):
     def __init__(
         self,
         operator: (
-            Pauli
+            qiskit.quantum_info.Pauli
             | SparsePauliOp
             | SparseObservable
-            | list[Pauli | SparsePauliOp | SparseObservable]
+            | list[qiskit.quantum_info.Pauli | SparsePauliOp | SparseObservable]
         ),
         time: ParameterValueType = 1.0,
         label: str | None = None,

qiskit/circuit/library/phase_estimation.py

@@ -50,9 +50,9 @@ class PhaseEstimation(QuantumCircuit):
     """
 
     @deprecate_func(
-        since="1.3",
+        since="2.1",
         additional_msg="Use qiskit.circuit.library.phase_estimation instead.",
-        pending=True,
+        removal_timeline="in Qiskit 3.0",
     )
     def __init__(
         self,

qiskit/circuit/library/standard_gates/dcx.py

@@ -49,7 +49,7 @@ class DCXGate(SingletonGate):
             \end{pmatrix}
     """
 
-    _standard_gate = StandardGate.DCXGate
+    _standard_gate = StandardGate.DCX
 
     def __init__(self, label=None):
         """Create new DCX gate."""
@@ -58,20 +58,19 @@ class DCXGate(SingletonGate):
     _singleton_lookup_key = stdlib_singleton_key()
 
     def _define(self):
-        """
-        gate dcx a, b { cx a, b; cx b, a; }
-        """
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
-        from .x import CXGate
+        from qiskit.circuit import QuantumCircuit
 
-        q = QuantumRegister(2, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [(CXGate(), [q[0], q[1]], []), (CXGate(), [q[1], q[0]], [])]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
+        #           ┌───┐
+        # q_0: ──■──┤ X ├
+        #      ┌─┴─┐└─┬─┘
+        # q_1: ┤ X ├──■──
+        #      └───┘
 
-        self.definition = qc
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.DCX._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def __eq__(self, other):
         return isinstance(other, DCXGate)

qiskit/circuit/library/standard_gates/ecr.py

@@ -17,8 +17,6 @@ import numpy as np
 from qiskit.circuit._utils import with_gate_array
 from qiskit.circuit.singleton import SingletonGate, stdlib_singleton_key
 from qiskit._accelerate.circuit import StandardGate
-from .rzx import RZXGate
-from .x import XGate
 
 
 @with_gate_array(
@@ -39,11 +37,13 @@ class ECRGate(SingletonGate):
 
     .. code-block:: text
 
-             ┌─────────┐            ┌────────────┐┌────────┐┌─────────────┐
-        q_0: ┤0        ├       q_0: ┤0           ├┤ RX(pi) ├┤0            ├
-             │   ECR   │   =        │  RZX(pi/4) │└────────┘│  RZX(-pi/4) │
-        q_1: ┤1        ├       q_1: ┤1           ├──────────┤1            ├
-             └─────────┘            └────────────┘          └─────────────┘
+                               global phase: 7π/4
+             ┌─────────┐            ┌───┐      ┌───┐
+        q_0: ┤0        ├       q_0: ┤ S ├───■──┤ X ├
+             │   ECR   │   =        ├───┴┐┌─┴─┐└───┘
+        q_1: ┤1        ├       q_1: ┤ √X ├┤ X ├─────
+             └─────────┘            └────┘└───┘
+
 
     **Matrix Representation:**
 
@@ -84,7 +84,7 @@ class ECRGate(SingletonGate):
                 \end{pmatrix}
     """
 
-    _standard_gate = StandardGate.ECRGate
+    _standard_gate = StandardGate.ECR
 
     def __init__(self, label=None):
         """Create new ECR gate."""
@@ -93,23 +93,20 @@ class ECRGate(SingletonGate):
     _singleton_lookup_key = stdlib_singleton_key()
 
     def _define(self):
-        """
-        gate ecr a, b { rzx(pi/4) a, b; x a; rzx(-pi/4) a, b;}
-        """
+        """Default definition (in terms of simpler Clifford gates)"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
-
-        q = QuantumRegister(2, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [
-            (RZXGate(np.pi / 4), [q[0], q[1]], []),
-            (XGate(), [q[0]], []),
-            (RZXGate(-np.pi / 4), [q[0], q[1]], []),
-        ]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
-
-        self.definition = qc
+        from qiskit.circuit import QuantumCircuit
+
+        # global phase: 7π/4
+        #      ┌───┐      ┌───┐
+        # q_0: ┤ S ├───■──┤ X ├
+        #      ├───┴┐┌─┴─┐└───┘
+        # q_1: ┤ √X ├┤ X ├─────
+        #      └────┘└───┘
+
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.ECR._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def inverse(self, annotated: bool = False):
         """Return inverse ECR gate (itself).