Merge pull request #276 from JuliaParallel/sb/winfix

Disable custom reduction operators on Windows, fix misc Windows and nightly issues.

Author: simonbyrne

.appveyor.yml

@@ -8,10 +8,6 @@ platform:
   - x86 # 32-bit
   - x64 # 64-bit
 
-matrix:
-  allow_failures:
-  - platform: x86
-
 branches:
   only:
     - master

src/cman.jl

@@ -2,7 +2,7 @@ import Base: kill
 export MPIManager, launch, manage, kill, procs, connect, mpiprocs, @mpi_do
 export TransportMode, MPI_ON_WORKERS, TCP_TRANSPORT_ALL, MPI_TRANSPORT_ALL
 using Distributed
-import Sockets: connect, listenany, accept, IPv4, getsockname, getaddrinfo
+import Sockets: connect, listenany, accept, IPv4, getsockname, getaddrinfo, wait_connected
 
 
 
@@ -200,7 +200,7 @@ function setup_worker(host, port, cookie)
     !MPI.Initialized() && MPI.Init()
     # Connect to the manager
     io = connect(IPv4(host), port)
-    Base.wait_connected(io)
+    wait_connected(io)
     redirect_stdout(io)
     redirect_stderr(io)
 

src/info.jl

@@ -84,6 +84,7 @@ function Base.getindex(info::Info, key::Symbol)
     @assert isascii(skey) && length(skey) <= MPI_MAX_INFO_KEY
     valuelen = Ref{Cint}()
     flag = Ref{Cint}()
+    # int MPI_Info_get_valuelen(MPI_Info info, const char *key, int *valuelen, int *flag)
     @mpichk ccall((:MPI_Info_get_valuelen, libmpi), Cint,
           (MPI_Info, Cstring, Ptr{Cint}, Ptr{Cint}),
           info, skey, valuelen, flag)
@@ -92,12 +93,18 @@ function Base.getindex(info::Info, key::Symbol)
         throw(KeyError(key))
     end
 
+    # According to the MPI standard:
+    #   "`valuelen` should be one less than the amount of allocated
+    #   space to allow for the null terminator."
+    # But MS-MPI will insists on setting the `n`th character as NUL,
+    # so we simply pad both to avoid problems.
     n = valuelen[]
-    buffer = Vector{UInt8}(undef, n)
+    buffer = Vector{UInt8}(undef, n+2)
+    # int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, int *flag)
     @mpichk ccall((:MPI_Info_get, libmpi), Cint,
           (MPI_Info, Cstring, Cint, Ptr{UInt8}, Ptr{Cint}),
-          info, skey, n, buffer, flag)
-    return String(buffer)
+          info, skey, n+1, buffer, flag)
+    return String(resize!(buffer,n))
 end
 
 function Base.delete!(info::Info,key::Symbol)
@@ -118,7 +125,7 @@ function Base.length(info::Info)
 end
 
 function nthkey(info::Info, n::Integer)
-    buffer = Vector{UInt8}(undef, MPI_MAX_INFO_KEY)
+    buffer = Vector{UInt8}(undef, MPI_MAX_INFO_KEY+1)
     @mpichk ccall((:MPI_Info_get_nthkey, libmpi), Cint,
                   (MPI_Info, Cint, Ptr{UInt8}), info, n, buffer)
     i = findfirst(isequal(UInt8(0)), buffer)

src/operators.jl

