Merge pull request #41 from JuliaParallel/anj/06

Ready for 0.6

Author: andreasnoack

.travis.yml

@@ -10,7 +10,7 @@ os:
   - linux
 
 julia:
-  - 0.5
+  - 0.6
   - nightly
 
 matrix:

REQUIRE

@@ -1,3 +1,3 @@
 julia 0.5
-Compat
+Compat 0.17
 DistributedArrays 0.2.0

extras/elpp.jl

@@ -29,7 +29,7 @@ finalize() = icxx"El::Finalize();"
 ### ElementalMatrix ###
 # Many of the definitions in Elemental are very similar which makes it easy to define methods for a common abstract type. However, we should be careful when calling into the library with e.g. @cxx or icxx because all leaf types might not implement the actual method.
 
-abstract ElementalMatrix{T} <: AbstractMatrix{T}
+@compat abstract type ElementalMatrix{T} <: AbstractMatrix{T} end
 
 _getindex(A::ElementalMatrix, i::ElInt, j::ElInt) = icxx"$(A.buf).Get($i, $j);"
 getindex(A::ElementalMatrix, i::Integer, j::Integer) = _getindex(A, ElInt(i - 1), ElInt(j - 1))
@@ -63,7 +63,7 @@ end
 svdvals(A::ElementalMatrix) = svdvals!(copy(A))
 
 ### AbstractDistMatrix ###
-abstract AbstractDistMatrix{T} <: ElementalMatrix{T}
+@compat abstract type AbstractDistMatrix{T} <: ElementalMatrix{T} end
 
 _resize!(A::AbstractDistMatrix, i::ElInt, j::ElInt) = icxx"$(A.buf).Resize($i, $j);"
 resize!(A::AbstractDistMatrix, i::Integer, j::Integer) = _resize!(A, ElInt(i), ElInt(j))
