Merge pull request #260 from JuliaParallel/sb/window

Update Window functions

Author: simonbyrne

deps/build.jl

@@ -42,7 +42,7 @@ MPI_constants = [
     # reductions operations
     "MPI_OP_NULL",
     "MPI_BAND",
-    "MPI_BOR", 
+    "MPI_BOR",
     "MPI_BXOR",
     "MPI_LAND",
     "MPI_LOR",
@@ -64,6 +64,7 @@ MPI_constants = [
     "MPI_MAX_INFO_VAL",
     "MPI_INFO_NULL",
 
+
     # proc
     "MPI_PROC_NULL",
 
@@ -77,6 +78,9 @@ MPI_constants = [
     "MPI_LOCK_EXCLUSIVE",
     "MPI_LOCK_SHARED",
 
+    # window
+    "MPI_WIN_NULL",
+
     # misc constants
     "MPI_ANY_SOURCE",
     "MPI_ANY_TAG",

src/MPI.jl

@@ -18,6 +18,7 @@ end
 include(depfile)
 
 include("mpi-base.jl")
+include("mpi-window.jl")
 include("cman.jl")
 include("deprecated.jl")
 

src/deprecated.jl

@@ -11,3 +11,14 @@ const FINALIZE_ATEXIT = Ref(true)
 @deprecate Info_free(info::Info) free(info) false
 
 
+# window functions
+@deprecate(Win_create(base::Array{T}, info::Info, comm::Comm, win::Win) where {T},
+           (win = Win_create(base, comm; info...)), false)
+    
+@deprecate(Win_create_dynamic(info::Info, comm::Comm, win::Win),
+           (win = Win_create_dynamic(comm; info...)), false)
+
+@deprecate(Win_allocate_shared(::Type{T}, len::Int, info::Info, comm::Comm, win::Win) where T,
+           ((win, ptr) = Win_allocate_shared(T, len, comm; info...); ptr), false)
+
+@deprecate Win_free(win::Win) free(win) false

src/mpi-base.jl

@@ -139,11 +139,6 @@ Get_error(stat::Status) = Int(stat.val[MPI_ERROR])
 Get_source(stat::Status) = Int(stat.val[MPI_SOURCE])
 Get_tag(stat::Status) = Int(stat.val[MPI_TAG])
 
-mutable struct Win
-    val::Cint
-    Win() = new(0)
-end
-
 struct LockType
     val::Cint
 end
@@ -1667,133 +1662,6 @@ function Exscan(object::T, op::Op, comm::Comm) where T
     Exscan(sendbuf,1,op,comm)
 end
 
-function Win_create(base::Array{T}, info::Info, comm::Comm, win::Win) where T
-    out_win = Ref(win.val)
-    ccall(MPI_WIN_CREATE, Nothing,
-          (Ptr{T}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          base, Cptrdiff_t(length(base)*sizeof(T)), sizeof(T), info.val, comm.val, out_win, 0)
-    win.val = out_win[]
-end
-
-function Win_create_dynamic(info::Info, comm::Comm, win::Win)
-    out_win = Ref(win.val)
-    ccall(MPI_WIN_CREATE_DYNAMIC, Nothing,
-          (Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          info.val, comm.val, out_win, 0)
-    win.val = out_win[]
-end
-
-function Win_allocate_shared(::Type{T}, len::Int, info::Info, comm::Comm, win::Win) where T
-    out_win = Ref(win.val)
-    out_baseptr = Ref{Ptr{T}}()
-    ccall(MPI_WIN_ALLOCATE_SHARED, Nothing,
-          (Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Ptr{T}}, Ref{Cint}, Ref{Cint}),
-          Cptrdiff_t(len*sizeof(T)), sizeof(T), info.val, comm.val, out_baseptr, out_win, 0)
-    win.val = out_win[]
-    out_baseptr[]
-end
-
-function Win_shared_query(win::Win, owner_rank::Int)
-    out_len = Ref{Cptrdiff_t}()
-    out_sizeT = Ref{Cint}()
-    out_baseptr = Ref{Ptr{Cvoid}}()
-    ccall(MPI_WIN_SHARED_QUERY, Nothing,
-          (Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Ptr{Cvoid}}, Ref{Cint}),
-          win.val, owner_rank, out_len, out_sizeT, out_baseptr, 0)
-    out_len[], out_sizeT[], out_baseptr[]
-end
-
-function Win_attach(win::Win, base::Array{T}) where T
-    ccall(MPI_WIN_ATTACH, Nothing,
-          (Ref{Cint}, Ptr{T}, Ref{Cptrdiff_t}, Ref{Cint}),
-          win.val, base, Cptrdiff_t(sizeof(base)), 0)
-end
-
-function Win_detach(win::Win, base::Array{T}) where T
-    ccall(MPI_WIN_DETACH, Nothing,
-          (Ref{Cint}, Ptr{T}, Ref{Cint}),
-          win.val, base, 0)
-end
-
-function Win_fence(assert::Integer, win::Win)
-    ccall(MPI_WIN_FENCE, Nothing, (Ref{Cint}, Ref{Cint}, Ref{Cint}), assert, win.val, 0)
-end
-
-function Win_flush(rank::Integer, win::Win)
-    ccall(MPI_WIN_FLUSH, Nothing, (Ref{Cint}, Ref{Cint}, Ref{Cint}), rank, win.val, 0)
-end
-
-function Win_free(win::Win)
-    ccall(MPI_WIN_FREE, Nothing, (Ref{Cint}, Ref{Cint}), win.val, 0)
-end
-
-function Win_sync(win::Win)
-    ccall(MPI_WIN_SYNC, Nothing, (Ref{Cint}, Ref{Cint}), win.val, 0)
-end
-
-function Win_sync(win::CWin)
-    ccall((:MPI_Win_sync, libmpi), Nothing, (CWin,), win)
-end
-
-function Win_lock(lock_type::LockType, rank::Integer, assert::Integer, win::Win)
-    ccall(MPI_WIN_LOCK, Nothing,
-          (Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          lock_type.val, rank, assert, win.val, 0)
-end
-
-function Win_unlock(rank::Integer, win::Win)
-    ccall(MPI_WIN_UNLOCK, Nothing, (Ref{Cint}, Ref{Cint}, Ref{Cint}), rank, win.val, 0)
-end
-
-function Get(origin_buffer::MPIBuffertype{T}, count::Integer, target_rank::Integer, target_disp::Integer, win::Win) where T
-    ccall(MPI_GET, Nothing,
-          (Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          origin_buffer, count, mpitype(T), target_rank, Cptrdiff_t(target_disp), count, mpitype(T), win.val, 0)
-end
-function Get(origin_buffer::Array{T}, target_rank::Integer, win::Win) where T
-    count = length(origin_buffer)
-    Get(origin_buffer, count, target_rank, 0, win)
-end
-function Get(origin_value::Ref{T}, target_rank::Integer, win::Win) where T
-    Get(origin_value, 1, target_rank, 0, win)
-end
-
-function Put(origin_buffer::MPIBuffertype{T}, count::Integer, target_rank::Integer, target_disp::Integer, win::Win) where T
-    ccall(MPI_PUT, Nothing,
-          (Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          origin_buffer, count, mpitype(T), target_rank, Cptrdiff_t(target_disp), count, mpitype(T), win.val, 0)
-end
-function Put(origin_buffer::Array{T}, target_rank::Integer, win::Win) where T
-    count = length(origin_buffer)
-    Put(origin_buffer, count, target_rank, 0, win)
-end
-function Put(origin_value::Ref{T}, target_rank::Integer, win::Win) where T
-    Put(origin_value, 1, target_rank, 0, win)
-end
-
-function Fetch_and_op(sourceval::MPIBuffertype{T}, returnval::MPIBuffertype{T}, target_rank::Integer, target_disp::Integer, op::Op, win::Win) where T
-    ccall(MPI_FETCH_AND_OP, Nothing,
-          (Ptr{T}, Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          sourceval, returnval, mpitype(T), target_rank, Cptrdiff_t(target_disp), op.val, win.val, 0)
-end
-
-function Fetch_and_op(sourceval::MPIBuffertype{T}, returnval::MPIBuffertype{T}, target_rank::Integer, target_disp::Integer, op::Op, win::CWin) where T
-    ccall((:MPI_Fetch_and_op, libmpi), Nothing,
-          (Ptr{T}, Ptr{T}, Cint, Cint, Cptrdiff_t, Cint, CWin),
-          sourceval, returnval, mpitype(T), target_rank, target_disp, op.val, win)
-end
-
-function Accumulate(origin_buffer::MPIBuffertype{T}, count::Integer, target_rank::Integer, target_disp::Integer, op::Op, win::Win) where T
-    ccall(MPI_ACCUMULATE, Nothing,
-          (Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          origin_buffer, count, mpitype(T), target_rank, Cptrdiff_t(target_disp), count, mpitype(T), op.val, win.val, 0)
-end
-
-function Get_accumulate(origin_buffer::MPIBuffertype{T}, result_buffer::MPIBuffertype{T}, count::Integer, target_rank::Integer, target_disp::Integer, op::Op, win::Win) where T
-    ccall(MPI_GET_ACCUMULATE, Nothing,
-          (Ptr{T}, Ref{Cint}, Ref{Cint}, Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
-          origin_buffer, count, mpitype(T), result_buffer, count, mpitype(T), target_rank, Cptrdiff_t(target_disp), count, mpitype(T), op.val, win.val, 0)
-end
 
 function Get_address(location::MPIBuffertype{T}) where T
     addr = Ref{Cptrdiff_t}(0)
@@ -1881,12 +1749,6 @@ if HAVE_MPI_COMM_C2F
     function Info(cinfo::CInfo)
       Info(ccall((:MPI_Info_c2f, libmpi), Cint, (CInfo,), cinfo))
     end
-    function CWin(win::Win)
-      ccall((:MPI_Win_f2c, libmpi), CWin, (Cint,), win.val)
-    end
-    function Win(cwin::CWin)
-      Win(ccall((:MPI_Win_c2f, libmpi), Cint, (CWin,), cwin))
-    end
 elseif sizeof(CComm) == sizeof(Cint)
     # in MPICH, both C and Fortran use identical Cint comm handles
     # and MPI_Comm_c2f is not provided.
@@ -1902,12 +1764,6 @@ elseif sizeof(CComm) == sizeof(Cint)
     function Info(cinfo::CInfo)
       Info(reinterpret(Cint, cinfo))
     end
-    function CWin(win::Win)
-      reinterpret(CWin, win.val)
-    end
-    function Win(cwin::CWin)
-      Win(reinterpret(Cint, cwin))
-    end
 else
     @warn("No MPI_Comm_c2f found - conversion to/from MPI.CComm will not work")
 end