qiskit 1.4.1__cp39-abi3-win_amd64.whl → 2.0.0__cp39-abi3-win_amd64.whl

qiskit/circuit/library/standard_gates/u3.py

@@ -21,7 +21,6 @@ import numpy
 from qiskit.circuit.controlledgate import ControlledGate
 from qiskit.circuit.gate import Gate
 from qiskit.circuit.parameterexpression import ParameterValueType, ParameterExpression
-from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit._accelerate.circuit import StandardGate
 
 
@@ -92,12 +91,9 @@ class U3Gate(Gate):
         phi: ParameterValueType,
         lam: ParameterValueType,
         label: Optional[str] = None,
-        *,
-        duration=None,
-        unit="dt",
     ):
         """Create new U3 gate."""
-        super().__init__("u3", 1, [theta, phi, lam], label=label, duration=duration, unit=unit)
+        super().__init__("u3", 1, [theta, phi, lam], label=label)
 
     def inverse(self, annotated: bool = False):
         r"""Return inverted U3 gate.
@@ -155,7 +151,7 @@ class U3Gate(Gate):
         return gate
 
     def _define(self):
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
 
         q = QuantumRegister(1, "q")
         qc = QuantumCircuit(q, name=self.name)
@@ -271,8 +267,6 @@ class CU3Gate(ControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create new CU3 gate."""
@@ -284,8 +278,6 @@ class CU3Gate(ControlledGate):
             label=label,
             ctrl_state=ctrl_state,
             base_gate=U3Gate(theta, phi, lam, label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     def _define(self):
@@ -300,7 +292,7 @@ class CU3Gate(ControlledGate):
         }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u1 import U1Gate
         from .x import CXGate  # pylint: disable=cyclic-import
 

qiskit/circuit/library/standard_gates/x.py

@@ -17,7 +17,6 @@ from math import pi
 import numpy
 from qiskit.circuit.controlledgate import ControlledGate
 from qiskit.circuit.singleton import SingletonGate, SingletonControlledGate, stdlib_singleton_key
-from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit.circuit._utils import _ctrl_state_to_int, with_gate_array, with_controlled_gate_array
 from qiskit._accelerate.circuit import StandardGate
 from qiskit.utils.deprecation import deprecate_func
@@ -75,9 +74,9 @@ class XGate(SingletonGate):
 
     _standard_gate = StandardGate.XGate
 
-    def __init__(self, label: Optional[str] = None, *, duration=None, unit="dt"):
+    def __init__(self, label: Optional[str] = None):
         """Create new X gate."""
-        super().__init__("x", 1, [], label=label, duration=duration, unit=unit)
+        super().__init__("x", 1, [], label=label)
 
     _singleton_lookup_key = stdlib_singleton_key()
 
@@ -86,7 +85,7 @@ class XGate(SingletonGate):
         gate x a { u3(pi,0,pi) a; }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u3 import U3Gate
 
         q = QuantumRegister(1, "q")
@@ -225,8 +224,6 @@ class CXGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create new CX gate."""
@@ -239,8 +236,6 @@ class CXGate(SingletonControlledGate):
             ctrl_state=ctrl_state,
             base_gate=XGate(label=_base_label),
             _base_label=_base_label,
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=1)
@@ -306,8 +301,7 @@ class CCXGate(SingletonControlledGate):
     r"""CCX gate, also known as Toffoli gate.
 
     Can be applied to a :class:`~qiskit.circuit.QuantumCircuit`
-    with the :meth:`~qiskit.circuit.QuantumCircuit.ccx` and
-    :meth:`~qiskit.circuit.QuantumCircuit.toffoli` methods.
+    with the :meth:`~qiskit.circuit.QuantumCircuit.ccx` method.
 
     **Circuit symbol:**
 
