Merge pull request #52 from davidanthoff/windows_support

Add support for Microsoft MPI

Author: eschnett

README.md

@@ -10,6 +10,8 @@ mpi4py, although we generally follow the C and not the C++ MPI API.
 
 ## Installing
 
+### Unix systems (OSX and Linux)
+
 [CMake] is used to piece together the MPI wrapper. Currently a shared
 library MPI installation for C and Fortran is required (tested with
 [Open MPI] and [MPICH]). To install MPI.jl using the Julia packaging
@@ -28,7 +30,7 @@ which will build and install the wrapper into `$HOME/.julia/vX.Y/MPI`.
 #### Platform specific notes:
 * If you are trying to build on OSX with Homebrew, the necessary Fortran headers are not included in the OpenMPI bottle.  To workaround this you can build OpenMPI from source: `brew install --build-from-source openmpi`
 
-### Overriding the auto-detected MPI version
+#### Overriding the auto-detected MPI version
 
 It may be that CMake selects the wrong MPI version, or that CMake
 fails to correctly detect and configure your MPI implementation. You
@@ -65,6 +67,15 @@ MPI_INCLUDE_PATH
 MPI_LIBRARIES
 ```
 
+### Windows
+
+You need to install the [Microsoft MPI](https://www.microsoft.com/en-us/download/details.aspx?id=49926) runtime on your system (the SDK is not required). Then simply add the MPI.jl package with
+
+```julia
+Pkg.update()
+Pkg.add("MPI")
+```
+
 ## Usage : MPI-Only mode
 
 To run a Julia script with MPI, first make sure that `using MPI` or

deps/build.jl

@@ -2,7 +2,7 @@ using BinDeps
 
 @BinDeps.setup
 
-mpi = library_dependency("juliampi", aliases=["libjuliampi", "libjuliampi.so", "libjuliampi.dylib"])
+mpi = library_dependency("juliampi", aliases=["libjuliampi", "libjuliampi.so", "libjuliampi.dylib"], os = :Unix)
 builddir = joinpath(BinDeps.depsdir(mpi), "build")
 prefix = joinpath(BinDeps.depsdir(mpi), "usr")
 src = joinpath(BinDeps.depsdir(mpi), "src")

src/MPI.jl

@@ -4,21 +4,31 @@ module MPI
 
 using Compat
 
-const depfile = joinpath(dirname(@__FILE__), "..", "deps", "src", "compile-time.jl")
-isfile(depfile) || error("MPI not properly installed. Please run Pkg.build(\"MPI\")")
+@windows_only begin
+	const depfile = "win_mpiconstants.jl"
+end
+
+@unix_only begin
+	const depfile = joinpath(dirname(@__FILE__), "..", "deps", "src", "compile-time.jl")
+	isfile(depfile) || error("MPI not properly installed. Please run Pkg.build(\"MPI\")")
+end
+
 include(depfile)
+
 include("mpi-base.jl")
 include("cman.jl")
 
 function __init__()
-    # need to open libmpi with RTLD_GLOBAL flag for Linux, before any ccall
-    # cannot use RTLD_DEEPBIND; this leads to segfaults at least on Ubuntu 15.10
-    @eval const libmpi_handle =
-        Libdl.dlopen(libmpi, Libdl.RTLD_LAZY | Libdl.RTLD_GLOBAL)
-
-    # look up all symbols ahead of time
-    for (jname, fname) in _mpi_functions
-        eval(:(const $jname = Libdl.dlsym(libmpi_handle, $fname)))
+    @unix_only begin
+        # need to open libmpi with RTLD_GLOBAL flag for Linux, before any ccall
+        # cannot use RTLD_DEEPBIND; this leads to segfaults at least on Ubuntu 15.10
+        @eval const libmpi_handle =
+            Libdl.dlopen(libmpi, Libdl.RTLD_LAZY | Libdl.RTLD_GLOBAL)
+
+        # look up all symbols ahead of time
+        for (jname, fname) in _mpi_functions
+            eval(:(const $jname = Libdl.dlsym(libmpi_handle, $fname)))
+        end
     end
 end
 

src/win_mpiconstants.jl

@@ -0,0 +1,81 @@
+# These constants were manually copied from the file mpi.h in the Microsoft
+# MPI SDK v7
+
+const MPI_BYTE = Int32(0x4c00010d)
+const MPI_WCHAR = Int32(0x4c00020e)
+const MPI_INT8_T = Int32(0x4c000133)
+const MPI_UINT8_T = Int32(0x4c000137)
+const MPI_INT16_T = Int32(0x4c000234)
+const MPI_UINT16_T = Int32(0x4c000238)
+const MPI_INT32_T = Int32(0x4c000435)
+const MPI_UINT32_T = Int32(0x4c000439)
+const MPI_INT64_T = Int32(0x4c000836)
+const MPI_UINT64_T = Int32(0x4c00083a)
+const MPI_REAL4 = Int32(0x4c000427)
+const MPI_REAL8 = Int32(0x4c000829)
+const MPI_COMPLEX8 = Int32(0x4c000828)
+const MPI_COMPLEX16 = Int32(0x4c00102a)
+const MPI_INTEGER1 = Int32(0x4c00012d)
+const MPI_INTEGER2 = Int32(0x4c00022f)
+const MPI_INTEGER4 = Int32(0x4c000430)
+const MPI_INTEGER8 = Int32(0x4c000831)
+const MPI_COMM_NULL = Int32(67108864)
+const MPI_COMM_SELF = Int32(1140850689)
+const MPI_COMM_WORLD = Int32(1140850688)
+const MPI_OP_NULL = Int32(402653184)
+const MPI_BAND = Int32(1476395014)
+const MPI_BOR = Int32(1476395016)
+const MPI_BXOR = Int32(1476395018)
+const MPI_LAND = Int32(1476395013)
+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_PROD = Int32(1476395012)
+const MPI_REPLACE = Int32(1476395021)
+const MPI_SUM = Int32(1476395011)
+const MPI_REQUEST_NULL = Int32(738197504)
+const MPI_STATUS_SIZE = Int32(5)
+const MPI_ERROR = Int32(5)
+const MPI_SOURCE = Int32(3)
+const MPI_TAG = Int32(4)
+const MPI_ANY_SOURCE = Int32(-2)
+const MPI_ANY_TAG = Int32(-1)
+const MPI_TAG_UB = Int32(1681915906)
+const MPI_UNDEFINED = Int32(-32766)
+const HAVE_MPI_COMM_C2F = false
+
+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_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_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_TESTSOME = (:MPI_TESTSOME, "msmpi.dll")
+
+bitstype 32 CComm