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

qiskit/circuit/library/standard_gates/xx_minus_yy.py

@@ -16,20 +16,13 @@ from __future__ import annotations
 
 import math
 from cmath import exp
-from math import pi
 from typing import Optional
 
 import numpy as np
 
 from qiskit.circuit.gate import Gate
-from qiskit.circuit.library.standard_gates.ry import RYGate
-from qiskit.circuit.library.standard_gates.rz import RZGate
-from qiskit.circuit.library.standard_gates.s import SdgGate, SGate
-from qiskit.circuit.library.standard_gates.sx import SXdgGate, SXGate
-from qiskit.circuit.library.standard_gates.x import CXGate
 from qiskit.circuit.parameterexpression import ParameterValueType, ParameterExpression
 from qiskit.circuit.quantumcircuit import QuantumCircuit
-from qiskit.circuit import QuantumRegister
 from qiskit._accelerate.circuit import StandardGate
 
 
@@ -65,7 +58,7 @@ class XXMinusYYGate(Gate):
             \end{pmatrix}
     """
 
-    _standard_gate = StandardGate.XXMinusYYGate
+    _standard_gate = StandardGate.XXMinusYY
 
     def __init__(
         self,
@@ -83,48 +76,17 @@ class XXMinusYYGate(Gate):
         super().__init__("xx_minus_yy", 2, [theta, beta], label=label)
 
     def _define(self):
-        """
-        gate xx_minus_yy(theta, beta) a, b {
-            rz(-beta) b;
-            rz(-pi/2) a;
-            sx a;
-            rz(pi/2) a;
-            s b;
-            cx a, b;
-            ry(theta/2) a;
-            ry(-theta/2) b;
-            cx a, b;
-            sdg b;
-            rz(-pi/2) a;
-            sxdg a;
-            rz(pi/2) a;
-            rz(beta) b;
-        }
-        """
-        theta, beta = self.params
-        register = QuantumRegister(2, "q")
-        circuit = QuantumCircuit(register, name=self.name)
-        a, b = register
-        rules = [
-            (RZGate(-beta), [b], []),
-            (RZGate(-pi / 2), [a], []),
-            (SXGate(), [a], []),
-            (RZGate(pi / 2), [a], []),
-            (SGate(), [b], []),
-            (CXGate(), [a, b], []),
-            (RYGate(theta / 2), [a], []),
-            (RYGate(-theta / 2), [b], []),
-            (CXGate(), [a, b], []),
-            (SdgGate(), [b], []),
-            (RZGate(-pi / 2), [a], []),
-            (SXdgGate(), [a], []),
-            (RZGate(pi / 2), [a], []),
-            (RZGate(beta), [b], []),
-        ]
-        for instr, qargs, cargs in rules:
-            circuit._append(instr, qargs, cargs)
-
-        self.definition = circuit
+        """Default definition"""
+
+        #       ┌─────┐  ┌────┐┌───┐     ┌─────────┐      ┌─────┐ ┌──────┐┌───┐
+        # q_0: ─┤ Sdg ├──┤ √X ├┤ S ├──■──┤ Ry(θ/2) ├───■──┤ Sdg ├─┤ √Xdg ├┤ S ├
+        #      ┌┴─────┴─┐├───┬┘└───┘┌─┴─┐├─────────┴┐┌─┴─┐├─────┤┌┴──────┤└───┘
+        # q_1: ┤ Rz(-β) ├┤ S ├──────┤ X ├┤ Ry(-θ/2) ├┤ X ├┤ Sdg ├┤ Rz(β) ├─────
+        #      └────────┘└───┘      └───┘└──────────┘└───┘└─────┘└───────┘
+
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.XXMinusYY._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def control(
         self,

qiskit/circuit/library/standard_gates/xx_plus_yy.py

@@ -16,13 +16,11 @@ from __future__ import annotations
 
 import math
 from cmath import exp
-from math import pi
 from typing import Optional
 
 import numpy
 
 from qiskit.circuit.gate import Gate
-from qiskit.circuit import QuantumRegister
 from qiskit.circuit.parameterexpression import ParameterValueType, ParameterExpression
 from qiskit._accelerate.circuit import StandardGate
 
@@ -91,7 +89,7 @@ class XXPlusYYGate(Gate):
                 \end{pmatrix}
     """
 
