Merge pull request #102 from JuliaGPU/fbot/deps

Fix deprecations
JuliaAttic · Aug 15, 2017 · 4700f5e · 4700f5e
2 parents 622dfa5 + bab6098
commit 4700f5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/arrays.jl b/src/arrays.jl
@@ -24,7 +24,7 @@ if !debugMemory
         dev::Int
     end
 else
-    @compat type CudaArray{T,N} <: AbstractCudaArray{T,N}
+    type CudaArray{T,N} <: AbstractCudaArray{T,N}
         ptr::CudaPtr{T}
         dims::NTuple{N,Int}
         dev::Int
@@ -49,7 +49,7 @@ if !debugMemory
         dev::Int
     end
 else
-    @compat type CudaPitchedArray{T,N} <: AbstractCudaArray{T,N}
+    type CudaPitchedArray{T,N} <: AbstractCudaArray{T,N}
         ptr::rt.cudaPitchedPtr
         dims::NTuple{N,Int}
         dev::Int
@@ -432,11 +432,7 @@ function HostArray{T}(::Type{T}, sz::Dims; flags::Integer=rt.cudaHostAllocDefaul
     p = Ptr{Void}[C_NULL]
     rt.cudaHostAlloc(p, prod(sz)*sizeof(T), flags)
     ptr = p[1]
-    if VERSION < v"0.5.0-dev+4597"
-        data = pointer_to_array(unsafe_convert(Ptr{T}, ptr), sz, false)
-    else
-        data = unsafe_wrap(Array, unsafe_convert(Ptr{T}, ptr), sz, false)
-    end
+    data = unsafe_wrap(Array, unsafe_convert(Ptr{T}, ptr), sz, false)
     ha = HostArray(ptr, data)
     finalizer(ha, free)
     cuda_ptrs[WeakRef(ptr)] = device()

diff --git a/test/test.jl b/test/test.jl
@@ -121,11 +121,7 @@ result = devices(dev->capability(dev)[1] >= 2, nmax=1) do devlist
 #     @test A[2,2] == 3  # asynchronous
     device_synchronize()
     @test A[2,2] == 7
-    if VERSION < v"0.5.0-dev+4597"
-        S = pointer_to_array(pointer(A)+48, (6,2), false)  # a "SubArray"
-    else
-        S = unsafe_wrap(Array, pointer(A)+48, (6,2), false)  # a "SubArray"
-    end
+    S = unsafe_wrap(Array, pointer(A)+48, (6,2), false)  # a "SubArray"
     B = rand(map(Int32, 1:15), 6, 2)
     GB = CudaArray(B)
     copy!(S, GB)