Command/Inst refactor: tidy up and complete deprecations

qiskit/assembler/assemble_schedules.py

@@ -17,9 +17,10 @@
 from typing import Any, Dict, List, Tuple
 
 from qiskit.exceptions import QiskitError
-from qiskit.pulse import Schedule, Delay, Acquire
+from qiskit.pulse import Schedule, Acquire, Delay, Play
+from qiskit.pulse.pulse_lib import ParametricPulse, SamplePulse
 from qiskit.pulse.commands import (Command, PulseInstruction, AcquireInstruction,
-                                   DelayInstruction, SamplePulse, ParametricInstruction)
+                                   DelayInstruction, ParametricInstruction)
 from qiskit.qobj import (PulseQobj, QobjHeader, QobjExperimentHeader,
                          PulseQobjInstruction, PulseQobjExperimentConfig,
                          PulseQobjExperiment, PulseQobjConfig, PulseLibraryItem)
@@ -170,15 +171,31 @@ def _assemble_instructions(
     acquire_instruction_map = defaultdict(list)
     for time, instruction in schedule.instructions:
 
-        if isinstance(instruction, ParametricInstruction):
+        if isinstance(instruction, Play) and isinstance(instruction.pulse, ParametricPulse):
+            pulse_shape = ParametricPulseShapes(type(instruction.pulse)).name
+            if pulse_shape not in run_config.parametric_pulses:
+                instruction = Play(instruction.pulse.get_sample_pulse(),
+                                   instruction.channel,
+                                   name=instruction.name)
+
+        if isinstance(instruction, ParametricInstruction):  # deprecated
             pulse_shape = ParametricPulseShapes(type(instruction.command)).name
             if pulse_shape not in run_config.parametric_pulses:
                 # Convert to SamplePulse if the backend does not support it
                 instruction = PulseInstruction(instruction.command.get_sample_pulse(),
                                                instruction.channels[0],
                                                name=instruction.name)
 
-        if isinstance(instruction, PulseInstruction):
+        if isinstance(instruction, Play) and isinstance(instruction.pulse, SamplePulse):
+            name = instruction.pulse.name
+            if instruction.pulse != user_pulselib.get(name):
+                name = "{0}-{1:x}".format(name, hash(instruction.pulse.samples.tostring()))
+                instruction = Play(SamplePulse(name=name, samples=instruction.pulse.samples),
+                                   channel=instruction.channel,
+                                   name=instruction.name)
+            user_pulselib[name] = instruction.pulse
+
+        if isinstance(instruction, PulseInstruction):  # deprecated
             name = instruction.command.name
             if name in user_pulselib and instruction.command != user_pulselib[name]:
                 name = "{0}-{1:x}".format(name, hash(instruction.command.samples.tostring()))

qiskit/compiler/transpile.py

@@ -159,6 +159,9 @@ def callback_func(**kwargs):
             (isinstance(circuits, list) and all(isinstance(c, Schedule) for c in circuits)):
         return circuits
 
+    if pass_manager:
+        return pass_manager.run(circuits, output_name=output_name, callback=callback)
+
     if optimization_level is None:
         config = user_config.get_config()
         optimization_level = config.get('transpile_optimization_level', None)
@@ -188,6 +191,7 @@ def callback_func(**kwargs):
                                   'in {} '.format(circuit.name) +
                                   'is greater than maximum ({}) '.format(max_qubits) +
                                   'in the coupling_map')
+
     # Transpile circuits in parallel
     circuits = parallel_map(_transpile_circuit, list(zip(circuits, transpile_args)))
 

qiskit/pulse/__init__.py

@@ -26,30 +26,40 @@
 instructions. Pulse answers that need: it enables the quantum physicist *user* to specify the
 exact time dynamics of an experiment. It is especially powerful for error mitigation techniques.
 
-The input is given as arbitrary, time-ordered signals (see: :ref:`pulse-commands`) scheduled in
+The input is given as arbitrary, time-ordered signals (see: :ref:`pulse-insts`) scheduled in
 parallel over multiple virtual hardware or simulator resources (see: :ref:`pulse-channels`). The
 system also allows the user to recover the time dynamics of the measured output.
 
 This is sufficient to allow the quantum physicist to explore and correct for noise in a quantum
 system.
 
