Merge #26

26: be less judicous with escape r=vchuravy a=vchuravy

fixes #24

Co-authored-by: Valentin Churavy <[email protected]>

Author: bors[bot]

src/macros.jl

@@ -38,9 +38,8 @@ function __kernel(expr)
     # create two functions
     # 1. GPU function
     # 2. CPU function with work-group loops inserted
-    gpu_name = esc(gensym(Symbol(:gpu_, name)))
-    cpu_name = esc(gensym(Symbol(:cpu_, name)))
-    name = esc(name)
+    gpu_name = gensym(Symbol(:gpu_, name))
+    cpu_name = gensym(Symbol(:cpu_, name))
 
     gpu_decl = Expr(:call, gpu_name, arglist...)
     cpu_decl = Expr(:call, cpu_name, arglist...)
@@ -70,7 +69,7 @@ function __kernel(expr)
         end
     end
 
-    return Expr(:toplevel, cpu_function, gpu_function, constructors)
+    return Expr(:block, esc(cpu_function), esc(gpu_function), esc(constructors))
 end
 
 # Transform function for GPU execution

test/runtests.jl

@@ -9,4 +9,8 @@ end
     include("localmem.jl")
 end
 
+@testset "Unroll" begin
+    include("unroll.jl")
+end
+
 include("examples.jl")

test/unroll.jl

@@ -0,0 +1,15 @@
+using KernelAbstractions
+using KernelAbstractions.Extras
+
+@kernel function kernel_unroll!(a)
+  @unroll for i in 1:5
+    @inbounds a[i] = i
+  end
+end
+
+let
+  a = zeros(5)
+  kernel! = kernel_unroll!(CPU(), 1, 1)
+  event = kernel!(a)
+  wait(event)
+end