Merge pull request #64 from JuliaGPU/vc/cleanup

make at_print work outside KA

Author: vchuravy

src/KernelAbstractions.jl

@@ -409,8 +409,22 @@ function __synchronize()
     error("@synchronize used outside kernel or not captured")
 end
 
-function __print(items...)
-    error("@print used outside of kernel")
+@generated function __print(items...)
+    str = ""
+    args = []
+
+    for i in 1:length(items)
+        item = :(items[$i])
+        T = items[i]
+        if T <: Val
+            item = QuoteNode(T.parameters[1])
+        end
+        push!(args, item)
+    end
+
+    quote
+        print($(args...))
+    end
 end
 
 ###

src/backends/cpu.jl

@@ -153,28 +153,9 @@ end
     end
 end
 
-@generated function _print(items...)
-    str = ""
-    args = []
-
-    for i in 1:length(items)
-        item = :(items[$i])
-        T = items[i]
-        if T <: Val
-            item = QuoteNode(T.parameters[1])
-        end
-        push!(args, item)
-    end
-
-    quote
-        print($(args...))
-    end
-
-end
-
 
 @inline function Cassette.overdub(ctx::CPUCtx, ::typeof(__print), items...)
-    _print(items...)
+    __print(items...)
 end
 
 generate_overdubs(CPUCtx)

test/print_test.jl

@@ -11,15 +11,10 @@ end
 end
 
 function test_print(backend)
-  if backend == CPU()
-    kernel = kernel_print(CPU(), 4)
-  else
-    kernel = kernel_print(CUDA(), 4)
-  end
+  kernel = kernel_print(backend, 4)
   kernel(ndrange=(4,)) 
 end
 
-
 @testset "print test" begin
     if CUDAapi.has_cuda_gpu()
         wait(test_print(CUDA()))
@@ -28,4 +23,7 @@ end
 
     wait(test_print(CPU()))
     @test true
+
+    @print("Why this should work")
+    @test true
 end