qiskit 1.3.0b1__cp39-abi3-win32.whl → 1.3.0rc2__cp39-abi3-win32.whl

qiskit/transpiler/target.py

@@ -57,6 +57,7 @@ from qiskit.exceptions import QiskitError
 from qiskit.providers.backend import QubitProperties  # pylint: disable=unused-import
 from qiskit.providers.models.backendproperties import BackendProperties
 from qiskit.utils import deprecate_func
+from qiskit.utils.deprecate_pulse import deprecate_pulse_dependency, deprecate_pulse_arg
 
 logger = logging.getLogger(__name__)
 
@@ -86,6 +87,7 @@ class InstructionProperties(BaseInstructionProperties):
             cls, duration, error
         )
 
+    @deprecate_pulse_arg("calibration", predicate=lambda cals: cals is not None)
     def __init__(
         self,
         duration: float | None = None,  # pylint: disable=unused-argument
@@ -99,13 +101,14 @@ class InstructionProperties(BaseInstructionProperties):
                 specified set of qubits
             error: The average error rate for the instruction on the specified
                 set of qubits.
-            calibration: The pulse representation of the instruction.
+            calibration: DEPRECATED. The pulse representation of the instruction.
         """
         super().__init__()
         self._calibration: CalibrationEntry | None = None
-        self.calibration = calibration
+        self._calibration_prop = calibration
 
     @property
+    @deprecate_pulse_dependency(is_property=True)
     def calibration(self):
         """The pulse representation of the instruction.
 
@@ -133,12 +136,24 @@ class InstructionProperties(BaseInstructionProperties):
             use own definition to compile the circuit down to the execution format.
 
         """
-        if self._calibration is None:
-            return None
-        return self._calibration.get_schedule()
+        return self._calibration_prop
 
     @calibration.setter
+    @deprecate_pulse_dependency(is_property=True)
     def calibration(self, calibration: Schedule | ScheduleBlock | CalibrationEntry):
+        self._calibration_prop = calibration
+
+    @property
+    def _calibration_prop(self):
+        if self._calibration is None:
+            return None
+        with warnings.catch_warnings():
+            warnings.simplefilter(action="ignore", category=DeprecationWarning)
+            # Clean this alternative path from deprecation warning emitted by `get_schedule`
+            return self._calibration.get_schedule()
+
+    @_calibration_prop.setter
+    def _calibration_prop(self, calibration: Schedule | ScheduleBlock | CalibrationEntry):
         if isinstance(calibration, (Schedule, ScheduleBlock)):
             new_entry = ScheduleDef()
             new_entry.define(calibration, user_provided=True)
@@ -153,11 +168,11 @@ class InstructionProperties(BaseInstructionProperties):
         )
 
     def __getstate__(self) -> tuple:
-        return (super().__getstate__(), self.calibration, self._calibration)
+        return (super().__getstate__(), self._calibration_prop, self._calibration)
 
     def __setstate__(self, state: tuple):
         super().__setstate__(state[0])
-        self.calibration = state[1]
+        self._calibration_prop = state[1]
         self._calibration = state[2]
 
 
@@ -447,6 +462,7 @@ class Target(BaseTarget):
         self._instruction_durations = None
         self._instruction_schedule_map = None
 
+    @deprecate_pulse_dependency
     def update_from_instruction_schedule_map(self, inst_map, inst_name_map=None, error_dict=None):
         """Update the target from an instruction schedule map.
 
@@ -604,6 +620,7 @@ class Target(BaseTarget):
             self.granularity, self.min_length, self.pulse_alignment, self.acquire_alignment
         )
 
+    @deprecate_pulse_dependency
     def instruction_schedule_map(self):
         """Return an :class:`~qiskit.pulse.InstructionScheduleMap` for the
         instructions in the target with a pulse schedule defined.
@@ -612,9 +629,17 @@ class Target(BaseTarget):
             InstructionScheduleMap: The instruction schedule map for the
             instructions in this target with a pulse schedule defined.
         """
+        return self._get_instruction_schedule_map()
+
+    def _get_instruction_schedule_map(self):
         if self._instruction_schedule_map is not None:
             return self._instruction_schedule_map
-        out_inst_schedule_map = InstructionScheduleMap()
+        with warnings.catch_warnings():
+            warnings.simplefilter(action="ignore", category=DeprecationWarning)
+            # `InstructionScheduleMap` is deprecated in Qiskit 1.3 but we want this alternative
+            # path to be clean of deprecation warnings
+            out_inst_schedule_map = InstructionScheduleMap()
+
         for instruction, qargs in self._gate_map.items():
             for qarg, properties in qargs.items():
                 # Directly getting CalibrationEntry not to invoke .get_schedule().
