[CustomDevice] Fix error that query a destroyed event (#56745)

ronny1996 · web-flow · commit c5786be10719 · 2023-08-30T13:02:49.000+08:00
diff --git a/paddle/fluid/memory/allocation/stream_safe_custom_device_allocator.cc b/paddle/fluid/memory/allocation/stream_safe_custom_device_allocator.cc
@@ -88,8 +88,7 @@ bool StreamSafeCustomDeviceAllocation::CanBeFreed() {
   }
   std::call_once(once_flag_, [this] { phi::DeviceManager::SetDevice(place_); });
   for (auto it = outstanding_event_map_.begin();
-       it != outstanding_event_map_.end();
-       ++it) {
+       it != outstanding_event_map_.end();) {
     auto& event = it->second;
     if (!event->Query()) {
       VLOG(9) << "Event " << event->raw_event() << " for " << ptr()
@@ -98,6 +97,7 @@ bool StreamSafeCustomDeviceAllocation::CanBeFreed() {
     }
     VLOG(8) << "Destroy event " << event->raw_event();
     event->Destroy();
+    it = outstanding_event_map_.erase(it);
   }
   outstanding_event_map_.clear();
   return true;

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,7 @@ bool StreamSafeCustomDeviceAllocation::CanBeFreed() {`
`88`	`88`	`}`
`89`	`89`	`std::call_once(once_flag_, [this] { phi::DeviceManager::SetDevice(place_); });`
`90`	`90`	`for (auto it = outstanding_event_map_.begin();`
`91`		`- it != outstanding_event_map_.end();`
`92`		`- ++it) {`
	`91`	`+ it != outstanding_event_map_.end();) {`
`93`	`92`	`auto& event = it->second;`
`94`	`93`	`if (!event->Query()) {`
`95`	`94`	`VLOG(9) << "Event " << event->raw_event() << " for " << ptr()`
`@@ -98,6 +97,7 @@ bool StreamSafeCustomDeviceAllocation::CanBeFreed() {`
`98`	`97`	`}`
`99`	`98`	`VLOG(8) << "Destroy event " << event->raw_event();`
`100`	`99`	`event->Destroy();`
	`100`	`+ it = outstanding_event_map_.erase(it);`
`101`	`101`	`}`
`102`	`102`	`outstanding_event_map_.clear();`
`103`	`103`	`return true;`