Command/Inst refactor: Pulses and Play

qiskit/assembler/assemble_schedules.py

@@ -17,7 +17,8 @@
 from typing import Any, Dict, List, Tuple
 
 from qiskit.exceptions import QiskitError
-from qiskit.pulse import Schedule, Delay
+from qiskit.pulse import Schedule, Delay, Play
+from qiskit.pulse.pulse_lib import ParametricPulse
 from qiskit.pulse.commands import (Command, PulseInstruction, Acquire, AcquireInstruction,
                                    DelayInstruction, SamplePulse, ParametricInstruction)
 from qiskit.qobj import (PulseQobj, QobjHeader, QobjExperimentHeader,
@@ -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/pulse/__init__.py

@@ -133,15 +133,12 @@
 from .channels import (DriveChannel, MeasureChannel, AcquireChannel,
                        ControlChannel, RegisterSlot, MemorySlot)
 from .cmd_def import CmdDef
-from .commands import (Acquire, AcquireInstruction, FrameChange,
-                       PersistentValue, SamplePulse, Kernel,
-                       Discriminator, ParametricPulse,
-                       ParametricInstruction, Gaussian,
-                       GaussianSquare, Drag, ConstantPulse, functional_pulse)
+from .commands import (Acquire, AcquireInstruction, FrameChange, PersistentValue, Kernel,
+                       Discriminator, functional_pulse)
 from .configuration import LoConfig, LoRange
 from .exceptions import PulseError
 from .instruction_schedule_map import InstructionScheduleMap
-
-from .instructions import Instruction, Delay, ShiftPhase, Snapshot, SetFrequency
+from .instructions import Instruction, Delay, Play, ShiftPhase, Snapshot, SetFrequency
 from .interfaces import ScheduleComponent
+from .pulse_lib import SamplePulse, Gaussian, GaussianSquare, Drag, ConstantPulse, ParametricPulse
 from .schedule import Schedule

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: