Merge pull request #8 from JuliaGPU/jps/dagger-0.10

Update to Dagger 0.10

Author: jpsamaroo

.gitlab-ci.yml

@@ -4,7 +4,6 @@ include:
 # CUDA.jl
 
 cuda:1.5:
-  image: ubuntu:bionic
   extends:
     - .julia:1.5
     - .test

Project.toml

@@ -11,7 +11,7 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 
 [compat]
 Adapt = "1, 2"
-Dagger = "0.9 - 0.10"
+Dagger = "0.10"
 Requires = "1"
 julia = "1"
 

src/DaggerGPU.jl

@@ -13,8 +13,8 @@ macro gpuproc(PROC, T)
         Dagger.iscompatible_arg(proc::Dagger.ThreadProc, opts, x::$T) = false
 
         # Adapt to/from the appropriate type
-        Dagger.move(ctx, from_proc::OSProc, to_proc::$PROC, x) = adapt($T, x)
-        Dagger.move(ctx, from_proc::$PROC, to_proc::OSProc, x) = adapt(Array, x)
+        Dagger.move(from_proc::OSProc, to_proc::$PROC, x) = adapt($T, x)
+        Dagger.move(from_proc::$PROC, to_proc::OSProc, x) = adapt(Array, x)
     end
 end
 

src/cu.jl

@@ -12,7 +12,7 @@ end
 @gpuproc(CuArrayDeviceProc, CuArray)
 const CuArrayProc = CuArrayDeviceProc
 #= FIXME: CUDA IPC
-function Dagger.move(ctx, from::CuArrayDeviceProc, to::CuArrayDeviceProc, x)
+function Dagger.move(from::CuArrayDeviceProc, to::CuArrayDeviceProc, x)
     if from === to
         return x
     else
@@ -34,7 +34,7 @@ struct CuArraySMProc <: Dagger.Processor
 end
 @gpuproc(CuArraySMProc, CuArray)
 #= FIXME: CUDA IPC
-function Dagger.move(ctx, from::CuArraySMProc, to::CuArraySMProc, x)
+function Dagger.move(from::CuArraySMProc, to::CuArraySMProc, x)
     if from.device === to.device
         return x
     else

test/runtests.jl

@@ -19,10 +19,13 @@ function generate_thunks()
     delayed((xs...)->[sum(xs)])(as...)
 end
 
+@test DaggerGPU.cancompute(:CUDA) || DaggerGPU.cancompute(:ROC)
+
 @testset "CUDA" begin
     if !DaggerGPU.cancompute(:CUDA)
         @warn "No CUDA devices available, skipping tests"
     else
+        didtest = true
         cuproc = DaggerGPU.processor(:CUDA)
         b = generate_thunks()
         opts = Dagger.Sch.ThunkOptions(;proctypes=[cuproc])
@@ -39,6 +42,7 @@ end
     if !DaggerGPU.cancompute(:ROC)
         @warn "No ROCm devices available, skipping tests"
     else
+        didtest = true
         rocproc = DaggerGPU.processor(:ROC)
         b = generate_thunks()
         opts = Dagger.Sch.ThunkOptions(;proctypes=[rocproc])