qiskit 1.4.1__cp39-abi3-macosx_11_0_arm64.whl → 2.0.0rc1__cp39-abi3-macosx_11_0_arm64.whl

qiskit/circuit/library/arithmetic/piecewise_linear_pauli_rotations.py

@@ -14,14 +14,15 @@
 """Piecewise-linearly-controlled rotation."""
 
 from __future__ import annotations
+from collections.abc import Sequence
 import numpy as np
 
-from qiskit.circuit import QuantumRegister, AncillaRegister, QuantumCircuit
+from qiskit.circuit import QuantumRegister, AncillaRegister, QuantumCircuit, Gate
 from qiskit.circuit.exceptions import CircuitError
 
 from .functional_pauli_rotations import FunctionalPauliRotations
-from .linear_pauli_rotations import LinearPauliRotations
-from .integer_comparator import IntegerComparator
+from .linear_pauli_rotations import LinearPauliRotations, LinearPauliRotationsGate
+from .integer_comparator import IntegerComparator, IntegerComparatorGate
 
 
 class PiecewiseLinearPauliRotations(FunctionalPauliRotations):
@@ -272,6 +273,115 @@ class PiecewiseLinearPauliRotations(FunctionalPauliRotations):
                 circuit.append(lin_r.to_gate().control(), qr_compare[:] + qr_state[:] + qr_target)
 
                 # uncompute comparator
-                circuit.append(comp.to_gate().inverse(), qr[:] + qr_helper[: comp.num_ancillas])
+                circuit.append(comp.to_gate(), qr[:] + qr_helper[: comp.num_ancillas])
 
         self.append(circuit.to_gate(), self.qubits)
+
+
+class PiecewiseLinearPauliRotationsGate(Gate):
+    r"""Piecewise-linearly-controlled Pauli rotations.
+
+    For a piecewise linear (not necessarily continuous) function :math:`f(x)`, which is defined
+    through breakpoints, slopes and offsets as follows.
+    Suppose the breakpoints :math:`(x_0, ..., x_J)` are a subset of :math:`[0, 2^n-1]`, where
+    :math:`n` is the number of state qubits. Further on, denote the corresponding slopes and
+    offsets by :math:`a_j` and :math:`b_j` respectively.
+    Then f(x) is defined as:
+
+    .. math::
+
+        f(x) = \begin{cases}
+            0, x < x_0 \\
+            a_j (x - x_j) + b_j, x_j \leq x < x_{j+1}
+            \end{cases}
+
+    where we implicitly assume :math:`x_{J+1} = 2^n`.
+    """
+
+    def __init__(
+        self,
+        num_state_qubits: int | None = None,
+        breakpoints: list[int] | None = None,
+        slopes: Sequence[float] | None = None,
+        offsets: Sequence[float] | None = None,
+        basis: str = "Y",
+        label: str | None = None,
+    ) -> None:
+        """Construct piecewise-linearly-controlled Pauli rotations.
+
+        Args:
+            num_state_qubits: The number of qubits representing the state.
+            breakpoints: The breakpoints to define the piecewise-linear function.
+                Defaults to ``[0]``.
+            slopes: The slopes for different segments of the piecewise-linear function.
+                Defaults to ``[1]``.
+            offsets: The offsets for different segments of the piecewise-linear function.
+                Defaults to ``[0]``.
+            basis: The type of Pauli rotation (``'X'``, ``'Y'``, ``'Z'``).
+            label: The label of the gate.
+        """
+        self.breakpoints = breakpoints if breakpoints is not None else [0]
+        self.slopes = slopes if slopes is not None else [1]
+        self.offsets = offsets if offsets is not None else [0]
+        self.basis = basis
+
+        num_compare_bits = 1 if len(self.breakpoints) > 1 else 0
+        super().__init__("PwLinPauliRot", num_state_qubits + 1 + num_compare_bits, [], label=label)
+
+    def _define(self):
+        circuit = QuantumCircuit(self.num_qubits, name=self.name)
+
+        if len(self.breakpoints) == 1:
+            qr_state = circuit.qubits[: self.num_qubits - 1]
+            qr_target = [circuit.qubits[-1]]
+            qr_compare = []
+        else:
+            qr_state = circuit.qubits[: self.num_qubits - 2]
+            qr_target = [circuit.qubits[-2]]
+            qr_compare = [circuit.qubits[-1]]
+
+        num_state_qubits = len(qr_state)
+
+        mapped_slopes = np.zeros_like(self.slopes)
+        for i, slope in enumerate(self.slopes):
+            mapped_slopes[i] = slope - sum(mapped_slopes[:i])
+
+        mapped_offsets = np.zeros_like(self.offsets)
+        for i, (offset, slope, point) in enumerate(
+            zip(self.offsets, self.slopes, self.breakpoints)
+        ):
+            mapped_offsets[i] = offset - slope * point - sum(mapped_offsets[:i])
+
+        # apply comparators and controlled linear rotations
+        contains_zero_breakpoint = np.isclose(self.breakpoints[0], 0)
+        for i, point in enumerate(self.breakpoints):
+            if i == 0 and contains_zero_breakpoint:
+                # apply rotation
+                lin_r = LinearPauliRotationsGate(
+                    num_state_qubits=num_state_qubits,
+                    slope=mapped_slopes[i],
+                    offset=mapped_offsets[i],
+                    basis=self.basis,
+                )
+                circuit.append(lin_r, qr_state[:] + qr_target)
+
+            else:
+                # apply Comparator
+                comp = IntegerComparatorGate(num_state_qubits=num_state_qubits, value=point)
+                qr = qr_state[:] + qr_compare[:]  # add ancilla as compare qubit
+
+                circuit.append(comp, qr[:])
+
+                # apply controlled rotation
+                lin_r = LinearPauliRotationsGate(
+                    num_state_qubits=num_state_qubits,
+                    slope=mapped_slopes[i],
+                    offset=mapped_offsets[i],
+                    basis=self.basis,
+                )
+                circuit.append(lin_r.control(), qr_compare[:] + qr_state[:] + qr_target)
+
+                # uncompute comparator (which is its self-inverse)
+                circuit.append(comp, qr[:])
+
+        self.definition = circuit