-.. _pulse-commands:
+.. _pulse-insts:
 
-Commands (:mod:`~qiskit.pulse.commands`)
-========================================
+Instructions (:mod:`~qiskit.pulse.instructions`)
+================================================
 
 .. autosummary::
    :toctree: ../stubs/
 
-   SamplePulse
    Delay
-   FrameChange
+   ShiftPhase
+   SetFrequency
+   Acquire
+   Snapshot
+
+Pulse Library (waveforms :mod:`~qiskit.pulse.pulse_lib`)
+========================================================
+
+TODO: waiting on Pulses PR to merge
+.. autosummary::
+   :toctree: ../stubs/
+
+   ~qiskit.pulse.pulse_lib.discrete
+   SamplePulse
    Gaussian
    GaussianSquare
    Drag
    ConstantPulse
-   Acquire
-   Snapshot
 
 .. _pulse-channels:
 
@@ -89,7 +99,7 @@
 .. autosummary::
    :toctree: ../stubs/
 
-   qiskit.pulse.commands
+   qiskit.pulse.instructions
    qiskit.pulse.channels
 
 Configuration
@@ -112,14 +122,6 @@
    ~reschedule.add_implicit_acquires
    ~reschedule.pad
 
-Pulse Library
-=============
-
-.. autosummary::
-   :toctree: ../stubs/
-
-   ~qiskit.pulse.pulse_lib.discrete
-
 Exceptions
 ==========
 
@@ -132,13 +134,12 @@
 
 from .channels import (DriveChannel, MeasureChannel, AcquireChannel,
                        ControlChannel, RegisterSlot, MemorySlot)
-from .commands import (AcquireInstruction, FrameChange,
-                       PersistentValue, SamplePulse, ParametricPulse,
-                       ParametricInstruction, Gaussian,
-                       GaussianSquare, Drag, ConstantPulse, functional_pulse)
+from .commands import AcquireInstruction, FrameChange, PersistentValue
 from .configuration import LoConfig, LoRange, Kernel, Discriminator
 from .exceptions import PulseError
 from .instruction_schedule_map import InstructionScheduleMap
-from .instructions import Acquire, Instruction, Delay, ShiftPhase, Snapshot, SetFrequency
+from .instructions import Acquire, Instruction, Delay, Play, ShiftPhase, Snapshot, SetFrequency
 from .interfaces import ScheduleComponent
+from .pulse_lib import SamplePulse, Gaussian, GaussianSquare, Drag, ConstantPulse, ParametricPulse
+from .pulse_lib.samplers.decorators import functional_pulse
 from .schedule import Schedule

qiskit/pulse/commands/__init__.py

@@ -14,31 +14,7 @@
 
 # pylint: disable=cyclic-import
 
-"""
-Supported command types in Pulse.
-
-.. autosummary::
-   :toctree: ../stubs/
-
-   Acquire
-   FrameChange
-   SamplePulse
-   Snapshot
-   Delay
-   Gaussian
-   GaussianSquare
-   Drag
-   ConstantPulse
-
-Abstract Classes
-----------------
-.. autosummary::
-   :toctree: ../stubs/
-
-   ParametricPulse
-   Command
-
- """
+"""Supported command types in Pulse."""
 from .acquire import Acquire, AcquireInstruction
 from .frame_change import FrameChange, FrameChangeInstruction
 from .meas_opts import Discriminator, Kernel

qiskit/pulse/commands/delay.py

@@ -15,14 +15,15 @@
 """Delay instruction. Deprecated path."""
 import warnings
 
+from ..channels import Channel
 from ..instructions import Delay
 from ..instructions import Instruction
 
 
 class DelayInstruction(Instruction):
     """Deprecated."""
 
-    def __init__(self, command: Delay, channel: Delay, name: str = None):
+    def __init__(self, command: Delay, channel: Channel, name: str = None):
         """Create a delay instruction from a delay command.
 
         Args: