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

qiskit/pulse/instructions/reference.py

@@ -17,6 +17,7 @@ from qiskit.circuit.parameterexpression import ParameterExpression
 from qiskit.pulse.channels import Channel
 from qiskit.pulse.exceptions import PulseError, UnassignedReferenceError
 from qiskit.pulse.instructions import instruction
+from qiskit.utils.deprecate_pulse import deprecate_pulse_func
 
 
 class Reference(instruction.Instruction):
@@ -40,6 +41,7 @@ class Reference(instruction.Instruction):
     # Delimiter for tuple keys.
     key_delimiter = ","
 
+    @deprecate_pulse_func
     def __init__(self, name: str, *extra_keys: str):
         """Create new reference.
 

qiskit/pulse/instructions/snapshot.py

@@ -18,11 +18,13 @@ from typing import Optional, Tuple
 from qiskit.pulse.channels import SnapshotChannel
 from qiskit.pulse.exceptions import PulseError
 from qiskit.pulse.instructions.instruction import Instruction
+from qiskit.utils.deprecate_pulse import deprecate_pulse_func
 
 
 class Snapshot(Instruction):
     """An instruction targeted for simulators, to capture a moment in the simulation."""
 
+    @deprecate_pulse_func
     def __init__(self, label: str, snapshot_type: str = "statevector", name: Optional[str] = None):
         """Create new snapshot.
 

qiskit/pulse/library/pulse.py

@@ -18,6 +18,7 @@ from __future__ import annotations
 import typing
 from abc import ABC, abstractmethod
 from typing import Any
+from qiskit.utils.deprecate_pulse import deprecate_pulse_func
 
 from qiskit.circuit.parameterexpression import ParameterExpression
 
@@ -36,6 +37,7 @@ class Pulse(ABC):
     limit_amplitude = True
 
     @abstractmethod
+    @deprecate_pulse_func
     def __init__(
         self,
         duration: int | ParameterExpression,

qiskit/pulse/library/symbolic_pulses.py

@@ -31,6 +31,7 @@ from qiskit.circuit.parameterexpression import ParameterExpression, ParameterVal
 from qiskit.pulse.exceptions import PulseError
 from qiskit.pulse.library.pulse import Pulse
 from qiskit.pulse.library.waveform import Waveform
+from qiskit.utils.deprecate_pulse import deprecate_pulse_func
 
 
 def _lifted_gaussian(
@@ -403,6 +404,7 @@ class SymbolicPulse(Pulse):
     _constraints_lam = LambdifiedExpression("_constraints")
     _valid_amp_conditions_lam = LambdifiedExpression("_valid_amp_conditions")
 
+    @deprecate_pulse_func
     def __init__(
         self,
         pulse_type: str,
@@ -780,6 +782,10 @@ class Gaussian(metaclass=_PulseType):
             valid_amp_conditions=valid_amp_conditions_expr,
         )
 
+    @deprecate_pulse_func
+    def __init__(self):
+        pass
+
 
 class GaussianSquare(metaclass=_PulseType):
     """A square pulse with a Gaussian shaped risefall on both sides lifted such that
@@ -908,7 +914,12 @@ class GaussianSquare(metaclass=_PulseType):
             valid_amp_conditions=valid_amp_conditions_expr,
         )
 
+    @deprecate_pulse_func
+    def __init__(self):
+        pass
+
 
+@deprecate_pulse_func
 def GaussianSquareDrag(
     duration: int | ParameterExpression,
     amp: float | ParameterExpression,
@@ -1061,6 +1072,7 @@ def GaussianSquareDrag(
     )
 
 
+@deprecate_pulse_func
 def gaussian_square_echo(
     duration: int | ParameterValueType,
     amp: float | ParameterExpression,
@@ -1264,6 +1276,7 @@ def gaussian_square_echo(
     )
 
 
+@deprecate_pulse_func
 def GaussianDeriv(
     duration: int | ParameterValueType,
     amp: float | ParameterExpression,
@@ -1424,6 +1437,10 @@ class Drag(metaclass=_PulseType):
             valid_amp_conditions=valid_amp_conditions_expr,
         )
 
+    @deprecate_pulse_func
+    def __init__(self):
+        pass
+
 
 class Constant(metaclass=_PulseType):
     """A simple constant pulse, with an amplitude value and a duration:
@@ -1485,7 +1502,12 @@ class Constant(metaclass=_PulseType):
             valid_amp_conditions=valid_amp_conditions_expr,
         )
 
+    @deprecate_pulse_func
+    def __init__(self):
+        pass
+
 
+@deprecate_pulse_func
 def Sin(
     duration: int | ParameterExpression,
     amp: float | ParameterExpression,
@@ -1550,6 +1572,7 @@ def Sin(
     )
 
 
+@deprecate_pulse_func
 def Cos(
     duration: int | ParameterExpression,
     amp: float | ParameterExpression,
@@ -1614,6 +1637,7 @@ def Cos(
     )
 
 
+@deprecate_pulse_func
 def Sawtooth(
     duration: int | ParameterExpression,
     amp: float | ParameterExpression,
@@ -1682,6 +1706,7 @@ def Sawtooth(
     )
 
 
+@deprecate_pulse_func
 def Triangle(
     duration: int | ParameterExpression,
     amp: float | ParameterExpression,
@@ -1750,6 +1775,7 @@ def Triangle(
     )
 
 
+@deprecate_pulse_func
 def Square(
     duration: int | ParameterValueType,
     amp: float | ParameterExpression,
@@ -1821,6 +1847,7 @@ def Square(
     )
 
 
+@deprecate_pulse_func
 def Sech(
     duration: int | ParameterValueType,
     amp: float | ParameterExpression,
@@ -1897,6 +1924,7 @@ def Sech(
     )
 
 
+@deprecate_pulse_func
 def SechDeriv(
     duration: int | ParameterValueType,
     amp: float | ParameterExpression,

qiskit/pulse/library/waveform.py

@@ -18,6 +18,7 @@ import numpy as np
 
 from qiskit.pulse.exceptions import PulseError
 from qiskit.pulse.library.pulse import Pulse
+from qiskit.utils.deprecate_pulse import deprecate_pulse_func
 
 
 class Waveform(Pulse):
@@ -25,6 +26,7 @@ class Waveform(Pulse):
     duration of the backend cycle-time, dt.
     """
 
+    @deprecate_pulse_func
     def __init__(
         self,
         samples: np.ndarray | list[complex],

qiskit/pulse/macros.py

@@ -194,7 +194,7 @@ def _measure_v2(
     for measure_qubit in meas_group:
         try:
             if measure_qubit in qubits:
-                default_sched = target.get_calibration(measure_name, (measure_qubit,)).filter(
+                default_sched = target._get_calibration(measure_name, (measure_qubit,)).filter(
                     channels=[
                         channels.MeasureChannel(measure_qubit),
                         channels.AcquireChannel(measure_qubit),

qiskit/pulse/schedule.py

@@ -54,6 +54,7 @@ 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
+from qiskit.utils.deprecate_pulse import deprecate_pulse_func
 
 
 Interval = Tuple[int, int]
@@ -81,6 +82,7 @@ class Schedule:
 
       .. code-block:: python
 
+          from qiskit.pulse import Schedule, Gaussian, DriveChannel, Play
           sched = Schedule()
           sched += Play(Gaussian(160, 0.1, 40), DriveChannel(0))
 
@@ -120,6 +122,7 @@ class Schedule:
     # Counter to count instance number.
     instances_counter = itertools.count()
 
+    @deprecate_pulse_func
     def __init__(
         self,
         *schedules: "ScheduleComponent" | tuple[int, "ScheduleComponent"],
@@ -653,8 +656,6 @@ class Schedule:
 
             sched += pulse.Schedule(old)
 
-            sched = sched.flatten()
-
             sched = sched.replace(old, new)
 
             assert sched == pulse.Schedule(new)
@@ -899,14 +900,11 @@ class ScheduleBlock:
                 pulse.reference("grand_child")
                 pulse.play(pulse.Constant(200, amp2), pulse.DriveChannel(0))
 
-    Now you assign the inner pulse program to this reference.
-
-    .. code-block::
-
-        sched_outer.assign_references({("grand_child", ): sched_inner})
+        # Now assign the inner pulse program to this reference
+        sched_outer.assign_references({("grand_child",): sched_inner})
         print(sched_outer.parameters)
 
-    .. parsed-literal::
+    .. code-block:: text
 
        {Parameter(amp1), Parameter(amp2)}
 
@@ -920,7 +918,7 @@ class ScheduleBlock:
 
         print(sched_outer.references)
 
-    .. parsed-literal::
+    .. code-block:: text
 
        ReferenceManager:
          - ('grand_child',): ScheduleBlock(Play(Constant(duration=100, amp=amp1,...
@@ -939,7 +937,7 @@ class ScheduleBlock:
 
         print(main.parameters)
 
-    .. parsed-literal::
+    .. code-block:: text
 
        {Parameter(amp1), Parameter(amp2), Parameter(amp3}
 
@@ -952,7 +950,7 @@ class ScheduleBlock:
 
         print(main.references)
 
-    .. parsed-literal::
+    .. code-block:: text
 
        ReferenceManager:
          - ('child',): ScheduleBlock(ScheduleBlock(ScheduleBlock(Play(Con...
@@ -986,6 +984,7 @@ class ScheduleBlock:
     # Counter to count instance number.
     instances_counter = itertools.count()
 
+    @deprecate_pulse_func
     def __init__(
         self, name: str | None = None, metadata: dict | None = None, alignment_context=None
     ):
@@ -1459,7 +1458,7 @@ class ScheduleBlock:
 
             from qiskit import pulse
 
-            with pulse.build() as subroutine:
+            with pulse.build() as nested_prog:
                 pulse.delay(10, pulse.DriveChannel(0))
 
             with pulse.build() as sub_prog:
@@ -1490,7 +1489,7 @@ class ScheduleBlock:
         .. code-block:: python
 
             main_prog.assign_references({("B", ): sub_prog}, inplace=True)
-            main_prog.references[("B", )].assign_references({"A": nested_prog}, inplace=True)
+            main_prog.references[("B", )].assign_references({("A", ): nested_prog}, inplace=True)
 
         Here :attr:`.references` returns a dict-like object, and you can
         mutably update the nested reference of the particular subroutine.

qiskit/pulse/transforms/alignments.py

@@ -53,7 +53,7 @@ class AlignmentKind(abc.ABC):
         When the context has two pulses in different channels,
         a sequential context subtype intends to return following scheduling outcome.
 
-        .. parsed-literal::
+        .. code-block:: text
 
                 ┌────────┐
             D0: ┤ pulse1 ├────────────
@@ -63,7 +63,7 @@ class AlignmentKind(abc.ABC):
 
         On the other hand, parallel context with ``is_sequential=False`` returns
 
-        .. parsed-literal::
+        .. code-block:: text
 
                 ┌────────┐
             D0: ┤ pulse1 ├
@@ -338,8 +338,10 @@ class AlignFunc(AlignmentKind):
 
     .. code-block:: python
 
+        import numpy as np
+
         def udd10_pos(j):
-        return np.sin(np.pi*j/(2*10 + 2))**2
+            return np.sin(np.pi*j/(2*10 + 2))**2
 
     .. note::
 

qiskit/pulse/transforms/dag.py

@@ -32,6 +32,11 @@ def block_to_dag(block: ScheduleBlock) -> rx.PyDAG:
 
     .. code-block:: python
 
+        from qiskit import pulse
+
+        my_gaussian0 = pulse.Gaussian(100, 0.5, 20)
+        my_gaussian1 = pulse.Gaussian(100, 0.3, 10)
+
         with pulse.build() as sched1:
             with pulse.align_left():
                 pulse.play(my_gaussian0, pulse.DriveChannel(0))
@@ -51,6 +56,8 @@ def block_to_dag(block: ScheduleBlock) -> rx.PyDAG:
 
     .. code-block:: python
 
+        from qiskit import pulse
+
         with pulse.build() as sched:
             with pulse.align_left():
                 pulse.shift_phase(1.57, pulse.DriveChannel(1))

qiskit/qasm2/export.py

@@ -246,12 +246,14 @@ def _instruction_call_site(operation):
     if operation.params:
         params = ",".join([pi_check(i, output="qasm", eps=1e-12) for i in operation.params])
         qasm2_call = f"{qasm2_call}({params})"
-    if operation.condition is not None:
-        if not isinstance(operation.condition[0], ClassicalRegister):
+    if operation._condition is not None:
+        if not isinstance(operation._condition[0], ClassicalRegister):
             raise QASM2ExportError(
                 "OpenQASM 2 can only condition on registers, but got '{operation.condition[0]}'"
             )
-        qasm2_call = f"if({operation.condition[0].name}=={operation.condition[1]:d}) " + qasm2_call
+        qasm2_call = (
+            f"if({operation._condition[0].name}=={operation._condition[1]:d}) " + qasm2_call
+        )
     return qasm2_call
 
 

qiskit/qasm2/parse.py

@@ -11,7 +11,7 @@
 # that they have been altered from the originals.
 
 """Python-space bytecode interpreter for the output of the main Rust parser logic."""
-
+import warnings
 import dataclasses
 import math
 from typing import Iterable, Callable
@@ -89,6 +89,35 @@ class CustomInstruction:
     There is a final ``builtin`` field.  This is optional, and if set true will cause the
     instruction to be defined and available within the parsing, even if there is no definition in
     any included OpenQASM 2 file.
+
+    Examples:
+
+        Instruct the importer to use Qiskit's :class:`.ECRGate` and :class:`.RZXGate` objects to
+        interpret ``gate`` statements that are known to have been created from those same objects
+        during OpenQASM 2 export::
+
+            from qiskit import qasm2
+            from qiskit.circuit import QuantumCircuit, library
+
+            qc = QuantumCircuit(2)
+            qc.ecr(0, 1)
+            qc.rzx(0.3, 0, 1)
+            qc.rzx(0.7, 1, 0)
+            qc.rzx(1.5, 0, 1)
+            qc.ecr(1, 0)
+
+            # This output string includes `gate ecr q0, q1 { ... }` and `gate rzx(p) q0, q1 { ... }`
+            # statements, since `ecr` and `rzx` are neither built-in gates nor in ``qelib1.inc``.
+            dumped = qasm2.dumps(qc)
+
+            # Tell the importer how to interpret the `gate` statements, which we know are safe
+            # because we controlled the input OpenQASM 2 source.
+            custom = [
+                qasm2.CustomInstruction("ecr", 0, 2, library.ECRGate),
+                qasm2.CustomInstruction("rzx", 1, 2, library.RZXGate),
+            ]
+
+            loaded = qasm2.loads(dumped, custom_instructions=custom)
     """
 
     name: str
@@ -226,6 +255,11 @@ def from_bytecode(bytecode, custom_instructions: Iterable[CustomInstruction]):
                 CircuitInstruction(gates[gate_id](*parameters), [qubits[q] for q in op_qubits])
             )
         elif opcode == OpCode.ConditionedGate:
+            warnings.warn(
+                "Conditioned gates in qasm2 will be loaded as an IfElseOp starting in Qiskit 2.0",
+                FutureWarning,
+                stacklevel=3,
+            )
             gate_id, parameters, op_qubits, creg, value = op.operands
             gate = gates[gate_id](*parameters).c_if(qc.cregs[creg], value)
             qc._append(CircuitInstruction(gate, [qubits[q] for q in op_qubits]))
@@ -233,12 +267,22 @@ def from_bytecode(bytecode, custom_instructions: Iterable[CustomInstruction]):
             qubit, clbit = op.operands
             qc._append(CircuitInstruction(Measure(), (qubits[qubit],), (clbits[clbit],)))
         elif opcode == OpCode.ConditionedMeasure:
+            warnings.warn(
+                "Conditioned measurements in qasm2 will be loaded as an IfElseOp starting in Qiskit 2.0",
+                FutureWarning,
+                stacklevel=3,
+            )
             qubit, clbit, creg, value = op.operands
             measure = Measure().c_if(qc.cregs[creg], value)
             qc._append(CircuitInstruction(measure, (qubits[qubit],), (clbits[clbit],)))
         elif opcode == OpCode.Reset:
             qc._append(CircuitInstruction(Reset(), (qubits[op.operands[0]],)))
         elif opcode == OpCode.ConditionedReset:
+            warnings.warn(
+                "Conditioned resets in qasm2 will be loaded as an IfElseOp starting in Qiskit 2.0",
+                FutureWarning,
+                stacklevel=3,
+            )
             qubit, creg, value = op.operands
             reset = Reset().c_if(qc.cregs[creg], value)
             qc._append(CircuitInstruction(reset, (qubits[qubit],)))
@@ -327,7 +371,7 @@ class _DefinedGate(Gate):
     # to pickle ourselves, we just eagerly create the definition and pickle that.
 
     def __getstate__(self):
-        return (self.name, self.num_qubits, self.params, self.definition, self.condition)
+        return (self.name, self.num_qubits, self.params, self.definition, self._condition)
 
     def __setstate__(self, state):
         name, num_qubits, params, definition, condition = state

qiskit/qasm3/__init__.py

@@ -209,6 +209,7 @@ custom Python constructors to use for particular gates.  These custom constructo
 using the :class:`CustomGate` object:
 
 .. autoclass:: CustomGate
+    :members:
 
 In ``custom_gates`` is not given, Qiskit will attempt to use its standard-library gate objects for
 the gates defined in OpenQASM 3 standard library file ``stdgates.inc``.  This sequence of gates is