qiskit/circuit/library/arithmetic/piecewise_polynomial_pauli_rotations.py

@@ -16,12 +16,12 @@ from __future__ import annotations
 from typing import List, Optional
 import numpy as np
 
-from qiskit.circuit import QuantumRegister, AncillaRegister, QuantumCircuit
+from qiskit.circuit import QuantumRegister, AncillaRegister, QuantumCircuit, Gate
 from qiskit.circuit.exceptions import CircuitError
 
 from .functional_pauli_rotations import FunctionalPauliRotations
-from .polynomial_pauli_rotations import PolynomialPauliRotations
-from .integer_comparator import IntegerComparator
+from .polynomial_pauli_rotations import PolynomialPauliRotations, PolynomialPauliRotationsGate
+from .integer_comparator import IntegerComparator, IntegerComparatorGate
 
 
 class PiecewisePolynomialPauliRotations(FunctionalPauliRotations):
@@ -101,8 +101,8 @@ class PiecewisePolynomialPauliRotations(FunctionalPauliRotations):
             breakpoints: The breakpoints to define the piecewise-linear function.
                 Defaults to ``[0]``.
             coeffs: The coefficients of the polynomials for different segments of the
-            piecewise-linear function. ``coeffs[j][i]`` is the coefficient of the i-th power of x
-            for the j-th polynomial.
+                piecewise-linear function. ``coeffs[j][i]`` is the coefficient of the i-th power of x
+                for the j-th polynomial.
                 Defaults to linear: ``[[1]]``.
             basis: The type of Pauli rotation (``'X'``, ``'Y'``, ``'Z'``).
             name: The name of the circuit.
@@ -187,16 +187,7 @@ class PiecewisePolynomialPauliRotations(FunctionalPauliRotations):
         Returns:
             The mapped coefficients.
         """
-        mapped_coeffs = []
-
-        # First polynomial
-        mapped_coeffs.append(self._hom_coeffs[0])
-        for i in range(1, len(self._hom_coeffs)):
-            mapped_coeffs.append([])
-            for j in range(0, self._degree + 1):
-                mapped_coeffs[i].append(self._hom_coeffs[i][j] - self._hom_coeffs[i - 1][j])
-
-        return mapped_coeffs
+        return _map_coeffs(self._hom_coeffs)
 
     @property
     def contains_zero_breakpoint(self) -> bool | np.bool_:
@@ -315,3 +306,188 @@ class PiecewisePolynomialPauliRotations(FunctionalPauliRotations):
                 )
 
         self.append(circuit.to_gate(), self.qubits)
+
+
+class PiecewisePolynomialPauliRotationsGate(Gate):
+    r"""Piecewise-polynomially-controlled Pauli rotations.
+
+    This class implements a piecewise polynomial (not necessarily continuous) function,
+    :math:`f(x)`, on qubit amplitudes, which is defined through breakpoints and coefficients as
+    follows.
+    Suppose the breakpoints :math:`(x_0, ..., x_J)` are a subset of :math:`[0, 2^n-1]`, where
+    :math:`n` is the number of state qubits. Further on, denote the corresponding coefficients by
+    :math:`[a_{j,1},...,a_{j,d}]`, where :math:`d` is the highest degree among all polynomials.
+
+    Then :math:`f(x)` is defined as:
+
+    .. math::
+
+        f(x) = \begin{cases}
+            0, x < x_0 \\
+            \sum_{i=0}^{i=d}a_{j,i}/2 x^i, x_j \leq x < x_{j+1}
+            \end{cases}
+
+    where if given the same number of breakpoints as polynomials, we implicitly assume
+    :math:`x_{J+1} = 2^n`.
+
+    .. note::
+
+        Note the :math:`1/2` factor in the coefficients of :math:`f(x)`, this is consistent with
+        Qiskit's Pauli rotations.
+
+    Examples:
+        >>> from qiskit import QuantumCircuit
+        >>> from qiskit.circuit.library.arithmetic.piecewise_polynomial_pauli_rotations import\
+        ... PiecewisePolynomialPauliRotations
+        >>> qubits, breakpoints, coeffs = (2, [0, 2], [[0, -1.2],[-1, 1, 3]])
+        >>> poly_r = PiecewisePolynomialPauliRotations(num_state_qubits=qubits,
+        ...breakpoints=breakpoints, coeffs=coeffs)
+        >>>
+        >>> qc = QuantumCircuit(poly_r.num_qubits)
+        >>> qc.h(list(range(qubits)));
+        >>> qc.append(poly_r.to_instruction(), list(range(qc.num_qubits)));
+        >>> qc.draw()
+             ┌───┐┌──────────┐
+        q_0: ┤ H ├┤0         ├
+             ├───┤│          │
+        q_1: ┤ H ├┤1         ├
+             └───┘│          │
+        q_2: ─────┤2         ├
+                  │  pw_poly │
+        q_3: ─────┤3         ├
+                  │          │
+        q_4: ─────┤4         ├
+                  │          │
+        q_5: ─────┤5         ├
+                  └──────────┘
+
+    References:
+        [1]: Haener, T., Roetteler, M., & Svore, K. M. (2018).
+             Optimizing Quantum Circuits for Arithmetic.
+             `arXiv:1805.12445 <http://arxiv.org/abs/1805.12445>`_
+
+        [2]: Carrera Vazquez, A., Hiptmair, R., & Woerner, S. (2022).
+             Enhancing the Quantum Linear Systems Algorithm using Richardson Extrapolation.
+             `ACM Transactions on Quantum Computing 3, 1, Article 2 <https://doi.org/10.1145/3490631>`_
+    """
+
+    def __init__(
+        self,
+        num_state_qubits: int,
+        breakpoints: list[int] | None = None,
+        coeffs: list[list[float]] | None = None,
+        basis: str = "Y",
+        label: str | None = None,
+    ) -> None:
+        """
+        Args:
+            num_state_qubits: The number of qubits representing the state.
+            breakpoints: The breakpoints to define the piecewise-linear function.
+                Defaults to ``[0]``.
+            coeffs: The coefficients of the polynomials for different segments of the
+                piecewise-linear function. ``coeffs[j][i]`` is the coefficient of the i-th power of x
+                for the j-th polynomial.
+                Defaults to linear: ``[[1]]``.
+            basis: The type of Pauli rotation (``'X'``, ``'Y'``, ``'Z'``).
+            label: An optional label for the gate.
+        """
+
+        if coeffs is None:
+            degree = 0
+            coeffs = [[1]]
+        else:
+            # store a list of coefficients as homogeneous polynomials adding 0's where necessary
+            degree = len(max(coeffs, key=len)) - 1
+            coeffs = [poly + [0] * (degree + 1 - len(poly)) for poly in coeffs]
+
+        # ensure the breakpoint contains 2 ** num_state_qubits
+        breakpoints = breakpoints.copy()
+        if breakpoints is None:
+            breakpoints = [0, 2**num_state_qubits]
+        elif breakpoints[-1] < 2**num_state_qubits:
+            breakpoints.append(2**num_state_qubits)
+
+        self.coeffs = coeffs
+        self.breakpoints = breakpoints
+        self.basis = basis
+
+        self.num_compare = int(len(self.breakpoints) > 2)
+        super().__init__(
+            "PiecewisePolyPauli", num_state_qubits + self.num_compare + 1, [], label=label
+        )
+
+    def evaluate(self, x: float) -> float:
+        """Classically evaluate the piecewise polynomial rotation.
+
+        Args:
+            x: Value to be evaluated at.
+
+        Returns:
+            Value of piecewise polynomial function at x.
+        """
+        mapped_coeffs = _map_coeffs(self.coeffs)
+
+        y = 0
+        for i, breakpt in enumerate(self.breakpoints):
+            y = y + (x >= breakpt) * (np.poly1d(mapped_coeffs[i][::-1])(x))
+
+        return y
+
+    def _define(self):
+        num_state_qubits = self.num_qubits - self.num_compare - 1
+        circuit = QuantumCircuit(self.num_qubits, name=self.name)
+        qr_state = circuit.qubits[:num_state_qubits]
+
+        if len(self.breakpoints) > 2:
+            qr_target = [circuit.qubits[-2]]
+            qr_compare = [circuit.qubits[-1]]
+        else:
+            qr_target = [circuit.qubits[-1]]
+            qr_compare = []
+
+        # apply comparators and controlled linear rotations
+        contains_zero_breakpoint = np.isclose(self.breakpoints[0], 0)
+        mapped_coeffs = _map_coeffs(self.coeffs)
+
+        for i, point in enumerate(self.breakpoints[:-1]):
+            if i == 0 and contains_zero_breakpoint:
+                # apply rotation
+                poly_r = PolynomialPauliRotationsGate(
+                    num_state_qubits=num_state_qubits,
+                    coeffs=mapped_coeffs[i],
+                    basis=self.basis,
+                )
+                circuit.append(poly_r, qr_state[:] + qr_target)
+
+            else:
+                # apply Comparator
+                comp = IntegerComparatorGate(num_state_qubits=num_state_qubits, value=point)
+                qr_state_full = qr_state[:] + qr_compare  # add compare qubit
+
+                circuit.append(comp, qr_state_full[:])
+
+                # apply controlled rotation
+                poly_r = PolynomialPauliRotationsGate(
+                    num_state_qubits=num_state_qubits,
+                    coeffs=mapped_coeffs[i],
+                    basis=self.basis,
+                )
+                circuit.append(poly_r.control(), qr_compare + qr_state[:] + qr_target)
+
+                # uncompute comparator
+                circuit.append(comp, qr_state_full[:])
+
+        self.definition = circuit
+
+
+def _map_coeffs(coeffs):
+    mapped_coeffs = []
+    mapped_coeffs.append(coeffs[0])
+
+    degree = len(coeffs[0]) - 1  # all coeffs should have the same length by now
+    for i in range(1, len(coeffs)):
+        mapped_coeffs.append([])
+        for j in range(0, degree + 1):
+            mapped_coeffs[i].append(coeffs[i][j] - coeffs[i - 1][j])
+
+    return mapped_coeffs

qiskit/circuit/library/arithmetic/polynomial_pauli_rotations.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 
 from itertools import product
 
-from qiskit.circuit import QuantumRegister, QuantumCircuit
+from qiskit.circuit import QuantumRegister, QuantumCircuit, Gate
 from qiskit.circuit.exceptions import CircuitError
 
 from .functional_pauli_rotations import FunctionalPauliRotations
@@ -253,52 +253,68 @@ class PolynomialPauliRotations(FunctionalPauliRotations):
 
         return valid
 
-    def _get_rotation_coefficients(self) -> dict[tuple[int, ...], float]:
-        """Compute the coefficient of each monomial.
+    def _build(self):
+        """If not already built, build the circuit."""
+        if self._is_built:
+            return
 
