qiskit 1.0.2__cp38-abi3-win32.whl → 1.1.0__cp38-abi3-win32.whl

qiskit/pulse/schedule.py

@@ -39,11 +39,12 @@ import multiprocessing as mp
 import sys
 import warnings
 from collections.abc import Callable, Iterable
-from typing import List, Tuple, Union, Dict, Any
+from typing import List, Tuple, Union, Dict, Any, Sequence
 
 import numpy as np
 import rustworkx as rx
 
+from qiskit.circuit import ParameterVector
 from qiskit.circuit.parameter import Parameter
 from qiskit.circuit.parameterexpression import ParameterExpression, ParameterValueType
 from qiskit.pulse.channels import Channel
@@ -52,6 +53,7 @@ from qiskit.pulse.instructions import Instruction, Reference
 from qiskit.pulse.utils import instruction_duration_validation
 from qiskit.pulse.reference_manager import ReferenceManager
 from qiskit.utils.multiprocessing import is_main_process
+from qiskit.utils import deprecate_arg
 
 
 Interval = Tuple[int, int]
@@ -711,13 +713,19 @@ class Schedule:
         return self._parameter_manager.is_parameterized()
 
     def assign_parameters(
-        self, value_dict: dict[ParameterExpression, ParameterValueType], inplace: bool = True
+        self,
+        value_dict: dict[
+            ParameterExpression | ParameterVector | str,
+            ParameterValueType | Sequence[ParameterValueType],
+        ],
+        inplace: bool = True,
     ) -> "Schedule":
         """Assign the parameters in this schedule according to the input.
 
         Args:
-            value_dict: A mapping from Parameters to either numeric values or another
-                Parameter expression.
+            value_dict: A mapping from parameters or parameter names (parameter vector
+            or parameter vector name) to either numeric values (list of numeric values)
+            or another parameter expression (list of parameter expressions).
             inplace: Set ``True`` to override this instance with new parameter.
 
         Returns:
@@ -1408,14 +1416,18 @@ class ScheduleBlock:
 
     def assign_parameters(
         self,
-        value_dict: dict[ParameterExpression, ParameterValueType],
+        value_dict: dict[
+            ParameterExpression | ParameterVector | str,
+            ParameterValueType | Sequence[ParameterValueType],
+        ],
         inplace: bool = True,
     ) -> "ScheduleBlock":
         """Assign the parameters in this schedule according to the input.
 
         Args:
-            value_dict: A mapping from Parameters to either numeric values or another
-                Parameter expression.
+            value_dict: A mapping from parameters or parameter names (parameter vector
+            or parameter vector name) to either numeric values (list of numeric values)
+            or another parameter expression (list of parameter expressions).
             inplace: Set ``True`` to override this instance with new parameter.
 
         Returns:
@@ -1634,6 +1646,7 @@ def _common_method(*classes):
     return decorator
 
 