@@ -155,7 +155,7 @@ socp(A::DistSparseMatrix, G::DistSparseMatrix, b::DistMultiVec, c::DistMultiVec,
 
 using DistributedArrays
 function toback(A::DArray{Float64,2})
-    rs = Array(Any, size(A.chunks))
+    rs = Array{Any}(size(A.chunks))
     for p in eachindex(A.chunks)
         ind = A.indexes[p]
         rs[p] = remotecall(A.pids[p], () -> begin

src/core/types.jl

@@ -49,11 +49,11 @@ end
 
 using Base.LinAlg: BlasFloat, BlasReal, BlasComplex
 
-typealias ElElementType Union{ElInt,Float32,Float64,Complex64,Complex128}
+const ElElementType = Union{ElInt,Float32,Float64,Complex64,Complex128}
 
-typealias ElFloatType Union{Float32,Float64} # TODO: Maybe just use BlasReal here
+const ElFloatType   = Union{Float32,Float64} # TODO: Maybe just use BlasReal here
 
-abstract ElementalMatrix{T} <: AbstractMatrix{T}
+@compat abstract type ElementalMatrix{T} <: AbstractMatrix{T} end
 eltype{T}(A::ElementalMatrix{T}) = T
 
 # Error is handled in error.jl as an Exception

src/julia/darray.jl

@@ -5,7 +5,7 @@ type RemoteElementalMatrix
 end
 
 function toback{T<:BlasFloat,S<:StridedMatrix}(A::DArray{T,2,S})
-    rs = Array(Any, size(procs(A)))
+    rs = Array{Any}(size(procs(A)))
     @sync for p in eachindex(procs(A))
         ind = A.indexes[p]
         @async rs[p] = remotecall(procs(A)[p]) do
@@ -25,7 +25,7 @@ function toback{T<:BlasFloat,S<:StridedMatrix}(A::DArray{T,2,S})
 end
 
 function tofront(r::Base.Matrix)
-    tt = Array(Any, length(r))
+    tt = Array{Any}(length(r))
     for i = 1:length(r)
         tt[i] = remotecall(r[i].where, r[i]) do t
             typeof(fetch(t))
@@ -75,7 +75,7 @@ function (\){T<:BlasFloat,S}(A::DArray{T,2,S}, B::DArray{T,2,S})
     rA = toback(A)
     rB = toback(B)
     pidsAB = union(A.pids, B.pids)
-    rvals = Array(Any, length(pidsAB))
+    rvals = Vector{Any}(length(pidsAB))
     @sync for i = 1:length(pidsAB)
         @async rvals[i] = remotecall_wait(pidsAB[i], rA[i], rB[i]) do t1,t2
             solve!(fetch(t1), fetch(t2))
@@ -86,7 +86,7 @@ end
 
 function eigvals{T<:BlasFloat}(A::Hermitian{T,DArray{T,2,Array{T,2}}})
     rA = toback(A.data)
-    rvals = Array(Any, size(procs(A.data)))
+    rvals = Array{Any}(size(procs(A.data)))
     uplo = A.uplo == 'U' ? UPPER : LOWER
     @sync for i in eachindex(rvals)
         @async rvals[i] = remotecall_wait(rA[i].where, rA[i]) do t
@@ -98,7 +98,7 @@ end
 
 function svdvals{T<:BlasFloat}(A::DArray{T,2})
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for i in eachindex(rvals)
         @async rvals[i] = remotecall_wait(rA[i].where, rA[i]) do t
             svdvals(fetch(t))
@@ -109,7 +109,7 @@ end
 
 function inv!{T<:BlasFloat}(A::DArray{T,2})
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for j = 1:size(rvals, 2)
         for i = 1:size(rvals, 1)
             @async rvals[i,j] = remotecall_wait(t -> inverse!(fetch(t)), rA[i,j].where, rA[i,j])
@@ -122,7 +122,7 @@ inv{T<:BlasFloat}(A::DArray{T,2}) = inv!(copy(A))
 
 function logdet{T<:BlasFloat}(A::DArray{T,2})
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for i in eachindex(rvals)
         @async rvals[i] = remotecall_wait(rA[i].where, rA[i]) do t
             d = safeHPDDeterminant(Elemental.LOWER, fetch(t))
@@ -137,7 +137,7 @@ function spectralPortrait{T<:BlasReal}(A::DArray{T,2},
                                        imagSize::Integer,
                                        psCtrl::PseudospecCtrl{T}=PseudospecCtrl(T))
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for i in eachindex(rvals)
         @async rvals[i] = remotecall_wait(rA[i].where, rA[i]) do t
             spectralPortrait(fetch(t), ElInt(realSize), ElInt(imagSize), psCtrl)[1]
@@ -151,7 +151,7 @@ function spectralPortrait{T<:BlasReal}(A::DArray{Complex{T},2},
                                        imagSize::Integer,
                                        psCtrl::PseudospecCtrl{T}=PseudospecCtrl(T))
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for i in eachindex(rvals)
         @async rvals[i,j] = remotecall_wait(rA[i].where, rA[i]) do t
             spectralPortrait(fetch(t), ElInt(realSize), ElInt(imagSize), psCtrl)[1]
@@ -168,7 +168,7 @@ function spectralWindow{T<:BlasReal}(A::DArray{T,2},
                                      imagSize::Integer,
                                      psCtrl::PseudospecCtrl{T}=PseudospecCtrl(T))
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for i in eachindex(rvals)
         @async rvals[i] = remotecall_wait(rA[i].where, rA[i]) do t
             spectralWindow(fetch(t), center, realWidth, imagWidth,
@@ -186,7 +186,7 @@ function spectralWindow{T<:BlasReal}(A::DArray{Complex{T},2},
                                      imagSize::Integer,
                                      psCtrl::PseudospecCtrl{T}=PseudospecCtrl(T))
     rA = toback(A)
-    rvals = Array(Any, size(procs(A)))
+    rvals = Array{Any}(size(procs(A)))
     @sync for i in eachindex(rvals)
         @async rvals[i] = remotecall_wait(rA[i,j].where, rA[i]) do t
             spectralWindow(fetch(t), center, realWidth, imagWidth,
@@ -198,7 +198,7 @@ end
 
 function foxLi{T<:BlasComplex}(::Type{T}, n::Integer, ω::Real)
     sz = tuple(DistributedArrays.defaultdist((n,n), workers())...)
-    rvals = Array(Any, sz)
+    rvals = Array{Any}(sz)
     @sync for j = 1:size(rvals, 2), i = 1:size(rvals, 1)
         @async rvals[i,j] = remotecall_wait(workers()[sub2ind(sz, i, j)]) do
             A = Elemental.DistMatrix(T)

src/lapack_like/condense.jl

@@ -22,7 +22,7 @@ end
 immutable ElHessenberg{T,S<:ElementalMatrix} <: Factorization{T}
     factors::S
     τ::S
-    ElHessenberg(factors::ElementalMatrix{T}, τ::ElementalMatrix{T}) = new(factors, τ)
+    (::Type{ElHessenberg{T,S}}){T,S<:ElementalMatrix}(factors::ElementalMatrix{T}, τ::ElementalMatrix{T}) = new{T,S}(factors, τ)
 end
 
 ElHessenberg{T}(factors::ElementalMatrix{T}, τ::ElementalMatrix{T}) = ElHessenberg{T,typeof(factors)}(factors, τ)

src/lapack_like/factor.jl

@@ -1,4 +1,4 @@
-typealias RegSolveAlg Cuint
+const RegSolveAlg = Cuint
 
 const REG_SOLVE_FGMRES = RegSolveAlg(0)
 const REG_SOLVE_LGMRES = RegSolveAlg(1)

src/lapack_like/spectral.jl

@@ -1,6 +1,6 @@
 # Sign
 # TODO: Move this to ./funcs.jl
-typealias ElSignScaling Cuint
+const ElSignScaling = Cuint
 const SIGN_SCALE_NONE = ElSignScaling(0)
 const SIGN_SCALE_DET  = ElSignScaling(1)
 const SIGN_SCALE_FROB = ElSignScaling(2)
@@ -82,7 +82,7 @@ function SchurCtrl{T<:ElFloatType}(::Type{T};
 end
 
 # Pseueospectra
-typealias ElFileFormat Cuint
+const ElFileFormat  = Cuint
 const AUTO          = ElFileFormat(0)
 const ASCII         = ElFileFormat(1)
 const ASCII_MATLAB  = ElFileFormat(2)
@@ -140,7 +140,7 @@ function SnapshotCtrl(realSize=0,
         ElBool(itCounts))
 end
 
-typealias ElPseudospecNorm Cuint
+const ElPseudospecNorm = Cuint
 const PS_TWO_NORM = ElPseudospecNorm(0)
 const PS_ONE_NORM = ElPseudospecNorm(1)
 

src/mpi.jl

@@ -13,7 +13,7 @@ function __init__()
     if Libdl.dlsym_e(Libdl.dlopen(libEl, Libdl.RTLD_GLOBAL), :MPI_Get_library_version) == C_NULL
         const global MPIImpl = :MPICH2
     else
-        versionBuffer = Array(UInt8, 2800)
+        versionBuffer = Vector{UInt8}(2800)
         len = Cint[0]
         err = ccall((:MPI_Get_library_version, libEl), Cint, (Ptr{UInt8}, Ptr{Cint}), versionBuffer, len)
         versionString = String(versionBuffer[1:len[1]-1])

src/optimization/solvers.jl

@@ -1,11 +1,11 @@
 # Linear Programming
 # ==================
-typealias ElLPApproach Cuint
+const ElLPApproach = Cuint
 
 const LP_ADMM = ElLPApproach(0)
 const LP_MEHROTRA = ElLPApproach(1)
 
-typealias ElKKTSystem Cuint
+const ElKKTSystem = Cuint
 
 const FULL_KKT = ElKKTSystem(0)
 const AUGMENTED_KKT = ElKKTSystem(1)