-        Returns:
-            A dictionary with pairs ``{control_state: rotation angle}`` where ``control_state``
-            is a tuple of ``0`` or ``1`` bits.
-        """
-        # determine the control states
-        all_combinations = list(product([0, 1], repeat=self.num_state_qubits))
-        valid_combinations = []
-        for combination in all_combinations:
-            if 0 < sum(combination) <= self.degree:
-                valid_combinations += [combination]
+        super()._build()
 
-        rotation_coeffs = {control_state: 0.0 for control_state in valid_combinations}
+        gate = PolynomialPauliRotationsGate(self.num_state_qubits, self.coeffs, self.basis)
+        self.append(gate, self.qubits)
 
-        # compute the coefficients for the control states
-        for i, coeff in enumerate(self.coeffs[1:]):
-            i += 1  # since we skip the first element we need to increase i by one
 
-            # iterate over the multinomial coefficients
-            for comb, num_combs in _multinomial_coefficients(self.num_state_qubits, i).items():
-                control_state: tuple[int, ...] = ()
-                power = 1
-                for j, qubit in enumerate(comb):
-                    if qubit > 0:  # means we control on qubit i
-                        control_state += (1,)
-                        power *= 2 ** (j * qubit)
-                    else:
-                        control_state += (0,)
+class PolynomialPauliRotationsGate(Gate):
+    r"""A gate implementing polynomial Pauli rotations.
 
