Added support for Adapt.jl (#16)

* Added support for Adapt.jl

* avoid conflict

* now we can convert an array of Duals with cl()

* added tests

Author: Maaarcocr

REQUIRE

@@ -5,6 +5,7 @@ GPUArrays 0.2.0
 StaticArrays
 ColorTypes
 
+Adapt
 Transpiler 0.4.3
 Sugar 0.4.1
 Matcha 0.1.1

src/array.jl

@@ -26,10 +26,14 @@ context(p::CLArray) = context(pointer(p))
 
 # Avoid conflict with OpenCL.cl
 module Shorthands
-    using ..CLArrays
-    cl(x) = x
-    cl(x::CLArrays.CLArray) = x
-    cl(xs::AbstractArray) = isbits(xs) ? xs : CLArrays.CLArray(xs)
+    using ..CLArrays: CLArray
+    import Adapt: adapt, adapt_
+
+    adapt_(::Type{<:CLArray}, xs::AbstractArray) = isbits(xs) ? xs : convert(CLArray, xs)
+
+    cl(x) = adapt(CLArray{Float32}, x)
+
+    export cl
 end
 
 function (::Type{CLArray{T, N}})(size::NTuple{N, Integer}, ctx::cl.Context = global_context()) where {T, N}

test/runtests.jl

@@ -1,4 +1,4 @@
-using CLArrays
+using CLArrays, CLArrays.Shorthands
 using GPUArrays.TestSuite, Base.Test
 
 for dev in CLArrays.devices()
@@ -30,6 +30,13 @@ for dev in CLArrays.devices()
             # in copy to convert to array type, but that actually convert Array{Bool} to BitArray
             # against_base((a, b)-> a .& b, CLArray{Bool}, (10,), (10,))
         end
+
+        @testset "Shorthand Test" begin
+            GPUArrays.allowslow(true)
+            @test collect(cl([1,2])) == [1,2]
+            @test collect(cl([1 2;3 4])) == [1 2;3 4]
+            @test cl([1,2,3]) == CLArray([1,2,3])
+        end
     end
 end
 
@@ -132,4 +139,3 @@ end
 #     # out[15] = sizeof(x15)
 #     return
 # end
-