Fix pulse transforms recursion bug fix that was lost in merge conflict (

#4974) * Fix bug fix that was lost in merge conflict. * Added bug fix reno. * Revert style.
Qiskit · Aug 25, 2020 · 04f2079 · 04f2079
1 parent 43c6490
commit 04f2079
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/qiskit/pulse/transforms.py b/qiskit/pulse/transforms.py
@@ -215,15 +215,15 @@ def add_implicit_acquires(schedule: interfaces.ScheduleComponent,
                                                      chans.AcquireChannel(i),
                                                      mem_slot=chans.MemorySlot(i),
                                                      kernel=inst.kernel,
-                                                     discriminator=inst.discriminator) << time
+                                                     discriminator=inst.discriminator)
                 if time not in acquire_map:
-                    new_schedule |= explicit_inst
+                    new_schedule.insert(time, explicit_inst, inplace=True)
                     acquire_map = {time: {i}}
                 elif i not in acquire_map[time]:
-                    new_schedule |= explicit_inst
+                    new_schedule.insert(time, explicit_inst, inplace=True)
                     acquire_map[time].add(i)
         else:
-            new_schedule |= inst << time
+            new_schedule.insert(time, inst, inplace=True)
 
     return new_schedule
 
@@ -300,13 +300,16 @@ def compress_pulses(schedules: List[Schedule]) -> List[Schedule]:
                 if inst.pulse in existing_pulses:
                     idx = existing_pulses.index(inst.pulse)
                     identical_pulse = existing_pulses[idx]
-                    new_schedule |= instructions.Play(
-                        identical_pulse, inst.channel, inst.name) << time
+                    new_schedule.insert(time,
+                                        instructions.Play(identical_pulse,
+                                                          inst.channel,
+                                                          inst.name),
+                                        inplace=True)
                 else:
                     existing_pulses.append(inst.pulse)
-                    new_schedule |= inst << time
+                    new_schedule.insert(time, inst, inplace=True)
             else:
-                new_schedule |= inst << time
+                new_schedule.insert(time, inst, inplace=True)
 
         new_schedules.append(new_schedule)
 

diff --git a/releasenotes/notes/pulse-schedule-recursion-bugfix-1bf1b7d919cf1a0c.yaml b/releasenotes/notes/pulse-schedule-recursion-bugfix-1bf1b7d919cf1a0c.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    A bug was fixed that caused long pulse schedules to throw a recursion error.