-                # Add angle
-                rotation_coeffs[control_state] += coeff * num_combs * power
+    For a polynomial :math:`p(x)`, a basis state :math:`|i\rangle` and a target qubit
+    :math:`|0\rangle` this operator acts as:
 
-        return rotation_coeffs
+    .. math::
 
-    def _build(self):
-        """If not already built, build the circuit."""
-        if self._is_built:
-            return
+        |i\rangle |0\rangle \mapsto \cos\left(\frac{p(i)}{2}\right) |i\rangle |0\rangle
+        + \sin\left(\frac{p(i)}{2}\right) |i\rangle |1\rangle
 
-        super()._build()
+    Let n be the number of qubits representing the state, d the degree of p(x) and q_i the qubits,
+    where q_0 is the least significant qubit. Then for
 
-        circuit = QuantumCircuit(*self.qregs, name=self.name)
-        qr_state = circuit.qubits[: self.num_state_qubits]
-        qr_target = circuit.qubits[self.num_state_qubits]
+    .. math::
+
+        x = \sum_{i=0}^{n-1} 2^i q_i,
+
+    we can write
+
+    .. math::
+
+        p(x) = \sum_{j=0}^{j=d} c_j x^j
+
+    where :math:`c` are the input coefficients, ``coeffs``.
+    """
+
+    def __init__(
+        self,
+        num_state_qubits: int,
+        coeffs: list[float] | None = None,
+        basis: str = "Y",
+        label: str | None = None,
+    ) -> None:
+        """Prepare an approximation to a state with amplitudes specified by a polynomial.
+
+        Args:
+            num_state_qubits: The number of qubits representing the state.
+            coeffs: The coefficients of the polynomial. ``coeffs[i]`` is the coefficient of the
+                i-th power of x. Defaults to linear: [0, 1].
+            basis: The type of Pauli rotation ('X', 'Y', 'Z').
+            label: A label for the gate.
+        """
+        self.coeffs = coeffs or [0, 1]
+        self.basis = basis.lower()
+        super().__init__("PolyPauli", num_state_qubits + 1, [], label=label)
+
+    def _define(self):
+        circuit = QuantumCircuit(self.num_qubits)
+        qr_state = circuit.qubits[: self.num_qubits - 1]
+        qr_target = circuit.qubits[-1]
 
         rotation_coeffs = self._get_rotation_coefficients()
 
@@ -332,4 +348,42 @@ class PolynomialPauliRotations(FunctionalPauliRotations):
                 else:
                     circuit.crz(rotation_coeffs[c], qr_control[0], qr_target)
 
-        self.append(circuit.to_gate(), self.qubits)
+        self.definition = circuit
+
+    def _get_rotation_coefficients(self) -> dict[tuple[int, ...], float]:
+        """Compute the coefficient of each monomial.
+
+        Returns:
+            A dictionary with pairs ``{control_state: rotation angle}`` where ``control_state``
+            is a tuple of ``0`` or ``1`` bits.
+        """
+        # determine the control states
+        num_state_qubits = self.num_qubits - 1
+        degree = len(self.coeffs) - 1
+        all_combinations = list(product([0, 1], repeat=num_state_qubits))
+        valid_combinations = []
+        for combination in all_combinations:
+            if 0 < sum(combination) <= degree:
+                valid_combinations += [combination]
+
+        rotation_coeffs = {control_state: 0.0 for control_state in valid_combinations}
+
+        # compute the coefficients for the control states
+        for i, coeff in enumerate(self.coeffs[1:]):
+            i += 1  # since we skip the first element we need to increase i by one
+
+            # iterate over the multinomial coefficients
+            for comb, num_combs in _multinomial_coefficients(num_state_qubits, i).items():
+                control_state: tuple[int, ...] = ()
+                power = 1
+                for j, qubit in enumerate(comb):
+                    if qubit > 0:  # means we control on qubit i
+                        control_state += (1,)
+                        power *= 2 ** (j * qubit)
+                    else:
+                        control_state += (0,)
+
+                # Add angle
+                rotation_coeffs[control_state] += coeff * num_combs * power
+
+        return rotation_coeffs