@@ -378,8 +372,6 @@ class CCXGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create new CCX gate."""
@@ -391,8 +383,6 @@ class CCXGate(SingletonControlledGate):
             label=label,
             ctrl_state=ctrl_state,
             base_gate=XGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=2)
@@ -407,7 +397,7 @@ class CCXGate(SingletonControlledGate):
         t a; tdg b; cx a,b;}
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .h import HGate
         from .t import TGate, TdgGate
 
@@ -528,9 +518,9 @@ class RCCXGate(SingletonGate):
 
     _standard_gate = StandardGate.RCCXGate
 
-    def __init__(self, label: Optional[str] = None, *, duration=None, unit="dt"):
+    def __init__(self, label: Optional[str] = None):
         """Create a new simplified CCX gate."""
-        super().__init__("rccx", 3, [], label=label, duration=duration, unit=unit)
+        super().__init__("rccx", 3, [], label=label)
 
     _singleton_lookup_key = stdlib_singleton_key()
 
@@ -549,7 +539,7 @@ class RCCXGate(SingletonGate):
         }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u1 import U1Gate
         from .u2 import U2Gate
 
@@ -592,8 +582,6 @@ class C3SXGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create a new 3-qubit controlled sqrt-X gate.
@@ -613,8 +601,6 @@ class C3SXGate(SingletonControlledGate):
             label=label,
             ctrl_state=ctrl_state,
             base_gate=SXGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=3)
@@ -639,7 +625,7 @@ class C3SXGate(SingletonControlledGate):
         }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u1 import CU1Gate
         from .h import HGate
 
@@ -699,8 +685,6 @@ class C3XGate(SingletonControlledGate):
         ctrl_state: Optional[Union[str, int]] = None,
         *,
         _base_label=None,
-        duration=None,
-        unit="dt",
     ):
         """Create a new 3-qubit controlled X gate."""
         super().__init__(
@@ -711,8 +695,6 @@ class C3XGate(SingletonControlledGate):
             label=label,
             ctrl_state=ctrl_state,
             base_gate=XGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=3)
@@ -755,7 +737,7 @@ class C3XGate(SingletonControlledGate):
             h d;
         }
         """
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
 
         q = QuantumRegister(4, name="q")
         qc = QuantumCircuit(q, name=self.name)
@@ -882,9 +864,9 @@ class RC3XGate(SingletonGate):
 
     _standard_gate = StandardGate.RC3XGate
 
-    def __init__(self, label: Optional[str] = None, *, duration=None, unit="dt"):
+    def __init__(self, label: Optional[str] = None):
         """Create a new RC3X gate."""
-        super().__init__("rcccx", 4, [], label=label, duration=duration, unit=unit)
+        super().__init__("rcccx", 4, [], label=label)
 
     _singleton_lookup_key = stdlib_singleton_key()
 
@@ -912,7 +894,7 @@ class RC3XGate(SingletonGate):
         }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u1 import U1Gate
         from .u2 import U2Gate
 
@@ -964,13 +946,9 @@ class C4XGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create a new 4-qubit controlled X gate."""
-        if unit is None:
-            unit = "dt"
         super().__init__(
             "mcx",
             5,
@@ -979,8 +957,6 @@ class C4XGate(SingletonControlledGate):
             label=label,
             ctrl_state=ctrl_state,
             base_gate=XGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=4)
@@ -1014,7 +990,7 @@ class C4XGate(SingletonControlledGate):
         }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u1 import CU1Gate
         from .h import HGate
 
@@ -1105,8 +1081,6 @@ class MCXGate(ControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create a new MCX instance.
@@ -1127,8 +1101,6 @@ class MCXGate(ControlledGate):
                 label=label,
                 ctrl_state=ctrl_state,
                 _base_label=_base_label,
-                duration=duration,
-                unit=unit,
             )
             return gate
         return super().__new__(cls)
@@ -1139,8 +1111,6 @@ class MCXGate(ControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _name="mcx",
         _base_label=None,
     ):
@@ -1256,8 +1226,6 @@ class MCXGrayCode(MCXGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create a new MCXGrayCode instance"""
@@ -1270,15 +1238,11 @@ class MCXGrayCode(MCXGate):
                 label=label,
                 ctrl_state=ctrl_state,
                 _base_label=_base_label,
-                duration=duration,
-                unit=unit,
             )
             # if __new__ does not return the same type as cls, init is not called
             gate.__init__(
                 label=label,
                 ctrl_state=ctrl_state,
-                duration=duration,
-                unit=unit,
             )
             return gate
         return super().__new__(cls)
@@ -1355,8 +1319,6 @@ class MCXRecursive(MCXGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         super().__init__(
@@ -1364,8 +1326,6 @@ class MCXRecursive(MCXGate):
             label=label,
             ctrl_state=ctrl_state,
             _name="mcx_recursive",
-            duration=duration,
-            unit=unit,
             _base_label=None,
         )
 
@@ -1408,8 +1368,6 @@ class MCXVChain(MCXGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
         relative_phase: bool = False,  # pylint: disable=unused-argument
         action_only: bool = False,  # pylint: disable=unused-argument
@@ -1424,8 +1382,6 @@ class MCXVChain(MCXGate):
             label=label,
             ctrl_state=ctrl_state,
             _base_label=_base_label,
-            duration=duration,
-            unit=unit,
         )
 
     @deprecate_func(
@@ -1447,8 +1403,6 @@ class MCXVChain(MCXGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
         relative_phase: bool = False,
         action_only: bool = False,
@@ -1474,8 +1428,6 @@ class MCXVChain(MCXGate):
             ctrl_state=ctrl_state,
             _name="mcx_vchain",
             _base_label=_base_label,
-            duration=duration,
-            unit=unit,
         )
         self._dirty_ancillas = dirty_ancillas
         self._relative_phase = relative_phase

qiskit/circuit/library/standard_gates/xx_minus_yy.py

@@ -29,7 +29,7 @@ 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.quantumregister import QuantumRegister
+from qiskit.circuit import QuantumRegister
 from qiskit._accelerate.circuit import StandardGate
 
 
@@ -72,9 +72,6 @@ class XXMinusYYGate(Gate):
         theta: ParameterValueType,
         beta: ParameterValueType = 0,
         label: Optional[str] = "(XX-YY)",
-        *,
-        duration=None,
-        unit="dt",
     ):
         """Create new XX-YY gate.
 
@@ -83,7 +80,7 @@ class XXMinusYYGate(Gate):
             beta: The phase angle.
             label: The label of the gate.
         """
-        super().__init__("xx_minus_yy", 2, [theta, beta], label=label, duration=duration, unit=unit)
+        super().__init__("xx_minus_yy", 2, [theta, beta], label=label)
 
     def _define(self):
         """

qiskit/circuit/library/standard_gates/xx_plus_yy.py

@@ -22,7 +22,7 @@ from typing import Optional
 import numpy
 
 from qiskit.circuit.gate import Gate
-from qiskit.circuit.quantumregister import QuantumRegister
+from qiskit.circuit import QuantumRegister
 from qiskit.circuit.parameterexpression import ParameterValueType, ParameterExpression
 from qiskit._accelerate.circuit import StandardGate
 
@@ -98,9 +98,6 @@ class XXPlusYYGate(Gate):
         theta: ParameterValueType,
         beta: ParameterValueType = 0,
         label: Optional[str] = "(XX+YY)",
-        *,
-        duration=None,
-        unit="dt",
     ):
         """Create new XX+YY gate.
 
@@ -109,7 +106,7 @@ class XXPlusYYGate(Gate):
             beta: The phase angle.
             label: The label of the gate.
         """
-        super().__init__("xx_plus_yy", 2, [theta, beta], label=label, duration=duration, unit=unit)
+        super().__init__("xx_plus_yy", 2, [theta, beta], label=label)
 
     def _define(self):
         """

qiskit/circuit/library/standard_gates/y.py

@@ -17,7 +17,6 @@ from typing import Optional, Union
 
 # pylint: disable=cyclic-import
 from qiskit.circuit.singleton import SingletonGate, SingletonControlledGate, stdlib_singleton_key
-from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit.circuit._utils import with_gate_array, with_controlled_gate_array
 from qiskit._accelerate.circuit import StandardGate
 
@@ -73,15 +72,15 @@ class YGate(SingletonGate):
 
     _standard_gate = StandardGate.YGate
 
-    def __init__(self, label: Optional[str] = None, *, duration=None, unit="dt"):
+    def __init__(self, label: Optional[str] = None):
         """Create new Y gate."""
-        super().__init__("y", 1, [], label=label, duration=duration, unit=unit)
+        super().__init__("y", 1, [], label=label)
 
     _singleton_lookup_key = stdlib_singleton_key()
 
     def _define(self):
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u3 import U3Gate
 
         q = QuantumRegister(1, "q")
@@ -208,8 +207,6 @@ class CYGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create new CY gate."""
@@ -221,8 +218,6 @@ class CYGate(SingletonControlledGate):
             label=label,
             ctrl_state=ctrl_state,
             base_gate=YGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=1)
@@ -232,7 +227,7 @@ class CYGate(SingletonControlledGate):
         gate cy a,b { sdg b; cx a,b; s b; }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .s import SGate, SdgGate
         from .x import CXGate
 

qiskit/circuit/library/standard_gates/z.py

@@ -19,7 +19,6 @@ import numpy
 
 from qiskit.circuit._utils import with_gate_array, with_controlled_gate_array
 from qiskit.circuit.singleton import SingletonGate, SingletonControlledGate, stdlib_singleton_key
-from qiskit.circuit.quantumregister import QuantumRegister
 from qiskit._accelerate.circuit import StandardGate
 
 from .p import PhaseGate
@@ -76,16 +75,15 @@ class ZGate(SingletonGate):
 
     _standard_gate = StandardGate.ZGate
 
-    def __init__(self, label: Optional[str] = None, *, duration=None, unit="dt"):
+    def __init__(self, label: Optional[str] = None):
         """Create new Z gate."""
-        super().__init__("z", 1, [], label=label, duration=duration, unit=unit)
+        super().__init__("z", 1, [], label=label)
 
     _singleton_lookup_key = stdlib_singleton_key()
 
     def _define(self):
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
-
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
         from .u1 import U1Gate
 
         q = QuantumRegister(1, "q")
@@ -191,8 +189,6 @@ class CZGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create new CZ gate."""
@@ -204,8 +200,6 @@ class CZGate(SingletonControlledGate):
             num_ctrl_qubits=1,
             ctrl_state=ctrl_state,
             base_gate=ZGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=1)
