[CustomDevice] Fix errors during event release (#58059)

ronny1996 · web-flow · commit 62430f3e33f6 · 2023-10-16T15:09:14.000+08:00
* [CustomDevice] Fix errors during event release

* fix custom_tracer
diff --git a/paddle/fluid/platform/profiler/custom_device/custom_tracer.cc b/paddle/fluid/platform/profiler/custom_device/custom_tracer.cc
@@ -28,6 +28,10 @@ namespace platform {
 
 CustomTracer::CustomTracer(const std::string& dev_type) : dev_type_(dev_type) {
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
+  auto selected_devices = phi::DeviceManager::GetSelectedDeviceList(dev_type_);
+  if (selected_devices.size()) {
+    phi::DeviceManager::SetDevice(dev_type_, selected_devices[0]);
+  }
   phi::DeviceManager::ProfilerInitialize(dev_type_, &collector_, &context_);
 #endif
 }
diff --git a/paddle/phi/backends/device_manager.cc b/paddle/phi/backends/device_manager.cc
@@ -697,8 +697,8 @@ DeviceManager& DeviceManager::Instance() {
 }
 
 void DeviceManager::Release() {
-  stream::Stream::ReleaseAll();
   event::Event::ReleaseAll();
+  stream::Stream::ReleaseAll();
   Instance().device_map_.clear();
   Instance().device_impl_map_.clear();
 }

Original file line number	Diff line number	Diff line change
`@@ -697,8 +697,8 @@ DeviceManager& DeviceManager::Instance() {`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`void DeviceManager::Release() {`
`700`		`- stream::Stream::ReleaseAll();`
`701`	`700`	`event::Event::ReleaseAll();`
	`701`	`+ stream::Stream::ReleaseAll();`
`702`	`702`	`Instance().device_map_.clear();`
`703`	`703`	`Instance().device_impl_map_.clear();`
`704`	`704`	`}`