Fix ~CustomContext failure (#72758)

YqGe585 · root · web-flow · commit 6da37679a500 · 2025-05-18T15:38:49.000+08:00
Fix ~CustomContext failure

Co-authored-by: root &lt;root@gzxj-inf-sci-k8s-910b-h12si7-0034.gzxj.baidu.com&gt;
diff --git a/paddle/phi/backends/custom/custom_context.cc b/paddle/phi/backends/custom/custom_context.cc
@@ -28,12 +28,11 @@ struct CustomContext::Impl {
   explicit Impl(const CustomPlace& place) : place_(place) {}
 
   ~Impl() {
-    phi::DeviceGuard guard(place_);
-    if (owned_) {
+    if (owned_ && eigen_device_) {
       DeviceManager::DestroyEigenDevice(place_, eigen_device_);
     }
     if (stream_owned_ && stream_) {
-      stream_->Destroy();
+      stream_ = nullptr;
     }
   }
 
@@ -86,7 +85,6 @@ struct CustomContext::Impl {
   std::shared_ptr<phi::stream::Stream> GetStream() const { return stream_; }
 
   void SetStream(std::shared_ptr<phi::stream::Stream> stream) {
-    stream_owned_ = true;
     stream_ = stream;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,11 @@ struct CustomContext::Impl {`
`28`	`28`	`explicit Impl(const CustomPlace& place) : place_(place) {}`
`29`	`29`
`30`	`30`	`~Impl() {`
`31`		`- phi::DeviceGuard guard(place_);`
`32`		`- if (owned_) {`
	`31`	`+ if (owned_ && eigen_device_) {`
`33`	`32`	`DeviceManager::DestroyEigenDevice(place_, eigen_device_);`
`34`	`33`	`}`
`35`	`34`	`if (stream_owned_ && stream_) {`
`36`		`- stream_->Destroy();`
	`35`	`+ stream_ = nullptr;`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`
`@@ -86,7 +85,6 @@ struct CustomContext::Impl {`
`86`	`85`	`std::shared_ptr<phi::stream::Stream> GetStream() const { return stream_; }`
`87`	`86`
`88`	`87`	`void SetStream(std::shared_ptr<phi::stream::Stream> stream) {`
`89`		`- stream_owned_ = true;`
`90`	`88`	`stream_ = stream;`
`91`	`89`	`}`
`92`	`90`