+@deprecate_arg("show_barriers", new_alias="plot_barriers", since="1.1.0", pending=True)
 @_common_method(Schedule, ScheduleBlock)
 def draw(
     self,
@@ -1645,9 +1658,10 @@ def draw(
     show_snapshot: bool = True,
     show_framechange: bool = True,
     show_waveform_info: bool = True,
-    show_barrier: bool = True,
+    plot_barrier: bool = True,
     plotter: str = "mpl2d",
     axis: Any | None = None,
+    show_barrier: bool = True,
 ):
     """Plot the schedule.
 
@@ -1659,16 +1673,16 @@ def draw(
             preset stylesheets.
         backend (Optional[BaseBackend]): Backend object to play the input pulse program.
             If provided, the plotter may use to make the visualization hardware aware.
-        time_range: Set horizontal axis limit. Tuple `(tmin, tmax)`.
-        time_unit: The unit of specified time range either `dt` or `ns`.
-            The unit of `ns` is available only when `backend` object is provided.
+        time_range: Set horizontal axis limit. Tuple ``(tmin, tmax)``.
+        time_unit: The unit of specified time range either ``dt`` or ``ns``.
+            The unit of `ns` is available only when ``backend`` object is provided.
         disable_channels: A control property to show specific pulse channel.
             Pulse channel instances provided as a list are not shown in the output image.
         show_snapshot: Show snapshot instructions.
         show_framechange: Show frame change instructions. The frame change represents
             instructions that modulate phase or frequency of pulse channels.
         show_waveform_info: Show additional information about waveforms such as their name.
-        show_barrier: Show barrier lines.
+        plot_barrier: Show barrier lines.
         plotter: Name of plotter API to generate an output image.
             One of following APIs should be specified::
 
@@ -1681,6 +1695,7 @@ def draw(
             the plotters use a given ``axis`` instead of internally initializing
             a figure object. This object format depends on the plotter.
             See plotter argument for details.
+        show_barrier: DEPRECATED. Show barrier lines.
 
     Returns:
         Visualization output data.
@@ -1690,6 +1705,7 @@ def draw(
     # pylint: disable=cyclic-import
     from qiskit.visualization import pulse_drawer
 
+    del show_barrier
     return pulse_drawer(
         program=self,
         style=style,
@@ -1700,7 +1716,7 @@ def draw(
         show_snapshot=show_snapshot,
         show_framechange=show_framechange,
         show_waveform_info=show_waveform_info,
-        show_barrier=show_barrier,
+        plot_barrier=plot_barrier,
         plotter=plotter,
         axis=axis,
     )

qiskit/pulse/utils.py

@@ -11,13 +11,14 @@
 # that they have been altered from the originals.
 
 """Module for common pulse programming utilities."""
-from typing import List, Dict, Union
+from typing import List, Dict, Union, Sequence
 import warnings
 
 import numpy as np
 
+from qiskit.circuit import ParameterVector, Parameter
 from qiskit.circuit.parameterexpression import ParameterExpression
-from qiskit.pulse.exceptions import UnassignedDurationError, QiskitError
+from qiskit.pulse.exceptions import UnassignedDurationError, QiskitError, PulseError
 
 
 def format_meas_map(meas_map: List[List[int]]) -> Dict[int, List[int]]:
@@ -52,17 +53,29 @@ def format_parameter_value(
     Returns:
         Value casted to non-parameter data type, when possible.
     """
-    try:
-        # value is assigned.
-        # note that ParameterExpression directly supports __complex__ via sympy or symengine
-        evaluated = complex(operand)
-        # remove truncation error
-        evaluated = np.round(evaluated, decimals=decimal)
-        # typecast into most likely data type
-        if np.isreal(evaluated):
-            evaluated = float(evaluated.real)
-            if evaluated.is_integer():
-                evaluated = int(evaluated)
+    if isinstance(operand, ParameterExpression):
+        try:
+            operand = operand.numeric()
+        except TypeError:
+            # Unassigned expression
+            return operand
+
+    # Return integer before calling the numpy round function.
+    # The input value is multiplied by 10**decimals, rounds to an integer
+    # and divided by 10**decimals. For a large enough integer,
+    # this operation may introduce a rounding error in the float operations
+    # and accidentally returns a float number.
+    if isinstance(operand, int):
+        return operand
+
+    # Remove truncation error and convert the result into Python builtin type.
+    # Value could originally contain a rounding error, e.g. 1.00000000001
+    # which may occur during the parameter expression evaluation.
+    evaluated = np.round(operand, decimals=decimal).item()
+
+    if isinstance(evaluated, complex):
+        if np.isclose(evaluated.imag, 0.0):
+            evaluated = evaluated.real
         else:
             warnings.warn(
                 "Assignment of complex values to ParameterExpression in Qiskit Pulse objects is "
@@ -76,13 +89,11 @@ def format_parameter_value(
                 "converted in a similar fashion to avoid the use of complex parameters.",
                 PendingDeprecationWarning,
             )
-
-        return evaluated
-    except TypeError:
-        # value is not assigned
-        pass
-
-    return operand
+            return evaluated
+    # Type cast integer-like float into Python builtin integer, after rounding.
+    if evaluated.is_integer():
+        return int(evaluated)
+    return evaluated
 
 
 def instruction_duration_validation(duration: int):
@@ -107,3 +118,33 @@ def instruction_duration_validation(duration: int):
         raise QiskitError(
             f"Instruction duration must be a non-negative integer, got {duration} instead."
         )
+
+
+def _validate_parameter_vector(parameter: ParameterVector, value):
+    """Validate parameter vector and its value."""
+    if not isinstance(value, Sequence):
+        raise PulseError(
+            f"Parameter vector '{parameter.name}' has length {len(parameter)},"
+            f" but was assigned to {value}."
+        )
+    if len(parameter) != len(value):
+        raise PulseError(
+            f"Parameter vector '{parameter.name}' has length {len(parameter)},"
+            f" but was assigned to {len(value)} values."
+        )
+
+
+def _validate_single_parameter(parameter: Parameter, value):
+    """Validate single parameter and its value."""
+    if not isinstance(value, (int, float, complex, ParameterExpression)):
+        raise PulseError(f"Parameter '{parameter.name}' is not assignable to {value}.")
+
+
+def _validate_parameter_value(parameter, value):
+    """Validate parameter and its value."""
+    if isinstance(parameter, ParameterVector):
+        _validate_parameter_vector(parameter, value)
+        return True
+    else:
+        _validate_single_parameter(parameter, value)
+        return False

qiskit/qasm2/__init__.py

@@ -526,12 +526,8 @@ import os
 from pathlib import Path
 from typing import Iterable, Union, Optional, Literal
 
-# Pylint can't handle the C-extension introspection of `_qasm2` because there's a re-import through
-# to `qiskit.qasm2.exceptions`, and pylint ends up trying to import `_qasm2` twice, which PyO3
-# hates.  If that gets fixed, this disable can be removed and `qiskit._qasm2` added to the allowed C
-# extensions for loadings in the `pyproject.toml`.
 # pylint: disable=c-extension-no-member
-from qiskit import _qasm2
+from qiskit._accelerate import qasm2 as _qasm2
 from qiskit.circuit import QuantumCircuit
 from . import parse as _parse
 from .exceptions import QASM2Error, QASM2ParseError, QASM2ExportError

qiskit/qasm2/parse.py

@@ -30,10 +30,7 @@ from qiskit.circuit import (
     Reset,
     library as lib,
 )
-
-# This is the same C-extension problems as described in the `__init__.py` disable near the
-# `_qasm2` import.
-from qiskit._qasm2 import (  # pylint: disable=no-name-in-module
+from qiskit._accelerate.qasm2 import (
     OpCode,
     UnaryOpCode,
     BinaryOpCode,

qiskit/qasm3/__init__.py

@@ -105,14 +105,14 @@ respectively loading a program indirectly from a named file and directly from a
 .. note::
 
     While we are still in the exploratory release period, to use either function, the package
-    ``qiskit_qasm3_import`` must be installed.  This can be done by installing Qiskit Terra with the
+    ``qiskit_qasm3_import`` must be installed.  This can be done by installing Qiskit with the
     ``qasm3-import`` extra, such as by:
 
     .. code-block:: text
 
-        pip install qiskit-terra[qasm3-import]
+        pip install qiskit[qasm3-import]
 
-    We expect that this functionality will eventually be merged into core Terra, and no longer
+    We expect that this functionality will eventually be merged into Qiskit, and no longer
     require an optional import, but we do not yet have a timeline for this.
 
 .. autofunction:: load
@@ -223,14 +223,51 @@ available on this module, if you wish to build on top of it:
 import functools
 import warnings
 
-from qiskit import _qasm3
+from qiskit._accelerate import qasm3 as _qasm3
+from qiskit.circuit import library
 from qiskit.exceptions import ExperimentalWarning
 from qiskit.utils import optionals as _optionals
 
 from .experimental import ExperimentalFeatures
 from .exporter import Exporter
 from .exceptions import QASM3Error, QASM3ImporterError, QASM3ExporterError
-from .._qasm3 import CustomGate, STDGATES_INC_GATES
+from .._accelerate.qasm3 import CustomGate
+
+
+STDGATES_INC_GATES = (
+    CustomGate(library.PhaseGate, "p", 1, 1),
+    CustomGate(library.XGate, "x", 0, 1),
+    CustomGate(library.YGate, "y", 0, 1),
+    CustomGate(library.ZGate, "z", 0, 1),
+    CustomGate(library.HGate, "h", 0, 1),
+    CustomGate(library.SGate, "s", 0, 1),
+    CustomGate(library.SdgGate, "sdg", 0, 1),
+    CustomGate(library.TGate, "t", 0, 1),
+    CustomGate(library.TdgGate, "tdg", 0, 1),
+    CustomGate(library.SXGate, "sx", 0, 1),
+    CustomGate(library.RXGate, "rx", 1, 1),
+    CustomGate(library.RYGate, "ry", 1, 1),
+    CustomGate(library.RZGate, "rz", 1, 1),
+    CustomGate(library.CXGate, "cx", 0, 2),
+    CustomGate(library.CYGate, "cy", 0, 2),
+    CustomGate(library.CZGate, "cz", 0, 2),
+    CustomGate(library.CPhaseGate, "cp", 1, 2),
+    CustomGate(library.CRXGate, "crx", 1, 2),
+    CustomGate(library.CRYGate, "cry", 1, 2),
+    CustomGate(library.CRZGate, "crz", 1, 2),
+    CustomGate(library.CHGate, "ch", 0, 2),
+    CustomGate(library.SwapGate, "swap", 0, 2),
+    CustomGate(library.CCXGate, "ccx", 0, 3),
+    CustomGate(library.CSwapGate, "cswap", 0, 3),
+    CustomGate(library.CUGate, "cu", 4, 2),
+    CustomGate(library.CXGate, "CX", 0, 2),
+    CustomGate(library.PhaseGate, "phase", 1, 1),
+    CustomGate(library.CPhaseGate, "cphase", 1, 2),
+    CustomGate(library.IGate, "id", 0, 1),
+    CustomGate(library.U1Gate, "u1", 1, 1),
+    CustomGate(library.U2Gate, "u2", 2, 1),
+    CustomGate(library.U3Gate, "u3", 3, 1),
+)
 
 
 def dumps(circuit, **kwargs) -> str:

qiskit/qasm3/ast.py

@@ -123,6 +123,10 @@ class FloatType(ClassicalType, enum.Enum):
     OCT = 256
 
 
+class BoolType(ClassicalType):
+    """Type information for a Boolean."""
+
+
 class IntType(ClassicalType):
     """Type information for a signed integer."""
 
@@ -130,6 +134,13 @@ class IntType(ClassicalType):
         self.size = size
 
 
+class UintType(ClassicalType):
+    """Type information for an unsigned integer."""
+
+    def __init__(self, size: Optional[int] = None):
+        self.size = size
+
+
 class BitType(ClassicalType):
     """Type information for a single bit."""
 
@@ -241,6 +252,8 @@ class Binary(Expression):
         GREATER_EQUAL = ">="
         EQUAL = "=="
         NOT_EQUAL = "!="
+        SHIFT_LEFT = "<<"
+        SHIFT_RIGHT = ">>"
 
     def __init__(self, op: Op, left: Expression, right: Expression):
         self.op = op
@@ -254,6 +267,12 @@ class Cast(Expression):
         self.operand = operand
 
 
+class Index(Expression):
+    def __init__(self, target: Expression, index: Expression):
+        self.target = target
+        self.index = index
+
+
 class IndexSet(ASTNode):
     """
     A literal index set of values::