safe_close()

Author: brandon-b-miller

cuda_core/cuda/core/experimental/_event.pyx

@@ -109,16 +109,23 @@ cdef class Event:
         self._ctx_handle = ctx_handle
         return self
 
-    cpdef close(self, is_shutting_down=is_shutting_down):
+    cpdef safe_close(self, is_shutting_down=is_shutting_down):
         """Destroy the event."""
         if self._handle is not None:
-            if not is_shutting_down()
+            if not is_shutting_down():
                 err, = driver.cuEventDestroy(self._handle)
             self._handle = None
             raise_if_driver_error(err)
 
+    cpdef close(self):
+        """Destroy the event."""
+        if self._handle is not None:
+            err, = driver.cuEventDestroy(self._handle)
+            self._handle = None
+            raise_if_driver_error(err)
+
     def __del__(self):
-        self.close()
+        self.safe_close()
 
     def __isub__(self, other):
         return NotImplemented

cuda_core/cuda/core/experimental/_memory.pyx

@@ -57,9 +57,17 @@ cdef class Buffer:
         return self
 
     def __del__(self):
-        self.close()
+        self.safe_close()
 
-    cpdef close(self, stream: Stream = None, is_shutting_down=is_shutting_down):
+    cpdef safe_close(self, stream: Stream = None, is_shutting_down=is_shutting_down):
+        if self._ptr and self._mr is not None:
+            if not is_shutting_down():
+                self._mr.deallocate(self._ptr, self._size, stream)
+            self._ptr = 0
+            self._mr = None
+            self._ptr_obj = None
+
+    cpdef close(self, stream: Stream = None):
         """Deallocate this buffer asynchronously on the given stream.
 
         This buffer is released back to their memory resource
@@ -72,8 +80,7 @@ cdef class Buffer:
             the behavior depends on the underlying memory resource.
         """
         if self._ptr and self._mr is not None:
-            if not is_shutting_down():
-                self._mr.deallocate(self._ptr, self._size, stream)
+            self._mr.deallocate(self._ptr, self._size, stream)
             self._ptr = 0
             self._mr = None
             self._ptr_obj = None

cuda_core/cuda/core/experimental/_stream.pyx

@@ -186,7 +186,16 @@ cdef class Stream:
         return self
 
     def __del__(self):
-        self.close()
+        self.safe_close()
+
+    cpdef safe_close(self, is_shutting_down=is_shutting_down):
+        if self._owner is None:
+            if self._handle and not self._builtin:
+                if not is_shutting_down():
+                    handle_return(driver.cuStreamDestroy(self._handle))
+        else:
+            self._owner = None
+        self._handle = None
 
     cpdef close(self, is_shutting_down=is_shutting_down):
         """Destroy the stream.
@@ -197,8 +206,7 @@ cdef class Stream:
         """
         if self._owner is None:
             if self._handle and not self._builtin:
-                if not is_shutting_down():
-                    handle_return(driver.cuStreamDestroy(self._handle))
+                handle_return(driver.cuStreamDestroy(self._handle))
         else:
             self._owner = None
         self._handle = None