Merge pull request #148 from tkelman/piracy

Don't import recvfrom from Base

Author: andreasnoack

src/spmd.jl

@@ -1,7 +1,6 @@
 module SPMD
 
 import DistributedArrays: gather, next_did, close
-import Base.recvfrom  # UDP socket
 export sendto, recvfrom, recvfrom_any, barrier, bcast, scatter, gather
 export context_local_storage, context, spmd, close
 
@@ -260,4 +259,4 @@ function close(ctxt::SPMDContext)
     ctxt.release = false
 end
 
-end
+end

test/spmd.jl

@@ -2,7 +2,7 @@
     barrier(;tag=:b1)
 
     if myid() == 1
-        @assert recvfrom(2) == "Hello from 2"
+        @assert SPMD.recvfrom(2) == "Hello from 2"
         println("SPMD: Passed send/recv")
     elseif myid() == 2
         data = "Hello from 2"
@@ -22,7 +22,7 @@
     bcast_val = bcast(bcast_val, 1)
 
     if myid() == 1
-        @assert bcast_val == recvfrom(2)
+        @assert bcast_val == SPMD.recvfrom(2)
         println("SPMD: Passed broadcast")
     elseif myid() == 2
         sendto(1, bcast_val)
@@ -37,7 +37,7 @@
     lp = scatter(scatter_data, 1, tag=1)
 
     if myid() == 1
-        @assert scatter_data[2:2] == recvfrom(2)
+        @assert scatter_data[2:2] == SPMD.recvfrom(2)
         println("SPMD: Passed scatter 1")
     elseif myid() == 2
         sendto(1, lp)
@@ -50,7 +50,7 @@
     lp = scatter(scatter_data, 1, tag=2)
 
     if myid() == 1
-        @assert scatter_data[3:4] == recvfrom(2)
+        @assert scatter_data[3:4] == SPMD.recvfrom(2)
         println("SPMD: Passed scatter 2")
     elseif myid() == 2
         sendto(1, lp)
@@ -91,8 +91,8 @@ spmd(spmd_test1)
         sendto(pids[n_pididx], mylp[2])
         sendto(pids[p_pididx], mylp[1])
 
-        mylp[2] = recvfrom(pids[p_pididx])
-        mylp[1] = recvfrom(pids[n_pididx])
+        mylp[2] = SPMD.recvfrom(pids[p_pididx])
+        mylp[1] = SPMD.recvfrom(pids[n_pididx])
 
 #        println(mylp)
 
@@ -138,8 +138,8 @@ println("SPMD: Passed testing of spmd function run concurrently")
         sendto(pids[n_pididx], mylp[2])
         sendto(pids[p_pididx], mylp[1])
 
-        mylp[2] = recvfrom(pids[p_pididx])
-        mylp[1] = recvfrom(pids[n_pididx])
+        mylp[2] = SPMD.recvfrom(pids[p_pididx])
+        mylp[1] = SPMD.recvfrom(pids[n_pididx])
 
         barrier(;pids=pids)
         localsum = localsum + mylp[1] + mylp[2]