Avoid atexit errors by at least checking if the queue is still valid.

JuliaGPU · Jan 24, 2025 · a17c34b · a17c34b
1 parent 4be457c
commit a17c34b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/cl/cmdqueue.jl b/lib/cl/cmdqueue.jl
@@ -2,12 +2,14 @@
 
 mutable struct CmdQueue <: CLObject
     const id::cl_command_queue
+    Base.@atomic valid::Bool
 
     function CmdQueue(q_id::cl_command_queue; retain::Bool=false)
-        q = new(q_id)
+        q = new(q_id, true)
         retain && clRetainCommandQueue(q)
         finalizer(q) do _
-          clReleaseCommandQueue(q)
+            Base.@atomic q.valid = false
+            clReleaseCommandQueue(q)
         end
         return q
     end

diff --git a/src/memory.jl b/src/memory.jl
@@ -142,7 +142,9 @@ function free(managed::Managed{<:cl.AbstractMemory})
         # application to make sure that enqueued commands that use svm_pointer have finished
         # before freeing svm_pointer". USM has `clMemBlockingFreeINTEL`, but by doing the
         # synchronization ourselves we provide more opportunity for concurrent execution.
-        synchronize(managed)
+        if managed.queue.valid
+            synchronize(managed)
+        end
 
         if mem isa cl.SharedVirtualMemory
             cl.svm_free(mem)