Merge pull request #68 from JuliaGPU/vc/events_errors

Add `Event(f, args)` to integrate code using at_async better

Author: vchuravy

Project.toml

@@ -1,7 +1,7 @@
 name = "KernelAbstractions"
 uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
 authors = ["Valentin Churavy <[email protected]>"]
-version = "0.1.3"
+version = "0.1.4"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/backends/cpu.jl

@@ -6,6 +6,14 @@ function Event(::CPU)
     return NoneEvent()
 end
 
+function Event(f, args...; dependencies=nothing, progress=nothing)
+    T = Threads.@spawn begin
+        wait(MultiEvent(dependencies), progress)
+        f(args...)
+    end
+    return CPUEvent(T)
+end
+
 wait(ev::Union{CPUEvent, NoneEvent, MultiEvent}, progress=nothing) = wait(CPU(), ev, progress)
 wait(::CPU, ev::NoneEvent, progress=nothing) = nothing
 
@@ -31,13 +39,11 @@ function wait(::CPU, ev::CPUEvent, progress=nothing)
     end
 end
 
-function async_copy!(::CPU, A, B; dependencies=nothing)
-    wait(CPU(), MultiEvent(dependencies), yield)
-    copyto!(A, B)
-    return CPUEvent(nothing)
+function async_copy!(::CPU, A, B; dependencies=nothing, progress=yield)
+    Event(copyto!, A, B, dependencies=dependencies, progress=progress)
 end
 
-function (obj::Kernel{CPU})(args...; ndrange=nothing, workgroupsize=nothing, dependencies=nothing)
+function (obj::Kernel{CPU})(args...; ndrange=nothing, workgroupsize=nothing, dependencies=nothing, progress=yield)
     if ndrange isa Integer
         ndrange = (ndrange,)
     end
@@ -57,13 +63,12 @@ function (obj::Kernel{CPU})(args...; ndrange=nothing, workgroupsize=nothing, dep
         ndrange = nothing
     end
 
-    t = Threads.@spawn __run(obj, ndrange, iterspace, args, dependencies, Val(dynamic))
-    return CPUEvent(t)
+    Event(__run, obj, ndrange, iterspace, args, Val(dynamic),
+          dependencies=dependencies, progress=progress)
 end
 
 # Inference barriers
-function __run(obj, ndrange, iterspace, args, dependencies, ::Val{dynamic}) where dynamic
-    wait(CPU(), MultiEvent(dependencies), yield)
+function __run(obj, ndrange, iterspace, args, ::Val{dynamic}) where dynamic
     N = length(iterspace)
     Nthreads = Threads.nthreads()
     if Nthreads == 1

src/backends/cuda.jl

@@ -109,12 +109,12 @@ function __pin!(a)
     return nothing
 end
 
-function async_copy!(::CUDA, A, B; dependencies=nothing)
+function async_copy!(::CUDA, A, B; dependencies=nothing, progress=yield)
     A isa Array && __pin!(A)
     B isa Array && __pin!(B)
 
     stream = next_stream()
-    wait(CUDA(), MultiEvent(dependencies), yield, stream)
+    wait(CUDA(), MultiEvent(dependencies), progress, stream)
     event = CuEvent(CUDAdrv.EVENT_DISABLE_TIMING)
     GC.@preserve A B begin
         destptr = pointer(A)
@@ -133,7 +133,7 @@ end
 ###
 # Kernel launch
 ###
-function (obj::Kernel{CUDA})(args...; ndrange=nothing, dependencies=nothing, workgroupsize=nothing)
+function (obj::Kernel{CUDA})(args...; ndrange=nothing, dependencies=nothing, workgroupsize=nothing, progress=yield)
     if ndrange isa Integer
         ndrange = (ndrange,)
     end
@@ -142,7 +142,7 @@ function (obj::Kernel{CUDA})(args...; ndrange=nothing, dependencies=nothing, wor
     end
 
     stream = next_stream()
-    wait(CUDA(), MultiEvent(dependencies), yield, stream)
+    wait(CUDA(), MultiEvent(dependencies), progress, stream)
 
     if KernelAbstractions.workgroupsize(obj) <: DynamicSize && workgroupsize === nothing
         # TODO: allow for NDRange{1, DynamicSize, DynamicSize}(nothing, nothing)

test/events.jl

@@ -0,0 +1,22 @@
+using KernelAbstractions
+using Test
+
+@testset "Error propagation" begin
+    let event = Event(()->error(""))
+        @test_throws TaskFailedException wait(event)
+    end
+
+    let event = Event(error, "")
+        @test_throws CompositeException wait(MultiEvent(event))
+    end
+
+    let event = Event(error, "")
+        event = Event(wait, MultiEvent(event))
+        @test_throws TaskFailedException wait(event)
+    end
+
+    let event = Event(error, "")
+        event = Event(()->nothing, dependencies=event)
+        @test_throws TaskFailedException wait(event)
+    end
+end

test/runtests.jl

@@ -21,6 +21,10 @@ end
     include("nditeration.jl")
 end
 
+@testset "Events" begin
+    include("events.jl")
+end
+
 include("print_test.jl")
 
 include("examples.jl")