Merge pull request #212 from JuliaParallel/fbot/deps

Fix deprecations

Author: lcw

examples/02-broadcast-impl.jl

@@ -15,7 +15,7 @@ function do_broadcast()
     if MPI.Comm_rank(comm) == root
         A = [1:N;] * (1.0 + im*2.0)
     else
-        A = Array(Complex128, N)
+        A = Array(ComplexF64, N)
     end
 
     MPI.Bcast!(A,length(A), root, comm)

src/MPI.jl

@@ -4,7 +4,7 @@ module MPI
 
 using Compat
 
-using Compat.Libdl
+using Libdl
 
 @static if Compat.Sys.iswindows()
     const depfile = "win_mpiconstants.jl"
@@ -50,8 +50,8 @@ function __init__()
                      UInt64 => MPI_INTEGER8, # => MPI_UINT64_T,
                      Float32 => MPI_REAL4,
                      Float64 => MPI_REAL8,
-                     Compat.ComplexF32 => MPI_COMPLEX8,
-                     Compat.ComplexF64 => MPI_COMPLEX16)
+                     ComplexF32 => MPI_COMPLEX8,
+                     ComplexF64 => MPI_COMPLEX16)
         mpitype_dict[T] = mpiT
         mpitype_dict_inverse[mpiT] = T
     end

src/cman.jl

@@ -344,7 +344,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" ? Distributed.cluster_cookie() : nothing
+                cookie = Distributed.cluster_cookie()
                 MPI.send((mgr.ip, mgr.port, cookie), j, 0, comm)
             end
             # Tell Base about the workers

src/mpi-base.jl

@@ -103,7 +103,7 @@ mutable struct Info
         newinfo = Ref{Cint}()
         ccall(MPI_INFO_CREATE, Nothing, (Ptr{Cint}, Ref{Cint}), newinfo, 0)
         info=new(newinfo[])
-        @compat finalizer(info) do x
+        finalizer(info) do x
           ccall(MPI_INFO_FREE, Nothing, (Ref{Cint}, Ref{Cint}), x.val, 0)
           x.val = MPI_INFO_NULL
         end
@@ -206,7 +206,7 @@ Indicate that MPI.Finalize() should be called automatically at exit, if not call
 The global variable `FINALIZE_ATEXIT` indicates if this function was called.
 """
 function finalize_atexit()
-    if Compat.Sys.iswindows()
+    if Sys.iswindows()
         error("finalize_atexit is not supported on Windows")
     end
     ret = ccall(:install_finalize_atexit_hook, Cint, ())
@@ -1078,5 +1078,5 @@ elseif sizeof(CComm) == sizeof(Cint)
       Win(reinterpret(Cint, cwin))
     end
 else
-    warn("No MPI_Comm_c2f found - conversion to/from MPI.CComm will not work")
+    @warn("No MPI_Comm_c2f found - conversion to/from MPI.CComm will not work")
 end

src/mpi-op.jl

@@ -42,11 +42,7 @@ function user_op(opfunc::Function)
         # of some sort so that this initialization only occurs once.
         # To do when native threading in Julia stabilizes (and is documented).
         resize!(_user_functions, nthreads())
-        if VERSION < v"0.7.0-DEV.4762"
-          user_function = cfunction(_mpi_user_function, Nothing, (Ptr{Nothing}, Ptr{Nothing}, Ptr{Cint}, Ptr{Cint}))
-        else
-          user_function = @cfunction(_mpi_user_function, Nothing, (Ptr{Nothing}, Ptr{Nothing}, Ptr{Cint}, Ptr{Cint}))
-        end
+        user_function = @cfunction(_mpi_user_function, Nothing, (Ptr{Nothing}, Ptr{Nothing}, Ptr{Cint}, Ptr{Cint}))
         opnum = Ref{Cint}()
         ccall(MPI_OP_CREATE, Nothing, (Ptr{Nothing}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
              user_function, false, opnum, 0)

test/runtests.jl

@@ -1,5 +1,5 @@
 using MPI
-using Compat.Test
+using Test
 
 using Compat
 import Compat.String
@@ -21,7 +21,7 @@ juliafiles = ["test_cman_julia.jl"]
 singlefiles = ["test_spawn.jl"]
 
 excludedfiles = []
-if Compat.Sys.iswindows()
+if Sys.iswindows()
     push!(excludedfiles, "test_info.jl")
     push!(excludedfiles, "test_onesided.jl")
     push!(excludedfiles, "test_finalize_atexit.jl")
@@ -60,11 +60,11 @@ function runtests()
             else
                 run(`mpiexec $extra_args -n $nprocs $exename --code-coverage=$coverage_opt $(joinpath(testdir, f))`)
             end
-            Base.with_output_color(:green,Compat.stdout) do io
+            Base.with_output_color(:green,stdout) do io
                 println(io,"\tSUCCESS: $f")
             end
         catch ex
-            Base.with_output_color(:red,Compat.stderr) do io
+            Base.with_output_color(:red,stderr) do io
                 println(io,"\tError: $(joinpath(testdir, f))")
                 showerror(io,ex,backtrace())
             end

test/spawned_worker.jl

@@ -1,4 +1,4 @@
-using Compat.Test
+using Test
 using MPI
 
 MPI.Init()

test/test_allgather.jl

@@ -1,4 +1,4 @@
-using Compat.Test
+using Test
 using MPI
 
 MPI.Init()

test/test_allgatherv.jl

@@ -1,4 +1,4 @@
-using Compat.Test
+using Test
 using MPI
 
 MPI.Init()

test/test_allreduce.jl

@@ -1,4 +1,4 @@
-using Compat.Test
+using Test
 using MPI
 
 MPI.Init()