-    _standard_gate = StandardGate.XXPlusYYGate
+    _standard_gate = StandardGate.XXPlusYY
 
     def __init__(
         self,
@@ -109,56 +107,19 @@ class XXPlusYYGate(Gate):
         super().__init__("xx_plus_yy", 2, [theta, beta], label=label)
 
     def _define(self):
-        """
-        gate xx_plus_yy(theta, beta) a, b {
-            rz(beta) b;
-            rz(-pi/2) a;
-            sx a;
-            rz(pi/2) a;
-            s b;
-            cx a, b;
-            ry(theta/2) a;
-            ry(theta/2) b;
-            cx a, b;
-            sdg b;
-            rz(-pi/2) a;
-            sxdg a;
-            rz(pi/2) a;
-            rz(-beta) b;
-        }
-        """
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
-        from .x import CXGate
-        from .s import SGate, SdgGate
-        from .sx import SXGate, SXdgGate
-        from .rz import RZGate
-        from .ry import RYGate
-
-        theta = self.params[0]
-        beta = self.params[1]
-        q = QuantumRegister(2, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [
-            (RZGate(beta), [q[0]], []),
-            (RZGate(-pi / 2), [q[1]], []),
-            (SXGate(), [q[1]], []),
-            (RZGate(pi / 2), [q[1]], []),
-            (SGate(), [q[0]], []),
-            (CXGate(), [q[1], q[0]], []),
-            (RYGate(-theta / 2), [q[1]], []),
-            (RYGate(-theta / 2), [q[0]], []),
-            (CXGate(), [q[1], q[0]], []),
-            (SdgGate(), [q[0]], []),
-            (RZGate(-pi / 2), [q[1]], []),
-            (SXdgGate(), [q[1]], []),
-            (RZGate(pi / 2), [q[1]], []),
-            (RZGate(-beta), [q[0]], []),
-        ]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
-
-        self.definition = qc
+        from qiskit.circuit import QuantumCircuit
+
+        #      ┌───────┐┌───┐      ┌───┐┌──────────┐┌───┐┌─────┐┌────────┐
+        # q_0: ┤ Rz(β) ├┤ S ├──────┤ X ├┤ Ry(-θ/2) ├┤ X ├┤ Sdg ├┤ Rz(-β) ├─────
+        #      └┬─────┬┘├───┴┐┌───┐└─┬─┘├──────────┤└─┬─┘├─────┤└┬──────┬┘┌───┐
+        # q_1: ─┤ Sdg ├─┤ √X ├┤ S ├──■──┤ Ry(-θ/2) ├──■──┤ Sdg ├─┤ √Xdg ├─┤ S ├
+        #       └─────┘ └────┘└───┘     └──────────┘     └─────┘ └──────┘ └───┘
+
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.XXPlusYY._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def control(
         self,

qiskit/circuit/library/standard_gates/y.py

@@ -12,7 +12,6 @@
 
 """Y and CY gates."""
 
-from math import pi
 from typing import Optional, Union
 
 # pylint: disable=cyclic-import
@@ -70,7 +69,7 @@ class YGate(SingletonGate):
         |1\rangle \rightarrow -i|0\rangle
     """
 
-    _standard_gate = StandardGate.YGate
+    _standard_gate = StandardGate.Y
 
     def __init__(self, label: Optional[str] = None):
         """Create new Y gate."""
@@ -79,17 +78,17 @@ class YGate(SingletonGate):
     _singleton_lookup_key = stdlib_singleton_key()
 
     def _define(self):
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
-        from .u3 import U3Gate
+        from qiskit.circuit import QuantumCircuit
 
-        q = QuantumRegister(1, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [(U3Gate(pi, pi / 2, pi / 2), [q[0]], [])]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
+        #    ┌──────────────┐
+        # q: ┤ U(π,π/2,π/2) ├
+        #    └──────────────┘
 
-        self.definition = qc
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.Y._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def control(
         self,
@@ -200,7 +199,7 @@ class CYGate(SingletonControlledGate):
 
     """
 
-    _standard_gate = StandardGate.CYGate
+    _standard_gate = StandardGate.CY
 
     def __init__(
         self,
@@ -223,21 +222,18 @@ class CYGate(SingletonControlledGate):
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=1)
 
     def _define(self):
-        """
-        gate cy a,b { sdg b; cx a,b; s b; }
-        """
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
-        from .s import SGate, SdgGate
-        from .x import CXGate
+        from qiskit.circuit import QuantumCircuit
 
-        q = QuantumRegister(2, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [(SdgGate(), [q[1]], []), (CXGate(), [q[0], q[1]], []), (SGate(), [q[1]], [])]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
+        # q_0: ─────────■───────
+        #      ┌─────┐┌─┴─┐┌───┐
+        # q_1: ┤ Sdg ├┤ X ├┤ S ├
+        #      └─────┘└───┘└───┘
 
-        self.definition = qc
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.CY._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def inverse(self, annotated: bool = False):
         """Return inverted CY gate (itself).

qiskit/circuit/library/standard_gates/z.py

@@ -12,7 +12,6 @@
 
 """Z, CZ and CCZ gates."""
 
-from math import pi
 from typing import Optional, Union
 
 import numpy
@@ -73,7 +72,7 @@ class ZGate(SingletonGate):
         |1\rangle \rightarrow -|1\rangle
     """
 
-    _standard_gate = StandardGate.ZGate
+    _standard_gate = StandardGate.Z
 
     def __init__(self, label: Optional[str] = None):
         """Create new Z gate."""
@@ -82,17 +81,17 @@ class ZGate(SingletonGate):
     _singleton_lookup_key = stdlib_singleton_key()
 
     def _define(self):
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
-        from .u1 import U1Gate
+        from qiskit.circuit import QuantumCircuit
 
-        q = QuantumRegister(1, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [(U1Gate(pi), [q[0]], [])]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
+        #    ┌──────┐
+        # q: ┤ P(π) ├
+        #    └──────┘
 
-        self.definition = qc
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.Z._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def control(
         self,
@@ -182,7 +181,7 @@ class CZGate(SingletonControlledGate):
     the target qubit if the control qubit is in the :math:`|1\rangle` state.
     """
 
-    _standard_gate = StandardGate.CZGate
+    _standard_gate = StandardGate.CZ
 
     def __init__(
         self,
@@ -205,22 +204,18 @@ class CZGate(SingletonControlledGate):
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=1)
 
     def _define(self):
-        """
-        gate cz a,b { h b; cx a,b; h b; }
-        """
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
+        from qiskit.circuit import QuantumCircuit
 
-        from .h import HGate
-        from .x import CXGate
+        # q_0: ───────■───────
+        #      ┌───┐┌─┴─┐┌───┐
+        # q_1: ┤ H ├┤ X ├┤ H ├
+        #      └───┘└───┘└───┘
 
-        q = QuantumRegister(2, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [(HGate(), [q[1]], []), (CXGate(), [q[0], q[1]], []), (HGate(), [q[1]], [])]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
-
-        self.definition = qc
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.CZ._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def inverse(self, annotated: bool = False):
         """Return inverted CZ gate (itself).
@@ -280,7 +275,7 @@ class CCZGate(SingletonControlledGate):
     the target qubit if the control qubits are in the :math:`|11\rangle` state.
     """
 
-    _standard_gate = StandardGate.CCZGate
+    _standard_gate = StandardGate.CCZ
 
     def __init__(
         self,
@@ -303,22 +298,20 @@ class CCZGate(SingletonControlledGate):
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=2)
 
     def _define(self):
-        """
-        gate ccz a,b,c { h c; ccx a,b,c; h c; }
-        """
+        """Default definition"""
         # pylint: disable=cyclic-import
-        from qiskit.circuit import QuantumCircuit, QuantumRegister
+        from qiskit.circuit import QuantumCircuit
 
-        from .h import HGate
-        from .x import CCXGate
+        # q_0: ───────■───────
+        #             │
+        # q_1: ───────■───────
+        #      ┌───┐┌─┴─┐┌───┐
+        # q_2: ┤ H ├┤ X ├┤ H ├
+        #      └───┘└───┘└───┘
 
-        q = QuantumRegister(3, "q")
-        qc = QuantumCircuit(q, name=self.name)
-        rules = [(HGate(), [q[2]], []), (CCXGate(), [q[0], q[1], q[2]], []), (HGate(), [q[2]], [])]
-        for instr, qargs, cargs in rules:
-            qc._append(instr, qargs, cargs)
-
-        self.definition = qc
+        self.definition = QuantumCircuit._from_circuit_data(
+            StandardGate.CCZ._get_definition(self.params), add_regs=True, name=self.name
+        )
 
     def inverse(self, annotated: bool = False):
         """Return inverted CCZ gate (itself).

qiskit/circuit/parameter.py

@@ -17,13 +17,16 @@ from __future__ import annotations
 
 from uuid import uuid4, UUID
 
-import symengine
-
+import qiskit._accelerate.circuit
 from qiskit.circuit.exceptions import CircuitError
+from qiskit.utils.optionals import HAS_SYMPY
 
 from .parameterexpression import ParameterExpression
 
 
+SymbolExpr = qiskit._accelerate.circuit.ParameterExpression
+
+
 class Parameter(ParameterExpression):
     """A compile-time symbolic parameter.
 
@@ -81,7 +84,7 @@ class Parameter(ParameterExpression):
                 allows them to be equal.  This is useful during serialization and deserialization.
         """
         self._uuid = uuid4() if uuid is None else uuid
-        symbol = symengine.Symbol(name)
+        symbol = SymbolExpr.Symbol(name)
 
         self._symbol_expr = symbol
         self._parameter_keys = frozenset((self._hash_key(),))
@@ -103,7 +106,7 @@ class Parameter(ParameterExpression):
             return value
         # This is the `super().bind` case, where we're required to return a `ParameterExpression`,
         # so we need to lift the given value to a symbolic expression.
-        return ParameterExpression({}, symengine.sympify(value))
+        return ParameterExpression({}, SymbolExpr.Value(value))
 
     def subs(self, parameter_map: dict, allow_unknown_parameters: bool = False):
         """Substitute self with the corresponding parameter in ``parameter_map``."""
@@ -156,7 +159,7 @@ class Parameter(ParameterExpression):
         # its hash as part of the equality comparison but has its own more complete symbolic
         # expression, so its full hash key is split into `(parameter_keys, symbolic_expression)`.
         # This method lets containing expressions get only the bits they need for equality checks in
-        # the first value, without wasting time re-hashing individual Sympy/Symengine symbols.
+        # the first value, without wasting time re-hashing individual symbols.
         return (self._symbol_expr, self._uuid)
 
     def __hash__(self):
@@ -177,3 +180,9 @@ class Parameter(ParameterExpression):
         self._name_map = None
         self._qpy_replay = []
         self._standalone_param = True
+
+    @HAS_SYMPY.require_in_call
+    def sympify(self):
+        import sympy
+
+        return sympy.Symbol(self.name)