@@ -215,7 +209,7 @@ class CZGate(SingletonControlledGate):
         gate cz a,b { h b; cx a,b; h b; }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
 
         from .h import HGate
         from .x import CXGate
@@ -293,8 +287,6 @@ class CCZGate(SingletonControlledGate):
         label: Optional[str] = None,
         ctrl_state: Optional[Union[str, int]] = None,
         *,
-        duration=None,
-        unit="dt",
         _base_label=None,
     ):
         """Create new CCZ gate."""
@@ -306,8 +298,6 @@ class CCZGate(SingletonControlledGate):
             num_ctrl_qubits=2,
             ctrl_state=ctrl_state,
             base_gate=ZGate(label=_base_label),
-            duration=duration,
-            unit=unit,
         )
 
     _singleton_lookup_key = stdlib_singleton_key(num_ctrl_qubits=2)
@@ -317,7 +307,7 @@ class CCZGate(SingletonControlledGate):
         gate ccz a,b,c { h c; ccx a,b,c; h c; }
         """
         # pylint: disable=cyclic-import
-        from qiskit.circuit.quantumcircuit import QuantumCircuit
+        from qiskit.circuit import QuantumCircuit, QuantumRegister
 
         from .h import HGate
         from .x import CCXGate

qiskit/circuit/measure.py

@@ -16,17 +16,26 @@ Quantum measurement in the computational basis.
 
 from qiskit.circuit.singleton import SingletonInstruction, stdlib_singleton_key
 from qiskit.circuit.exceptions import CircuitError
+from qiskit._accelerate.circuit import StandardInstructionType
 
 
 class Measure(SingletonInstruction):
     """Quantum measurement in the computational basis."""
 
-    def __init__(self, label=None, *, duration=None, unit="dt"):
+    _standard_instruction_type = StandardInstructionType.Measure
+
+    def __init__(self, label=None):
         """
         Args:
             label: optional string label for this instruction.
         """
-        super().__init__("measure", 1, 1, [], label=label, duration=duration, unit=unit)
+        super().__init__("measure", 1, 1, [], label=label)
+
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        # Subclasses of Measure are not "standard", so we set this to None to
+        # prevent the Rust code from treating them as such.
+        cls._standard_instruction_type = None
 
     _singleton_lookup_key = stdlib_singleton_key()
 

qiskit/circuit/parameterexpression.py

@@ -26,6 +26,8 @@ import numpy
 import symengine
 
 from qiskit.circuit.exceptions import CircuitError
+from qiskit.exceptions import QiskitError
+from qiskit.utils.optionals import HAS_SYMPY
 
 # This type is redefined at the bottom to insert the full reference to "ParameterExpression", so it
 # can safely be used by runtime type-checkers like Sphinx.  Mypy does not need this because it
@@ -117,6 +119,8 @@ class ParameterExpression:
 
         Not intended to be called directly, but to be instantiated via operations
         on other :class:`Parameter` or :class:`ParameterExpression` objects.
+        The constructor of this object is **not** a public interface and should not
+        ever be used directly.
 
         Args:
             symbol_map (Dict[Parameter, [ParameterExpression, float, or int]]):
@@ -528,6 +532,9 @@ class ParameterExpression:
     def __str__(self):
         from sympy import sympify, sstr
 
+        if not isinstance(self._symbol_expr, symengine.Basic):
+            raise QiskitError("Invalid ParameterExpression")
+
         return sstr(sympify(self._symbol_expr), full_prec=False)
 
     def __complex__(self):
@@ -608,6 +615,9 @@ class ParameterExpression:
                 return False
             from sympy import sympify
 
+            if not isinstance(self._symbol_expr, symengine.Basic):
+                raise QiskitError("Invalid ParameterExpression")
+
             return sympify(self._symbol_expr).equals(sympify(other._symbol_expr))
         elif isinstance(other, numbers.Number):
             return len(self.parameters) == 0 and complex(self._symbol_expr) == other
@@ -672,6 +682,7 @@ class ParameterExpression:
             return out.real if out.imag == 0.0 else out
         return float(real_expr)
 
+    @HAS_SYMPY.require_in_call
     def sympify(self):
         """Return symbolic expression as a raw Sympy or Symengine object.