Merge pull request #205 from barche/win-constants

Add omitted windows MPI constants

Author: vchuravy

.travis.yml

@@ -15,6 +15,8 @@ env:
 before_install:
   - sh ./conf/travis-install-mpi.sh $MPI_IMPL
   - export PATH=$HOME/OpenMPI/bin:$HOME/MPICH/bin:$PATH
+  - export CC=mpicc
+  - export FC=mpif90
 # Work around OpenMPI attempting to create overly long temporary
 # file names - and erroring as a result
   - export TMPDIR=/tmp

appveyor.yml

@@ -23,7 +23,7 @@ install:
         $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
   - ps: (new-object net.webclient).DownloadFile(
-        "https://download.microsoft.com/download/D/7/B/D7BBA00F-71B7-436B-80BC-4D22F2EE9862/MSMpiSetup.exe",
+        "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisetup.exe",
         "C:\projects\MSMpiSetup.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia

src/mpi-base.jl

@@ -878,7 +878,7 @@ function Win_sync(win::Win)
 end
 
 function Win_sync(win::CWin)
-    ccall(:MPI_Win_sync, Void, (CWin,), win)
+    ccall((:MPI_Win_sync, libmpi), Void, (CWin,), win)
 end
 
 function Win_lock(lock_type::LockType, rank::Integer, assert::Integer, win::Win)
@@ -924,15 +924,14 @@ function Fetch_and_op(sourceval::MPIBuffertype{T}, returnval::MPIBuffertype{T},
 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, Void,
+    ccall((:MPI_Fetch_and_op, libmpi), Void,
           (Ptr{T}, Ptr{T}, Cint, Cint, Cptrdiff_t, Cint, CWin),
           sourceval, returnval, mpitype(T), target_rank, target_disp, op.val, win)
 end
 
 function Get_address(location::MPIBuffertype{T}) where T
     addr = Ref{Cptrdiff_t}(0)
     ccall(MPI_GET_ADDRESS, Void, (Ptr{T}, Ref{Cptrdiff_t}, Ref{Cint}), location, addr, 0)
-    #ccall(:MPI_Get_address, Int, (Ptr{Void}, Ref{Cptrdiff_t}), location, addr)
     return addr[]
 end
 
@@ -944,7 +943,7 @@ end
 
 function Comm_spawn(command::String, argv::Vector{String}, nprocs::Integer, comm::Comm, errors = Vector{Cint}(nprocs))
     c_intercomm = Ref{CComm}()
-    ccall(:MPI_Comm_spawn, Void,
+    ccall((:MPI_Comm_spawn, libmpi), Void,
          (Cstring, Ptr{Ptr{Cchar}}, Cint, CInfo, Cint, CComm, Ref{CComm}, Ptr{Cint}),
          command, argv, nprocs, CInfo(INFO_NULL), 0, CComm(comm), c_intercomm, errors)
     return Comm(c_intercomm[])
@@ -960,18 +959,18 @@ end
 if HAVE_MPI_COMM_C2F
     # use MPI_Comm_f2c and MPI_Comm_c2f
     Base.convert(::Type{CComm}, comm::Comm) =
-        ccall(:MPI_Comm_f2c, CComm, (Cint,), comm.val)
+        ccall((:MPI_Comm_f2c, libmpi), CComm, (Cint,), comm.val)
     Base.convert(::Type{Comm}, ccomm::CComm) =
-        Comm(ccall(:MPI_Comm_c2f, Cint, (CComm,), ccomm))
+        Comm(ccall((:MPI_Comm_c2f, libmpi), Cint, (CComm,), ccomm))
     # Assume info is treated the same way
     Base.convert(::Type{CInfo}, info::Info) =
-        ccall(:MPI_Info_f2c, CInfo, (Cint,), info.val)
+        ccall((:MPI_Info_f2c, libmpi), CInfo, (Cint,), info.val)
     Base.convert(::Type{Info}, cinfo::CInfo) =
-        Info(ccall(:MPI_Info_c2f, Cint, (CInfo,), cinfo))
+        Info(ccall((:MPI_Info_c2f, libmpi), Cint, (CInfo,), cinfo))
     Base.convert(::Type{CWin}, win::Win) =
-        ccall(:MPI_Win_f2c, CWin, (Cint,), win.val)
+        ccall((:MPI_Win_f2c, libmpi), CWin, (Cint,), win.val)
     Base.convert(::Type{Win}, cwin::CWin) =
-        Win(ccall(:MPI_Win_c2f, Cint, (CWin,), cwin))
+        Win(ccall((:MPI_Win_c2f, libmpi), Cint, (CWin,), cwin))
 elseif sizeof(CComm) == sizeof(Cint)
     # in MPICH, both C and Fortran use identical Cint comm handles
     # and MPI_Comm_c2f is not provided.

src/win_mpiconstants.jl

@@ -28,12 +28,15 @@ const MPI_BAND = Int32(1476395014)
 const MPI_BOR = Int32(1476395016)
 const MPI_BXOR = Int32(1476395018)
 const MPI_LAND = Int32(1476395013)
+const MPI_LOCK_EXCLUSIVE = Int32(234)
+const MPI_LOCK_SHARED = Int32(235)
 const MPI_LOR = Int32(1476395015)
 const MPI_LXOR = Int32(1476395017)
 const MPI_MAX = Int32(1476395009)
 const MPI_MAXLOC = Int32(1476395020)
 const MPI_MIN = Int32(1476395010)
 const MPI_MINLOC = Int32(1476395019)
+const MPI_NO_OP = Int32(0x5800000e)
 const MPI_PROD = Int32(1476395012)
 const MPI_REPLACE = Int32(1476395021)
 const MPI_SUM = Int32(1476395011)
@@ -49,50 +52,78 @@ const MPI_TAG_UB = Int32(1681915906)
 const MPI_UNDEFINED = Int32(-32766)
 const HAVE_MPI_COMM_C2F = false
 
-const MPI_ABORT = (:MPI_ABORT, "msmpi.dll")
-const MPI_INIT = (:MPI_INIT, "msmpi.dll")
-const MPI_COMM_RANK = (:MPI_COMM_RANK, "msmpi.dll")
-const MPI_COMM_SIZE = (:MPI_COMM_SIZE, "msmpi.dll")
-const MPI_COMM_SPLIT = (:MPI_COMM_SPLIT, "msmpi.dll")
-const MPI_COMM_SPLIT_TYPE = (:MPI_COMM_SPLIT_TYPE, "msmpi.dll")
-const MPI_BARRIER = (:MPI_BARRIER, "msmpi.dll")
-const MPI_FINALIZE = (:MPI_FINALIZE, "msmpi.dll")
-const MPI_BCAST = (:MPI_BCAST, "msmpi.dll")
-const MPI_REDUCE = (:MPI_REDUCE, "msmpi.dll")
-const MPI_IRECV = (:MPI_IRECV, "msmpi.dll")
-const MPI_RECV = (:MPI_RECV, "msmpi.dll")
-const MPI_ISEND = (:MPI_ISEND, "msmpi.dll")
-const MPI_WAITALL = (:MPI_WAITALL, "msmpi.dll")
-const MPI_ALLGATHER = (:MPI_ALLGATHER, "msmpi.dll")
-const MPI_ALLGATHERV = (:MPI_ALLGATHERV, "msmpi.dll")
-const MPI_ALLTOALL = (:MPI_ALLTOALL, "msmpi.dll")
-const MPI_ALLTOALLV = (:MPI_ALLTOALLV, "msmpi.dll")
-const MPI_INITIALIZED = (:MPI_INITIALIZED, "msmpi.dll")
-const MPI_FINALIZED = (:MPI_FINALIZED, "msmpi.dll")
-const MPI_OP_CREATE = (:MPI_OP_CREATE, "msmpi.dll")
-const MPI_OP_FREE = (:MPI_OP_FREE, "msmpi.dll")
-const MPI_SCATTER = (:MPI_SCATTER, "msmpi.dll")
-const MPI_SCATTERV = (:MPI_SCATTERV, "msmpi.dll")
-const MPI_SEND = (:MPI_SEND, "msmpi.dll")
-const MPI_SCAN = (:MPI_SCAN, "msmpi.dll")
-const MPI_EXSCAN = (:MPI_EXSCAN, "msmpi.dll")
-const MPI_GATHER = (:MPI_GATHER, "msmpi.dll")
-const MPI_GATHERV = (:MPI_GATHERV, "msmpi.dll")
-const MPI_COMM_DUP = (:MPI_COMM_DUP, "msmpi.dll")
-const MPI_IPROBE = (:MPI_IPROBE, "msmpi.dll")
-const MPI_PROBE = (:MPI_PROBE, "msmpi.dll")
-const MPI_COMM_FREE = (:MPI_COMM_FREE, "msmpi.dll")
-const MPI_GET_COUNT = (:MPI_GET_COUNT, "msmpi.dll")
-const MPI_TEST = (:MPI_TEST, "msmpi.dll")
-const MPI_TESTSOME = (:MPI_TESTSOME, "msmpi.dll")
-const MPI_TESTANY = (:MPI_TESTANY, "msmpi.dll")
-const MPI_TESTALL = (:MPI_TESTALL, "msmpi.dll")
-const MPI_TYPE_CREATE_STRUCT = (:MPI_TYPE_CREATE_STRUCT, "msmpi.dll")
-const MPI_TYPE_COMMIT = (:MPI_TYPE_COMMIT, "msmpi.dll")
-const MPI_WAIT = (:MPI_WAIT, "msmpi.dll")
-const MPI_WAITSOME = (:MPI_WAITSOME, "msmpi.dll")
-const MPI_WAITANY = (:MPI_WAITANY, "msmpi.dll")
-const MPI_CANCEL = (:MPI_CANCEL, "msmpi.dll")
-const MPI_ALLREDUCE = (:MPI_ALLREDUCE, "msmpi.dll")
+const libmpi = "msmpi.dll"
+
+const MPI_ABORT = (:MPI_ABORT, libmpi)
+const MPI_ALLREDUCE = (:MPI_ALLREDUCE, libmpi)
+const MPI_INIT = (:MPI_INIT, libmpi)
+const MPI_CANCEL = (:MPI_CANCEL, libmpi)
+const MPI_COMM_FREE = (:MPI_COMM_FREE, libmpi)
+const MPI_COMM_GET_PARENT = (:MPI_COMM_GET_PARENT, libmpi)
+const MPI_COMM_RANK = (:MPI_COMM_RANK, libmpi)
+const MPI_COMM_SIZE = (:MPI_COMM_SIZE, libmpi)
+const MPI_COMM_SPLIT = (:MPI_COMM_SPLIT, libmpi)
+const MPI_COMM_SPLIT_TYPE = (:MPI_COMM_SPLIT_TYPE, libmpi)
+const MPI_BARRIER = (:MPI_BARRIER, libmpi)
+const MPI_FINALIZE = (:MPI_FINALIZE, libmpi)
+const MPI_BCAST = (:MPI_BCAST, libmpi)
+const MPI_REDUCE = (:MPI_REDUCE, libmpi)
+const MPI_IRECV = (:MPI_IRECV, libmpi)
+const MPI_RECV = (:MPI_RECV, libmpi)
+const MPI_ISEND = (:MPI_ISEND, libmpi)
+const MPI_WAITALL = (:MPI_WAITALL, libmpi)
+const MPI_ALLGATHER = (:MPI_ALLGATHER, libmpi)
+const MPI_ALLGATHERV = (:MPI_ALLGATHERV, libmpi)
+const MPI_ALLTOALL = (:MPI_ALLTOALL, libmpi)
+const MPI_ALLTOALLV = (:MPI_ALLTOALLV, libmpi)
+const MPI_INFO_CREATE = (:MPI_INFO_CREATE, libmpi)
+const MPI_INFO_DELETE = (:MPI_INFO_DELETE, libmpi)
+const MPI_INFO_FREE = (:MPI_INFO_FREE, libmpi)
+const MPI_INFO_GET = (:MPI_INFO_GET, libmpi)
+const MPI_INFO_GET_VALUELEN = (:MPI_INFO_GET_VALUELEN, libmpi)
+const MPI_INFO_SET = (:MPI_INFO_SET, libmpi)
+const MPI_INITIALIZED = (:MPI_INITIALIZED, libmpi)
+const MPI_FINALIZED = (:MPI_FINALIZED, libmpi)
+const MPI_FETCH_AND_OP = (:MPI_FETCH_AND_OP, libmpi)
+const MPI_OP_CREATE = (:MPI_OP_CREATE, libmpi)
+const MPI_OP_FREE = (:MPI_OP_FREE, libmpi)
+const MPI_SCATTER = (:MPI_SCATTER, libmpi)
+const MPI_SCATTERV = (:MPI_SCATTERV, libmpi)
+const MPI_SEND = (:MPI_SEND, libmpi)
+const MPI_SCAN = (:MPI_SCAN, libmpi)
+const MPI_EXSCAN = (:MPI_EXSCAN, libmpi)
+const MPI_GET = (:MPI_GET, libmpi)
+const MPI_GET_ADDRESS = (:MPI_GET_ADDRESS, libmpi)
+const MPI_GET_COUNT = (:MPI_GET_COUNT, libmpi)
+const MPI_GATHER = (:MPI_GATHER, libmpi)
+const MPI_GATHERV = (:MPI_GATHERV, libmpi)
+const MPI_COMM_DUP = (:MPI_COMM_DUP, libmpi)
+const MPI_INTERCOMM_MERGE = (:MPI_INTERCOMM_MERGE, libmpi)
+const MPI_IPROBE = (:MPI_IPROBE, libmpi)
+const MPI_PROBE = (:MPI_PROBE, libmpi)
+const MPI_PUT = (:MPI_PUT, libmpi)
+const MPI_TEST = (:MPI_TEST, libmpi)
+const MPI_TESTSOME = (:MPI_TESTSOME, libmpi)
+const MPI_TESTANY = (:MPI_TESTANY, libmpi)
+const MPI_TESTALL = (:MPI_TESTALL, libmpi)
+const MPI_TYPE_CREATE_STRUCT = (:MPI_TYPE_CREATE_STRUCT, libmpi)
+const MPI_TYPE_COMMIT = (:MPI_TYPE_COMMIT, libmpi)
+const MPI_WAIT = (:MPI_WAIT, libmpi)
+const MPI_WAITANY = (:MPI_WAITANY, libmpi)
+const MPI_WAITSOME = (:MPI_WAITSOME, libmpi)
+const MPI_WIN_ATTACH = (:MPI_WIN_ATTACH, libmpi)
+const MPI_WIN_CREATE = (:MPI_WIN_CREATE, libmpi)
+const MPI_WIN_CREATE_DYNAMIC = (:MPI_WIN_CREATE, libmpi)
+const MPI_WIN_DETACH = (:MPI_WIN_DETACH, libmpi)
+const MPI_WIN_FENCE = (:MPI_WIN_FENCE, libmpi)
+const MPI_WIN_FLUSH = (:MPI_WIN_FLUSH, libmpi)
+const MPI_WIN_FREE = (:MPI_WIN_FREE, libmpi)
+const MPI_WIN_LOCK = (:MPI_WIN_LOCK, libmpi)
+const MPI_WIN_SYNC = (:MPI_WIN_SYNC, libmpi)
+const MPI_WIN_UNLOCK = (:MPI_WIN_UNLOCK, libmpi)
+const MPI_WTICK = (:MPI_WTICK, libmpi)
+const MPI_WTIME = (:MPI_WTIME, libmpi)
 
 primitive type CComm 32 end
+primitive type CInfo 32 end
+primitive type CWin 32 end

test/runtests.jl

@@ -20,6 +20,14 @@ juliafiles = ["test_cman_julia.jl"]
 # Files to run with mpiexec -n 1
 singlefiles = ["test_spawn.jl"]
 
+excludedfiles = []
+if is_windows()
+    excludedfiles = ["test_info.jl", "test_onesided.jl"]
+    if Sys.WORD_SIZE == 32
+        push!(excludedfiles, "test_spawn.jl")
+    end
+end
+
 function runtests()
     nprocs = clamp(Sys.CPU_CORES, 2, 4)
     exename = joinpath(BINDIR, Base.julia_exename())
@@ -28,13 +36,19 @@ function runtests()
     testfiles = sort(filter(istest, readdir(testdir)))
 
     extra_args = []
-    if contains(readlines(open(`mpiexec --version`)[1])[1], "OpenRTE")
-        push!(extra_args,"--oversubscribe")
+    @static if !is_windows()
+        if contains(readlines(open(`mpiexec --version`)[1])[1], "OpenRTE")
+            push!(extra_args,"--oversubscribe")
+        end
     end
 
     nfail = 0
     print_with_color(:white, "Running MPI.jl tests\n")
     for f in testfiles
+        if f ∈ excludedfiles
+            println("Skipping disabled test $f")
+            continue
+        end
         try
             coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
             if f ∈ singlefiles

test/test_cman_julia.jl

@@ -3,7 +3,7 @@ using MPI
 
 # Start workers via `mpiexec` that communicate among themselves via MPI;
 # communicate with the workers via TCP
-if contains(readlines(open(`mpiexec --version`)[1])[1], "OpenRTE")
+if !is_windows() && contains(readlines(open(`mpiexec --version`)[1])[1], "OpenRTE")
     mgr = MPI.MPIManager(np=4, mpirun_cmd=`mpiexec --oversubscribe -n 4`)
 else
     mgr = MPI.MPIManager(np=4)