Merge pull request #210 from jkozdon/v07

Update to Julia V0.7.  MPIManager needs some work to get it to work in V0.7.

Author: lcw

.travis.yml

@@ -6,6 +6,7 @@ os:
   - osx
 julia:
   - 0.6
+  - 0.7
   - nightly
 notifications:
   email: false
@@ -20,5 +21,8 @@ before_install:
 # Work around OpenMPI attempting to create overly long temporary
 # file names - and erroring as a result
   - export TMPDIR=/tmp
+script:
+    - julia -e 'if VERSION < v"0.7.0-DEV.5183"; Pkg.clone(pwd()) ; else; using Pkg; Pkg.up(); end; Pkg.build("MPI"); Pkg.test("MPI"; coverage=true)'
 after_success:
-  - if [ "$TRAVIS_JULIA_VERSION" = nightly ]; then julia -e 'cd(Pkg.dir("MPI")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(Coveralls.process_folder())'; fi
+  - julia -e 'VERSION < v"0.7.0-DEV.5183" || using Pkg; cd(Pkg.dir("MPI")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia -e 'VERSION < v"0.7.0-DEV.5183" || using Pkg; cd(Pkg.dir("MPI")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

Project.toml

@@ -0,0 +1,10 @@
+authors = []
+name = "MPI"
+uuid = "da04e1cc-30fd-572f-bb4f-1f8673147195"
+version = "0.1.0"
+
+[deps]
+BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"

REQUIRE

@@ -1,3 +1,3 @@
 julia 0.6
 BinDeps
-Compat 0.42
+Compat 0.66

appveyor.yml

@@ -4,6 +4,8 @@ environment:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7.0-alpha-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7.0-alpha-win64.exe"
 
 branches:
   only:
@@ -33,8 +35,9 @@ install:
 build_script:
 # Need to convert from shallow to complete for Pkg.clone to work
   - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"MPI\"); Pkg.build(\"MPI\")"
+  - C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
+    versioninfo(); pkg=\"MPI\";
+    if VERSION < v\"0.7.0-DEV.5183\"; Pkg.clone(pwd(), pkg); else; using Pkg; Pkg.up(); end; Pkg.build(\"MPI\")"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"MPI\")"
+  - C:\projects\julia\bin\julia --check-bounds=yes -e "VERSION < v\"0.7.0-DEV.5183\" || using Pkg; Pkg.test(\"MPI\")"

deps/CMakeLists.txt

@@ -142,7 +142,7 @@ endif(${USE_GIT} EQUAL 1)
 if(GIT_DESCRIBE_RESULT EQUAL 0)
   file(WRITE ${CMAKE_SOURCE_DIR}/VERSION \"\${GIT_DESCRIBE_VERSION}\")
 else(GIT_DESCRIBE_RESULT EQUAL 0)
-  FILE(READ  ${CMAKE_SOURCE_DIR}/VERSION GIT_DESCRIBE_VERSION)
+  FILE(READ  ${CMAKE_SOURCE_DIR}/VERSION_NO_GIT GIT_DESCRIBE_VERSION)
 endif(GIT_DESCRIBE_RESULT EQUAL 0)
 
 string(REGEX REPLACE \"v([0-9]*)\\\\.([0-9]*)\\\\.(.*)\"

deps/VERSION_NO_GIT

@@ -0,0 +1 @@
+v0.7.0

src/MPI.jl

@@ -4,11 +4,13 @@ module MPI
 
 using Compat
 
-@static if is_windows()
+using Compat.Libdl
+
+@static if Compat.Sys.iswindows()
     const depfile = "win_mpiconstants.jl"
 end
 
-@static if is_unix()
+@static if Compat.Sys.isunix()
     const depfile = joinpath(dirname(@__FILE__), "..", "deps", "src", "compile-time.jl")
     isfile(depfile) || error("MPI not properly installed. Please run Pkg.build(\"MPI\")")
 end
@@ -22,7 +24,7 @@ const mpitype_dict = Dict{DataType, Cint}()
 const mpitype_dict_inverse = Dict{Cint, DataType}()
 
 function __init__()
-    @static if is_unix()
+    @static if Compat.Sys.isunix()
         # 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
@@ -48,8 +50,8 @@ function __init__()
                      UInt64 => MPI_INTEGER8, # => MPI_UINT64_T,
                      Float32 => MPI_REAL4,
                      Float64 => MPI_REAL8,
-                     Complex64 => MPI_COMPLEX8,
-                     Complex128 => MPI_COMPLEX16)
+                     Compat.ComplexF32 => MPI_COMPLEX8,
+                     Compat.ComplexF64 => MPI_COMPLEX16)
         mpitype_dict[T] = mpiT
         mpitype_dict_inverse[mpiT] = T
     end

src/cman.jl

@@ -1,6 +1,9 @@
-import Base: launch, manage, kill, procs, connect
+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 Compat
+using Compat.Distributed
+import Compat.Sockets: connect, listenany, accept, getipaddr, IPv4
 
 
 
@@ -47,9 +50,9 @@ mutable struct MPIManager <: ClusterManager
 
     # MPI_TRANSPORT_ALL
     comm::MPI.Comm
-    initiate_shutdown::Channel{Void}
-    sending_done::Channel{Void}
-    receiving_done::Channel{Void}
+    initiate_shutdown::Channel{Nothing}
+    sending_done::Channel{Nothing}
+    receiving_done::Channel{Nothing}
 
     function MPIManager(; np::Integer = Sys.CPU_CORES,
                           mpirun_cmd::Cmd = `mpiexec -n $np`,
@@ -83,7 +86,7 @@ mutable struct MPIManager <: ClusterManager
         if mode != MPI_TRANSPORT_ALL
             # Start a listener for capturing stdout from the workers
             port, server = listenany(11000)
-            @schedule begin
+            @async begin
                 while true
                     sock = accept(server)
                     push!(mgr.stdout_ios, sock)
@@ -98,12 +101,12 @@ mutable struct MPIManager <: ClusterManager
         end
 
         if mode == MPI_TRANSPORT_ALL
-            mgr.initiate_shutdown = Channel{Void}(1)
-            mgr.sending_done = Channel{Void}(np)
-            mgr.receiving_done = Channel{Void}(1)
+            mgr.initiate_shutdown = Channel{Nothing}(1)
+            mgr.sending_done = Channel{Nothing}(np)
+            mgr.receiving_done = Channel{Nothing}(1)
             global initiate_shutdown = mgr.initiate_shutdown
         end
-        mgr.initiate_shutdown = Channel{Void}(1)
+        mgr.initiate_shutdown = Channel{Nothing}(1)
         global initiate_shutdown = mgr.initiate_shutdown
 
         return mgr
@@ -119,7 +122,7 @@ end
 # MPI_ON_WORKERS case
 
 # Launch a new worker, called from Base.addprocs
-function launch(mgr::MPIManager, params::Dict,
+function Distributed.launch(mgr::MPIManager, params::Dict,
                 instances::Array, cond::Condition)
     try
         if mgr.mode == MPI_ON_WORKERS
@@ -129,7 +132,7 @@ function launch(mgr::MPIManager, params::Dict,
                 println("Try again with a different instance of MPIManager.")
                 throw(ErrorException("Reuse of MPIManager is not allowed."))
             end
-            cookie = string(":cookie_",Base.cluster_cookie())
+            cookie = string(":cookie_",Distributed.cluster_cookie())
             setup_cmds = `using MPI\;MPI.setup_worker'('$(getipaddr().host),$(mgr.port),$cookie')'`
             mpi_cmd = `$(mgr.mpirun_cmd) $(params[:exename]) -e $(Base.shell_escape(setup_cmds))`
             open(detach(mpi_cmd))
@@ -156,7 +159,7 @@ function launch(mgr::MPIManager, params::Dict,
                         config.io = io
                         # Add config to the correct slot so that MPI ranks and
                         # Julia pids are in the same order
-                        rank = Base.deserialize(io)
+                        rank = Compat.Serialization.deserialize(io)
                         idx = mgr.mode == MPI_ON_WORKERS ? rank+1 : rank
                         configs[idx] = config
                     end
@@ -192,7 +195,7 @@ function setup_worker(host, port, cookie)
 
     # Send our MPI rank to the manager
     rank = MPI.Comm_rank(MPI.COMM_WORLD)
-    Base.serialize(io, rank)
+    Compat.Serialization.serialize(io, rank)
 
     # Hand over control to Base
     if cookie == nothing
@@ -206,7 +209,7 @@ function setup_worker(host, port, cookie)
 end
 
 # Manage a worker (e.g. register / deregister it)
-function manage(mgr::MPIManager, id::Integer, config::WorkerConfig, op::Symbol)
+function Distributed.manage(mgr::MPIManager, id::Integer, config::WorkerConfig, op::Symbol)
     if op == :register
         # Retrieve MPI rank from worker
         # TODO: Why is this necessary? The workers already sent their rank.
@@ -284,7 +287,7 @@ function start_send_event_loop(mgr::MPIManager, rank::Int)
         # quite expensive when there are many workers. Design something better.
         # For example, instead of maintaining two streams per worker, provide
         # only abstract functions to write to / read from these streams.
-        @schedule begin
+        @async begin
             rr = MPI.Comm_rank(mgr.comm)
             reqs = MPI.Request[]
             while !isready(mgr.initiate_shutdown)
@@ -334,7 +337,7 @@ function start_main_loop(mode::TransportMode=TCP_TRANSPORT_ALL;
             # Send connection information to all workers
             # TODO: Use Bcast
             for j in 1:size-1
-                cookie = VERSION >= v"0.5.0-dev+4047" ? Base.cluster_cookie() : nothing
+                cookie = VERSION >= v"0.5.0-dev+4047" ? Distributed.cluster_cookie() : nothing
                 MPI.send((getipaddr().host, mgr.port, cookie), j, 0, comm)
             end
             # Tell Base about the workers
@@ -360,9 +363,9 @@ function start_main_loop(mode::TransportMode=TCP_TRANSPORT_ALL;
 
             # Send the cookie over. Introduced in v"0.5.0-dev+4047". Irrelevant under MPI
             # transport, but need it to satisfy the changed protocol.
-            MPI.bcast(Base.cluster_cookie(), 0, comm)
+            MPI.bcast(Distributed.cluster_cookie(), 0, comm)
             # Start event loop for the workers
-            @schedule receive_event_loop(mgr)
+            @async receive_event_loop(mgr)
             # Tell Base about the workers
             addprocs(mgr)
             return mgr
@@ -493,7 +496,7 @@ macro mpi_do(mgr, expr)
 end
 
 # All managed Julia processes
-procs(mgr::MPIManager) = sort(keys(mgr.j2mpi))
+Distributed.procs(mgr::MPIManager) = sort(keys(mgr.j2mpi))
 
 # All managed MPI ranks
 mpiprocs(mgr::MPIManager) = sort(keys(mgr.mpi2j))