update to CUDA v1.0+ (#401)

JuliaParallel · Jun 23, 2020 · 1fd7c09 · 1fd7c09
1 parent 393543b
commit 1fd7c09
Show file tree

Hide file tree

Showing 28 changed files with 62 additions and 69 deletions.
diff --git a/Project.toml b/Project.toml
@@ -22,10 +22,10 @@ Requires = "~0.5, 1.0"
 julia = "1"
 
 [extras]
-CuArrays = "3a865a2d-5b23-5a0f-bc46-62713ec82fae"
+CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 DoubleFloats = "497a8b3b-efae-58df-a0af-a86822472b78"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["CuArrays", "DoubleFloats", "Pkg", "Test"]
+test = ["CUDA", "DoubleFloats", "Pkg", "Test"]
diff --git a/docs/src/configuration.md b/docs/src/configuration.md
@@ -77,7 +77,7 @@ The test suite can also be modified by the following variables:
 
 - `JULIA_MPIEXEC_TEST_ARGS`: Additional arguments to be passed to the MPI launcher for the tests only.
 - `JULIA_MPI_TEST_ARRAYTYPE`: Set to `CuArray` to test the CUDA-aware interface with
-  [`CuArray`s](https://github.com/JuliaGPU/CuArrays.jl) buffers.
+  [`CUDA.CuArray](https://github.com/JuliaGPU/CUDA.jl) buffers.
 
 ## Julia wrapper for `mpiexec`
 

diff --git a/docs/src/usage.md b/docs/src/usage.md
@@ -30,8 +30,8 @@ The [`mpiexec`](@ref) function is provided for launching MPI programs from Julia
 
 ## CUDA-aware MPI support
 
-If your MPI implementation has been compiled with CUDA support, then `CuArray`s (from the
-[CuArrays.jl](https://github.com/JuliaGPU/CuArrays.jl) package) can be passed directly as
+If your MPI implementation has been compiled with CUDA support, then `CUDA.CuArray`s (from the
+[CUDA.jl](https://github.com/JuliaGPU/CUDA.jl) package) can be passed directly as
 send and receive buffers for point-to-point and collective operations (they may also work
 with one-sided operations, but these are not often supported).
 

diff --git a/src/MPI.jl b/src/MPI.jl
@@ -80,7 +80,7 @@ function __init__()
         ENV["UCX_ERROR_SIGNALS"] = "SIGILL,SIGBUS,SIGFPE"
     end
 
-    @require CuArrays="3a865a2d-5b23-5a0f-bc46-62713ec82fae" include("cuda.jl")
+    @require CUDA="052768ef-5323-5732-b1bb-66c8b64840ba" include("cuda.jl")
 end
 
 end
diff --git a/src/buffers.jl b/src/buffers.jl
@@ -51,7 +51,7 @@ Currently supported are:
  - `Ref`
  - `Array`
  - `SubArray`
- - `CuArray` if CuArrays.jl is loaded.
+ - `CUDA.CuArray` if CUDA.jl is loaded.
 
 Additionally, certain sentinel values can be used, e.g. `MPI_IN_PLACE` or `MPI_BOTTOM`.
 """
@@ -79,8 +79,8 @@ and `datatype`. Methods are provided for
 
  - `Ref`
  - `Array`
- - `CuArray` if CuArrays.jl is loaded
- - `SubArray`s of an `Array` or `CuArray` where the layout is contiguous, sequential or
+ - `CUDA.CuArray` if CUDA.jl is loaded
+ - `SubArray`s of an `Array` or `CUDA.CuArray` where the layout is contiguous, sequential or
    blocked.
 
 """

diff --git a/src/cuda.jl b/src/cuda.jl
@@ -1,28 +1,21 @@
-import .CuArrays: CuArray
-import .CuArrays.CUDAdrv: CuPtr, synchronize
-import .CuArrays.CUDAdrv.Mem: DeviceBuffer
+import .CUDA
 
-
-function Base.cconvert(::Type{MPIPtr}, buf::CuArray{T}) where T
-    Base.cconvert(CuPtr{T}, buf) # returns DeviceBuffer
+function Base.cconvert(::Type{MPIPtr}, buf::CUDA.CuArray{T}) where T
+    Base.cconvert(CUDA.CuPtr{T}, buf) # returns DeviceBuffer
 end
 
-# CuArrays <= v1.3
-function Base.unsafe_convert(::Type{MPIPtr}, buf::DeviceBuffer)
-    reinterpret(MPIPtr, buf.ptr)
-end
-# CuArrays > v1.3
-function Base.unsafe_convert(::Type{MPIPtr}, X::CuArray{T}) where T
-    reinterpret(MPIPtr, Base.unsafe_convert(CuPtr{T}, X))
+function Base.unsafe_convert(::Type{MPIPtr}, X::CUDA.CuArray{T}) where T
+    reinterpret(MPIPtr, Base.unsafe_convert(CUDA.CuPtr{T}, X))
 end
+
 # only need to define this for strided arrays: all others can be handled by generic machinery
-function Base.unsafe_convert(::Type{MPIPtr}, V::SubArray{T,N,P,I,true}) where {T,N,P<:CuArray,I}
+function Base.unsafe_convert(::Type{MPIPtr}, V::SubArray{T,N,P,I,true}) where {T,N,P<:CUDA.CuArray,I}
     X = parent(V)
-    pX = Base.unsafe_convert(CuPtr{T}, X)
+    pX = Base.unsafe_convert(CUDA.CuPtr{T}, X)
     pV = pX + ((V.offset1 + V.stride1) - first(LinearIndices(X)))*sizeof(T)
     return reinterpret(MPIPtr, pV)
 end
 
-function Buffer(arr::CuArray)
+function Buffer(arr::CUDA.CuArray)
     Buffer(arr, Cint(length(arr)), Datatype(eltype(arr)))
 end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -3,8 +3,8 @@ using Test, MPI
 # load test packages to trigger precompilation
 using DoubleFloats
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_allgather.jl b/test/test_allgather.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_allgatherv.jl b/test/test_allgatherv.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_allreduce.jl b/test/test_allreduce.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_alltoall.jl b/test/test_alltoall.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_alltoallv.jl b/test/test_alltoallv.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_basic.jl b/test/test_basic.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_bcast.jl b/test/test_bcast.jl
@@ -3,8 +3,8 @@ using MPI
 using Random
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_exscan.jl b/test/test_exscan.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_gather.jl b/test/test_gather.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_gatherv.jl b/test/test_gatherv.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_io.jl b/test/test_io.jl
@@ -3,8 +3,8 @@ using MPI
 using Random
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_io_shared.jl b/test/test_io_shared.jl
@@ -3,8 +3,8 @@ using MPI
 using Random
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_reduce.jl b/test/test_reduce.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_scan.jl b/test/test_scan.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_scatter.jl b/test/test_scatter.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_scatterv.jl b/test/test_scatterv.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_sendrecv.jl b/test/test_sendrecv.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_subarray.jl b/test/test_subarray.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_test.jl b/test/test_test.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_threads.jl b/test/test_threads.jl
@@ -2,8 +2,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end

diff --git a/test/test_wait.jl b/test/test_wait.jl
@@ -3,8 +3,8 @@ using Test
 using MPI
 
 if get(ENV,"JULIA_MPI_TEST_ARRAYTYPE","") == "CuArray"
-    using CuArrays
-    ArrayType = CuArray
+    import CUDA
+    ArrayType = CUDA.CuArray
 else
     ArrayType = Array
 end