@@ -44,6 +44,10 @@ function _mpi_user_function(_a::Ptr{Nothing}, _b::Ptr{Nothing}, _len::Ptr{Cint},
 end
 
 function user_op(opfunc::Function)
+    if Sys.iswindows() && Sys.WORD_SIZE == 32
+        error("Custom reduction operators are not supported on 32-bit Windows.\nSee https://github.com/JuliaParallel/MPI.jl/issues/246 for more details.")
+    end
+    
     # we must initialize these at runtime, but it can't be done in __init__
     # since MPI.Init is not called yet.  So we do it lazily here:
     if _user_op.val == OP_NULL.val

test/runtests.jl

@@ -16,16 +16,6 @@ juliafiles = ["test_cman_julia.jl"]
 # Files to run with mpiexec -n 1
 singlefiles = ["test_spawn.jl"]
 
-excludedfiles = String[]
-if Sys.iswindows()
-    push!(excludedfiles, "test_info.jl")
-    push!(excludedfiles, "test_onesided.jl")
-    push!(excludedfiles, "test_finalize_atexit.jl")
-    if Sys.WORD_SIZE == 32
-        push!(excludedfiles, "test_spawn.jl")
-    end
-end
-
 function runtests()
     nprocs = clamp(Sys.CPU_THREADS, 2, 4)
     exename = joinpath(Sys.BINDIR, Base.julia_exename())
@@ -35,37 +25,25 @@ function runtests()
 
     extra_args = []
     @static if !Sys.iswindows()
-      if occursin( "OpenRTE", read(`mpiexec --version`, String))
+        if occursin( "OpenRTE", read(`mpiexec --version`, String))
             push!(extra_args,"--oversubscribe")
         end
     end
 
     nfail = 0
     printstyled("Running MPI.jl tests\n"; color=:white)
     for f in testfiles
-        if f ∈ excludedfiles
-            println("Skipping disabled test $f")
-            continue
+        coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
+        if f ∈ singlefiles
+            run(`mpiexec $extra_args -n 1 $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
+        elseif f ∈ juliafiles
+            run(`$exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
+        else
+            run(`mpiexec $extra_args -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
+        end
+        Base.with_output_color(:green,stdout) do io
+            println(io,"\tSUCCESS: $f")
         end
-        # try
-            coverage_opt = coverage_opts[Base.JLOptions().code_coverage]
-            if f ∈ singlefiles
-                run(`mpiexec $extra_args -n 1 $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
-            elseif f ∈ juliafiles
-                run(`$exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
-            else
-                run(`mpiexec $extra_args -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
-            end
-            Base.with_output_color(:green,stdout) do io
-                println(io,"\tSUCCESS: $f")
-            end
-        # catch ex
-        #     Base.with_output_color(:red,stderr) do io
-        #         println(io,"\tError: $(joinpath(testdir, f))")
-        #         showerror(io,ex,backtrace())
-        #     end
-        #     nfail += 1
-        # end
     end
     return nfail
 end

test/test_allreduce.jl

@@ -5,12 +5,18 @@ MPI.Init()
 
 comm_size = MPI.Comm_size(MPI.COMM_WORLD)
 
+if Sys.iswindows() && Sys.WORD_SIZE == 32
+    operators = [MPI.SUM, +]
+else
+    operators = [MPI.SUM, +, (x,y) -> 2x+y-x]
+end    
+
 for typ=[Int]
     for dims = [1, 2, 3]
         send_arr = zeros(typ, Tuple(3 for i in 1:dims))
         send_arr[:] .= 1:length(send_arr)
 
-        for op in (MPI.SUM, +, (x,y) -> 2x+y-x)
+        for op in operators
 
             # Non allocating version
             recv_arr = zeros(typ, size(send_arr))

test/test_reduce.jl

@@ -32,12 +32,18 @@ comm_size = MPI.Comm_size(MPI.COMM_WORLD)
 
 send_arr = Int[1, 2, 3]
 
+if Sys.iswindows() && Sys.WORD_SIZE == 32
+    operators = [MPI.SUM, +]
+else
+    operators = [MPI.SUM, +, (x,y) -> 2x+y-x]
+end    
+
 for typ=[Int]
     for dims = [1, 2, 3]
         send_arr = zeros(typ, Tuple(3 for i in 1:dims))
         send_arr[:] .= 1:length(send_arr)
 
-        for op in (MPI.SUM, +, (x,y) -> 2x+y-x)
+        for op in operators
 
             # Non allocating version
             recv_arr = zeros(typ, size(send_arr))