@@ -626,6 +651,7 @@ class Target(BaseTarget):
         self._instruction_schedule_map = out_inst_schedule_map
         return out_inst_schedule_map
 
+    @deprecate_pulse_dependency
     def has_calibration(
         self,
         operation_name: str,
@@ -640,6 +666,13 @@ class Target(BaseTarget):
         Returns:
             Returns ``True`` if the calibration is supported and ``False`` if it isn't.
         """
+        return self._has_calibration(operation_name, qargs)
+
+    def _has_calibration(
+        self,
+        operation_name: str,
+        qargs: tuple[int, ...],
+    ) -> bool:
         qargs = tuple(qargs)
         if operation_name not in self._gate_map:
             return False
@@ -647,6 +680,7 @@ class Target(BaseTarget):
             return False
         return getattr(self._gate_map[operation_name][qargs], "_calibration", None) is not None
 
+    @deprecate_pulse_dependency
     def get_calibration(
         self,
         operation_name: str,
@@ -668,7 +702,16 @@ class Target(BaseTarget):
         Returns:
             Calibrated pulse schedule of corresponding instruction.
         """
-        if not self.has_calibration(operation_name, qargs):
+        return self._get_calibration(operation_name, qargs, *args, *kwargs)
+
+    def _get_calibration(
+        self,
+        operation_name: str,
+        qargs: tuple[int, ...],
+        *args: ParameterValueType,
+        **kwargs: ParameterValueType,
+    ) -> Schedule | ScheduleBlock:
+        if not self._has_calibration(operation_name, qargs):
             raise KeyError(
                 f"Calibration of instruction {operation_name} for qubit {qargs} is not defined."
             )
@@ -927,6 +970,7 @@ class Target(BaseTarget):
         super().__setstate__(state["base"])
 
     @classmethod
+    @deprecate_pulse_arg("inst_map")
     def from_configuration(
         cls,
         basis_gates: list[str],
@@ -965,7 +1009,7 @@ class Target(BaseTarget):
             coupling_map: The coupling map representing connectivity constraints
                 on the backend. If specified all gates from ``basis_gates`` will
                 be supported on all qubits (or pairs of qubits).
-            inst_map: The instruction schedule map representing the pulse
+            inst_map: DEPRECATED. The instruction schedule map representing the pulse
                :class:`~.Schedule` definitions for each instruction. If this
                is specified ``coupling_map`` must be specified. The
                ``coupling_map`` is used as the source of truth for connectivity
@@ -1112,9 +1156,16 @@ class Target(BaseTarget):
                     if error is None and duration is None and calibration is None:
                         gate_properties[(qubit,)] = None
                     else:
-                        gate_properties[(qubit,)] = InstructionProperties(
-                            duration=duration, error=error, calibration=calibration
-                        )
+                        with warnings.catch_warnings():
+                            warnings.filterwarnings(
+                                "ignore",
+                                category=DeprecationWarning,
+                                message=".*``calibration`` is deprecated as of Qiskit 1.3.*",
+                                module="qiskit",
+                            )
+                            gate_properties[(qubit,)] = InstructionProperties(
+                                duration=duration, error=error, calibration=calibration
+                            )
                 target.add_instruction(name_mapping[gate], properties=gate_properties, name=gate)
             edges = list(coupling_map.get_edges())
             for gate in two_qubit_gates:
@@ -1154,9 +1205,16 @@ class Target(BaseTarget):
                     if error is None and duration is None and calibration is None:
                         gate_properties[edge] = None
                     else:
-                        gate_properties[edge] = InstructionProperties(
-                            duration=duration, error=error, calibration=calibration
-                        )
+                        with warnings.catch_warnings():
+                            warnings.filterwarnings(
+                                "ignore",
+                                category=DeprecationWarning,
+                                message=".*``calibration`` is deprecated as of Qiskit 1.3.*",
+                                module="qiskit",
+                            )
+                            gate_properties[edge] = InstructionProperties(
+                                duration=duration, error=error, calibration=calibration
+                            )
                 target.add_instruction(name_mapping[gate], properties=gate_properties, name=gate)
             for gate in global_ideal_variable_width_gates:
                 target.add_instruction(name_mapping[gate], name=gate)

qiskit/utils/deprecate_pulse.py

@@ -0,0 +1,119 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2024
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+"""
+Deprecation functions for Qiskit Pulse. To be removed in Qiskit 2.0.
+"""
+
+import warnings
+import functools
+
+from qiskit.utils.deprecation import deprecate_func, deprecate_arg
+
+
+def deprecate_pulse_func(func):
+    """Deprecation message for functions and classes"""
+    return deprecate_func(
+        since="1.3",
+        package_name="Qiskit",
+        removal_timeline="in Qiskit 2.0",
+        additional_msg="The entire Qiskit Pulse package is being deprecated "
+        "and will be moved to the Qiskit Dynamics repository: "
+        "https://github.com/qiskit-community/qiskit-dynamics",
+    )(func)
+
+
+def deprecate_pulse_dependency(*args, moving_to_dynamics: bool = False, **kwargs):
+    # pylint: disable=missing-param-doc
+    """Deprecation message for functions and classes which use or depend on Pulse
+
+    Args:
+        moving_to_dynamics: set to True if the dependency is moving to Qiskit Dynamics. This affects
+            the deprecation message being printed, namely saying explicitly whether the dependency will
+            be moved to Qiskit Dynamics or whether it will just be removed without an alternative.
+    """
+
+    def msg_handler(func):
+        fully_qual_name = format(f"{func.__module__}.{func.__qualname__}")
+        if ".__init__" in fully_qual_name:  # Deprecating a class' vis it __init__ method
+            fully_qual_name = fully_qual_name[:-9]
+        elif "is_property" not in kwargs:  # Deprecating either a function or a method
+            fully_qual_name += "()"
+
+        message = (
+            "The entire Qiskit Pulse package is being deprecated and will be moved to the Qiskit "
+            "Dynamics repository: https://github.com/qiskit-community/qiskit-dynamics."
+            + (
+                format(f" Note that ``{fully_qual_name}`` will be moved as well.")
+                if moving_to_dynamics
+                else format(
+                    f" Note that once removed, ``{fully_qual_name}`` will have no alternative in Qiskit."
+                )
+            )
+        )
+
+        decorator = deprecate_func(
+            since="1.3",
+            package_name="Qiskit",
+            removal_timeline="in Qiskit 2.0",
+            additional_msg=message,
+            **kwargs,
+        )(func)
+
+        # Taken when `deprecate_pulse_dependency` is used with no arguments and with empty parentheses,
+        # in which case the decorated function is passed
+
+        return decorator
+
+    if args:
+        return msg_handler(args[0])
+    return msg_handler
+
+
+def deprecate_pulse_arg(arg_name: str, **kwargs):
+    """Deprecation message for arguments related to Pulse"""
+    return deprecate_arg(
+        name=arg_name,
+        since="1.3",
+        package_name="Qiskit",
+        removal_timeline="in Qiskit 2.0",
+        additional_msg="The entire Qiskit Pulse package is being deprecated "
+        "and this argument uses a dependency on the package.",
+        **kwargs,
+    )
+
+
+def ignore_pulse_deprecation_warnings(func):
+    """Ignore deprecation warnings emitted from the pulse package"""
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        with warnings.catch_warnings():
+            warnings.filterwarnings(
+                "ignore", category=DeprecationWarning, message="The (.*) ``qiskit.pulse"
+            )
+            return func(*args, **kwargs)
+
+    return wrapper
+
+
+def decorate_test_methods(decorator):
+    """Put a given decorator on all the decorated class methods whose name starts with `test_`"""
+
+    def cls_wrapper(cls):
+        for attr in dir(cls):
+            if attr.startswith("test_") and callable(object.__getattribute__(cls, attr)):
+                setattr(cls, attr, decorator(object.__getattribute__(cls, attr)))
+
+        return cls
+
+    return cls_wrapper

qiskit/visualization/circuit/_utils.py

@@ -503,7 +503,7 @@ def _get_gate_span(qubits, node):
     # type of op must be the only op in the layer
     if isinstance(node.op, ControlFlowOp):
         span = qubits
-    elif node.cargs or getattr(node.op, "condition", None):
+    elif node.cargs or getattr(node, "condition", None):
         span = qubits[min_index : len(qubits)]
     else:
         span = qubits[min_index : max_index + 1]
@@ -582,7 +582,7 @@ class _LayerSpooler(list):
             curr_index = index
             last_insertable_index = -1
             index_stop = -1
-            if (condition := getattr(node.op, "condition", None)) is not None:
+            if (condition := getattr(node, "condition", None)) is not None:
                 index_stop = max(
                     (self.measure_map[bit] for bit in condition_resources(condition).clbits),
                     default=index_stop,

qiskit/visualization/circuit/circuit_visualization.py

@@ -191,11 +191,12 @@ def circuit_drawer(
         .. plot::
             :include-source:
 
-            from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit
+            from qiskit import QuantumCircuit
+            from qiskit.visualization import circuit_drawer
             qc = QuantumCircuit(1, 1)
             qc.h(0)
             qc.measure(0, 0)
-            qc.draw(output='mpl', style={'backgroundcolor': '#EEEEEE'})
+            circuit_drawer(qc, output="mpl", style={"backgroundcolor": "#EEEEEE"})
     """
     image = None
     expr_len = max(expr_len, 0)

qiskit/visualization/circuit/matplotlib.py

@@ -135,7 +135,7 @@ class MatplotlibDrawer:
 
         self._initial_state = initial_state
         self._global_phase = self._circuit.global_phase
-        self._calibrations = self._circuit.calibrations
+        self._calibrations = self._circuit._calibrations_prop
         self._expr_len = expr_len
         self._cregbundle = cregbundle
 

qiskit/visualization/dag_visualization.py

@@ -81,7 +81,7 @@ def dag_drawer(dag, scale=0.7, filename=None, style="color"):
     ``rustworkx`` package to draw the DAG.
 
     Args:
-        dag (DAGCircuit): The dag to draw.
+        dag (DAGCircuit or DAGDependency): The dag to draw.
         scale (float): scaling factor
         filename (str): file path to save image to (format inferred from name)
         style (str): 'plain': B&W graph

qiskit/visualization/pass_manager_visualization.py

@@ -58,23 +58,12 @@ def pass_manager_drawer(pass_manager, filename=None, style=None, raw=False):
     Example:
         .. code-block::
 
-             %matplotlib inline
             from qiskit import QuantumCircuit
-            from qiskit.compiler import transpile
-            from qiskit.transpiler import PassManager
+            from qiskit.transpiler import generate_preset_pass_manager
             from qiskit.visualization import pass_manager_drawer
-            from qiskit.transpiler.passes import Unroller
 
-            circ = QuantumCircuit(3)
-            circ.ccx(0, 1, 2)
-            circ.draw()
-
-            pass_ = Unroller(['u1', 'u2', 'u3', 'cx'])
-            pm = PassManager(pass_)
-            new_circ = pm.run(circ)
-            new_circ.draw(output='mpl')
-
-            pass_manager_drawer(pm, "passmanager.jpg")
+            pm = generate_preset_pass_manager(optimization_level=0)
+            pass_manager_drawer(pm)
     """
     import pydot
 

qiskit/visualization/pulse_v2/interface.py

@@ -28,9 +28,11 @@ from qiskit.visualization.exceptions import VisualizationError
 from qiskit.visualization.pulse_v2 import core, device_info, stylesheet, types
 from qiskit.exceptions import MissingOptionalLibraryError
 from qiskit.utils import deprecate_arg
+from qiskit.utils.deprecate_pulse import deprecate_pulse_dependency
 
 
-@deprecate_arg("show_barriers", new_alias="plot_barriers", since="1.1.0", pending=True)
+@deprecate_pulse_dependency(moving_to_dynamics=True)
+@deprecate_arg("show_barrier", new_alias="plot_barrier", since="1.1.0", pending=True)
 def draw(
     program: Union[Waveform, SymbolicPulse, Schedule, ScheduleBlock],
     style: Optional[Dict[str, Any]] = None,

qiskit/visualization/timeline/core.py

@@ -58,6 +58,7 @@ from enum import Enum
 import numpy as np
 
 from qiskit import circuit
+from qiskit.transpiler.target import Target
 from qiskit.visualization.exceptions import VisualizationError
 from qiskit.visualization.timeline import drawings, types
 from qiskit.visualization.timeline.stylesheet import QiskitTimelineStyle
@@ -138,11 +139,13 @@ class DrawerCanvas:
         self._collections[data.data_key] = data
 
     # pylint: disable=cyclic-import
-    def load_program(self, program: circuit.QuantumCircuit):
+    def load_program(self, program: circuit.QuantumCircuit, target: Target | None = None):
         """Load quantum circuit and create drawing..
 
         Args:
             program: Scheduled circuit object to draw.
+            target: The target the circuit is scheduled for. This contains backend information
+                including the instruction durations used in scheduling.
 
         Raises:
            VisualizationError: When circuit is not scheduled.
@@ -180,10 +183,30 @@ class DrawerCanvas:
             for bit_pos, bit in enumerate(bits):
                 if not isinstance(instruction.operation, not_gate_like):
                     # Generate draw object for gates
+                    if target is not None:
+                        duration = None
+                        op_props = target.get(instruction.operation.name)
+                        if op_props is not None:
+                            inst_props = op_props.get(tuple(instruction.qubits))
+                            if inst_props is not None:
+                                duration = inst_props.getattr("duration")
+
+                        if duration is None:
+                            # Warn here because an incomplete target isn't obvious most of the time
+                            warnings.warn(
+                                "Target doesn't contain a duration for "
+                                f"{instruction.operation.name} on {bit_pos}, this will error in "
+                                "Qiskit 2.0.",
+                                DeprecationWarning,
+                                stacklevel=3,
+                            )
+                            duration = instruction.operation.duration
+                    else:
+                        duration = instruction.operation.duration
                     gate_source = types.ScheduledGate(
                         t0=t0,
                         operand=instruction.operation,
-                        duration=instruction.operation.duration,
+                        duration=duration,
                         bits=bits,
                         bit_position=bit_pos,
                     )

qiskit/visualization/timeline/interface.py

@@ -20,8 +20,10 @@ the configured canvas is passed to one of the plotter APIs to generate a visuali
 """
 
 from typing import Optional, Dict, Any, List, Tuple
+import warnings
 
 from qiskit import circuit
+from qiskit.transpiler.target import Target
 from qiskit.exceptions import MissingOptionalLibraryError
 from qiskit.visualization.exceptions import VisualizationError
 from qiskit.visualization.timeline import types, core, stylesheet
@@ -43,6 +45,7 @@ def draw(
     plotter: Optional[str] = types.Plotter.MPL.value,
     axis: Optional[Any] = None,
     filename: Optional[str] = None,
+    target: Optional[Target] = None,
     *,
     show_idle: Optional[bool] = None,
     show_barriers: Optional[bool] = None,
@@ -81,6 +84,7 @@ def draw(
             the plotters uses given `axis` instead of internally initializing a figure object.
             This object format depends on the plotter. See plotters section for details.
         filename: If provided the output image is dumped into a file under the filename.
+        target: The target for the backend the timeline is being generated for.
         show_idle: DEPRECATED.
         show_barriers: DEPRECATED.
 
@@ -361,6 +365,14 @@ def draw(
     temp_style = stylesheet.QiskitTimelineStyle()
     temp_style.update(style or stylesheet.IQXStandard())
 
+    if target is None:
+        warnings.warn(
+            "Target is not specified. In Qiskit 2.0.0 this will be required to get the duration of "
+            "instructions.",
+            PendingDeprecationWarning,
+            stacklevel=2,
+        )
+
     # update control properties
     if idle_wires is not None:
         temp_style["formatter.control.show_idle"] = idle_wires

{qiskit-1.3.0b1.dist-info → qiskit-1.3.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qiskit
-Version: 1.3.0b1
+Version: 1.3.0rc2
 Summary: An open-source SDK for working with quantum computers at the level of extended quantum circuits, operators, and primitives.
 Author-email: Qiskit Development Team <qiskit@us.ibm.com>
 License: Apache 2.0
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
@@ -35,13 +36,7 @@ Requires-Dist: dill>=0.3
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: stevedore>=3.0.0
 Requires-Dist: typing-extensions
-Requires-Dist: symengine>=0.11
-Provides-Extra: all
-Requires-Dist: qiskit[crosstalk-pass,csp-layout-pass,qasm3-import,visualization]; extra == "all"
-Provides-Extra: crosstalk-pass
-Requires-Dist: z3-solver>=4.7; extra == "crosstalk-pass"
-Provides-Extra: csp-layout-pass
-Requires-Dist: python-constraint>=1.4; extra == "csp-layout-pass"
+Requires-Dist: symengine<0.14,>=0.11
 Provides-Extra: qasm3-import
 Requires-Dist: qiskit-qasm3-import>=0.1.0; extra == "qasm3-import"
 Provides-Extra: visualization
@@ -50,6 +45,12 @@ Requires-Dist: pydot; extra == "visualization"
 Requires-Dist: Pillow>=4.2.1; extra == "visualization"
 Requires-Dist: pylatexenc>=1.4; extra == "visualization"
 Requires-Dist: seaborn>=0.9.0; extra == "visualization"
+Provides-Extra: crosstalk-pass
+Requires-Dist: z3-solver>=4.7; extra == "crosstalk-pass"
+Provides-Extra: csp-layout-pass
+Requires-Dist: python-constraint>=1.4; extra == "csp-layout-pass"
+Provides-Extra: all
+Requires-Dist: qiskit[crosstalk-pass,csp-layout-pass,qasm3-import,visualization]; extra == "all"
 
 # Qiskit