Merge pull request #81 from JuliaParallel/anj/compat

Fix some deprecations and add Compat dependency

Author: eschnett

REQUIRE

@@ -1,2 +1,3 @@
 julia 0.4-
 BinDeps
+Compat

examples/02-broadcast-impl.jl

@@ -25,7 +25,7 @@ function do_broadcast()
     if MPI.Comm_rank(comm) == root
         B = Dict("foo" => "bar")
     else
-        B = Nothing
+        B = nothing
     end
 
     B = MPI.bcast(B, root, comm)
@@ -35,7 +35,7 @@ function do_broadcast()
     if MPI.Comm_rank(comm) == root
         f = x -> x^2 + 2x - 1
     else
-        f = Nothing
+        f = nothing
     end
 
     f = MPI.bcast(f, root, comm)

examples/05-juliacman.jl

@@ -24,7 +24,7 @@ println("pmap successful")
 println("Running 03-reduce as part of a Julia cluster")
 @mpi_do  manager (include("03-reduce-impl.jl"); do_reduce())
 
-pids = [remotecall_fetch(p, myid) for p in workers()]
+pids = [remotecall_fetch(myid, p) for p in workers()]
 println("julia pids $pids")
 
 println("Running 04-sendrecv as part of a Julia cluster")

examples/06-cman-transport.jl

@@ -23,10 +23,10 @@ if rank == 0
     nloops = 10^2
     function foo(n)
         a=ones(n)
-        remotecall_fetch(2, x->x, a);
+        remotecall_fetch(x->x, 2, a);
 
         @elapsed for i in 1:nloops
-            remotecall_fetch(2, x->x, a)
+            remotecall_fetch(x->x, 2, a)
         end
     end
 

src/MPI.jl

@@ -1,5 +1,7 @@
 module MPI
 
+using Compat
+
 include("../deps/src/compile-time.jl")
 include("mpi-base.jl")
 include("cman.jl")

src/cman.jl

@@ -120,7 +120,7 @@ end
 
 function manage(manager::MPIManager, id::Integer, config::WorkerConfig, op::Symbol)
     if op == :register
-        mpi_id = remotecall_fetch(id, ()->MPI.Comm_rank(MPI.COMM_WORLD))
+        mpi_id = remotecall_fetch(()->MPI.Comm_rank(MPI.COMM_WORLD), id)
         manager.j2mpi[id] = mpi_id
         manager.mpi2j[mpi_id] = id
 
@@ -161,11 +161,11 @@ macro mpi_do(manager, expr)
         jpids = keys(mgr.j2mpi)
         refs = cell(length(jpids))
         for (i,p) in enumerate(filter(x->x!=myid(), jpids))
-            refs[i] = remotecall(p, ()->eval(Main,$(Expr(:quote,expr))))
+            refs[i] = remotecall(()->eval(Main,$(Expr(:quote,expr))), p)
         end
         # Execution on local process should be last, since it can block the main event loop
         if myid() in jpids
-            refs[end] = remotecall(myid(), ()->eval(Main,$(Expr(:quote,expr))))
+            refs[end] = remotecall(()->eval(Main,$(Expr(:quote,expr))), myid())
         end
 
         [wait(r) for r in refs]
@@ -213,8 +213,8 @@ function main_loop(manager, comm)
     while !MPI.Finalized()
         (hasdata, stat) = MPI.Iprobe(ANY_SOURCE, 0, comm)
         if hasdata
-            count = Get_count(stat, Uint8)
-            buf = Array(Uint8, count)
+            count = Get_count(stat, UInt8)
+            buf = Array(UInt8, count)
             from_rank = Get_source(stat)
             MPI.Recv!(buf, from_rank, 0, comm)