Merge pull request #265 from JuliaParallel/sb/no-compat

remove Compat

Author: lcw

Project.toml

@@ -5,12 +5,18 @@ version = "0.9.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"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 julia = "1"
+
+[extras]
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test", "LinearAlgebra"]

src/MPI.jl

@@ -1,16 +1,12 @@
-VERSION < v"0.7.0-beta2.199" && __precompile__()
-
 module MPI
 
-using Compat
-
-using Libdl
+using Libdl, Serialization
 
-@static if Compat.Sys.iswindows()
+@static if Sys.iswindows()
     const depfile = "win_mpiconstants.jl"
 end
 
-@static if Compat.Sys.isunix()
+@static if 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
@@ -48,7 +44,7 @@ function recordDataType(T::DataType, mpiT::Cint; force=false)
 end
 
 function __init__()
-    @static if Compat.Sys.isunix()
+    @static if 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

src/cman.jl

@@ -1,9 +1,8 @@
 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, IPv4, getsockname, getaddrinfo
+using Distributed
+import Sockets: connect, listenany, accept, IPv4, getsockname, getaddrinfo
 
 
 
@@ -173,7 +172,7 @@ function Distributed.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 = Compat.Serialization.deserialize(io)
+                        rank = Serialization.deserialize(io)
                         idx = mgr.mode == MPI_ON_WORKERS ? rank+1 : rank
                         configs[idx] = config
                     end
@@ -209,7 +208,7 @@ function setup_worker(host, port, cookie)
 
     # Send our MPI rank to the manager
     rank = MPI.Comm_rank(MPI.COMM_WORLD)
-    Compat.Serialization.serialize(io, rank)
+    Serialization.serialize(io, rank)
 
     # Hand over control to Base
     if cookie == nothing

src/mpi-base.jl

@@ -1,5 +1,3 @@
-using Compat
-
 const MPIDatatype = Union{Char,
                             Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64,
                             UInt64,
@@ -152,13 +150,13 @@ const UNDEFINED  = Int(MPI_UNDEFINED)
 
 function serialize(x)
     s = IOBuffer()
-    Compat.Serialization.serialize(s, x)
+    Serialization.serialize(s, x)
     take!(s)
 end
 
 function deserialize(x)
     s = IOBuffer(x)
-    Compat.Serialization.deserialize(s)
+    Serialization.deserialize(s)
 end
 
 const REFCOUNT = Threads.Atomic{Int}(1)

src/mpi-op.jl

@@ -1,17 +1,8 @@
-using Compat
+import Base.Threads: nthreads, threadid
 
 # Implement user-defined MPI reduction operations, by passing Julia
 # functions as callbacks to MPI.
 
-# for defining thread-local variables; can use Compat
-# once JuliaLang/Compat.jl#223 is resolved.
-if isdefined(Base, :Threads)
-    import Base.Threads: nthreads, threadid
-else
-    nthreads() = 1
-    threadid() = 1
-end
-
 # Unfortunately, MPI_Op_create takes a function that does not accept
 # a void* "thunk" parameter, making it impossible to fully simulate
 # a closure.  So, we have to use a global variable instead.   (Since

test/runtests.jl

@@ -1,10 +1,6 @@
 using MPI
 using Test
 
-using Compat
-import Compat.String
-import Compat.Sys: BINDIR
-
 # Code coverage command line options; must correspond to src/julia.h
 # and src/ui/repl.c
 const JL_LOG_NONE = 0
@@ -32,20 +28,20 @@ end
 
 function runtests()
     nprocs = clamp(Sys.CPU_THREADS, 2, 4)
-    exename = joinpath(BINDIR, Base.julia_exename())
+    exename = joinpath(Sys.BINDIR, Base.julia_exename())
     testdir = dirname(@__FILE__)
     istest(f) = endswith(f, ".jl") && startswith(f, "test_")
     testfiles = sort(filter(istest, readdir(testdir)))
 
     extra_args = []
-    @static if !Compat.Sys.iswindows()
-      if Compat.occursin( "OpenRTE", Compat.open(f->read(f, String),`mpiexec --version`))
+    @static if !Sys.iswindows()
+      if occursin( "OpenRTE", open(f->read(f, String),`mpiexec --version`))
             push!(extra_args,"--oversubscribe")
         end
     end
 
     nfail = 0
-    Compat.printstyled("Running MPI.jl tests\n"; color=:white)
+    printstyled("Running MPI.jl tests\n"; color=:white)
     for f in testfiles
         if f ∈ excludedfiles
             println("Skipping disabled test $f")

test/test_basic.jl

@@ -1,4 +1,3 @@
-using Compat
 using Test
 using MPI
 

test/test_cman_julia.jl

@@ -1,11 +1,10 @@
-using Compat
 using Test
 using MPI
-using Compat.Distributed
+using Distributed
 
 # Start workers via `mpiexec` that communicate among themselves via MPI;
 # communicate with the workers via TCP
-if !Sys.iswindows() && Compat.occursin( "OpenRTE", Compat.open(f->read(f, String),`mpiexec --version`))
+if !Sys.iswindows() && occursin( "OpenRTE", open(f->read(f, String),`mpiexec --version`))
     mgr = MPI.MPIManager(np=4, mpirun_cmd=`mpiexec --oversubscribe -n 4`)
 else
     mgr = MPI.MPIManager(np=4)

test/test_datatype.jl

@@ -1,4 +1,3 @@
-using Compat
 using Test
 using MPI
 

test/test_onesided.jl

@@ -1,4 +1,3 @@
-using Compat
 using Test
 using MPI