import cudaconvert

JuliaGPU · Sep 27, 2017 · 54e550b · 54e550b
1 parent de26433
commit 54e550b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/CuArrays.jl b/src/CuArrays.jl
@@ -3,6 +3,7 @@ __precompile__()
 module CuArrays
 
 using CUDAdrv, CUDAnative
+import CUDAnative: cudaconvert
 
 export CuArray, CuVector, CuMatrix, cu
 

diff --git a/src/array.jl b/src/array.jl
@@ -101,7 +101,7 @@ function Base.convert(::Type{CuDeviceArray{T,N,AS.Global}}, a::CuArray{T,N}) whe
     CuDeviceArray{T,N,AS.Global}(a.dims, DevicePtr{T,AS.Global}(ptr))
 end
 
-CUDAnative.cudaconvert(a::CuArray{T,N}) where {T,N} = convert(CuDeviceArray{T,N,AS.Global}, a)
+cudaconvert(a::CuArray{T,N}) where {T,N} = convert(CuDeviceArray{T,N,AS.Global}, a)
 
 # Utils
 

diff --git a/src/broadcast.jl b/src/broadcast.jl
@@ -66,7 +66,7 @@ end
 # Hacky interop
 
 Base.Broadcast._containertype(::Type{<:RowVector{<:Any,<:CuArray}}) = CuArray
-CUDAnative.cudaconvert(x::RowVector{<:Any,<:CuArray}) = RowVector(cudaconvert(x.vec))
+cudaconvert(x::RowVector{<:Any,<:CuArray}) = RowVector(cudaconvert(x.vec))
 
 # Hack to work with cuda's arithmetic functions
-Original file line number
+Diff line change
@@ Expand Up @@
         CuDeviceArray{T,N,AS.Global}(a.dims, DevicePtr{T,AS.Global}(ptr))
     end
-    CUDAnative.cudaconvert(a::CuArray{T,N}) where {T,N} = convert(CuDeviceArray{T,N,AS.Global}, a)
+    cudaconvert(a::CuArray{T,N}) where {T,N} = convert(CuDeviceArray{T,N,AS.Global}, a)
     # Utils
@@ Expand Down @@