FemtoCleaner upto julia 0.7

Author: Dae Woo Kim

src/RegisterDriver.jl

@@ -1,5 +1,3 @@
-__precompile__()
-
 module RegisterDriver
 
 using Images, JLD, HDF5, StaticArrays, Formatting
@@ -183,11 +181,11 @@ function initialize_jld!(dsets, file, mon, fs, n)
     have_unpackable
 end
 
-function nicehdf5{T<:StaticArray}(v::Union{Array{T},SharedArray{T}})
+function nicehdf5(v::Union{Array{T},SharedArray{T}}) where T<:StaticArray
     nicehdf5(reinterpret(eltype(T), sdata(v), (size(eltype(v))..., size(v)...)))
 end
 
-function nicehdf5{T<:NumDenom}(v::Union{Array{T},SharedArray{T}})
+function nicehdf5(v::Union{Array{T},SharedArray{T}}) where T<:NumDenom
     nicehdf5(reinterpret(eltype(T), sdata(v), (2, size(v)...)))
 end
 
@@ -220,7 +218,7 @@ Gaussian filters of width `sigmalp` (for the low-pass) and `sigmahp`
 (for the high-pass).  You can pass `sigmalp=zeros(n)` to skip low-pass
 filtering, and `sigmahp=fill(Inf, n)` to skip high-pass filtering.
 """
-type PreprocessSNF  # Shot-noise filtered
+mutable struct PreprocessSNF  # Shot-noise filtered
     bias::Float32
     sigmalp::Vector{Float32}
     sigmahp::Vector{Float32}
@@ -229,7 +227,7 @@ end
 
 function preprocess(pp::PreprocessSNF, A::AbstractArray)
     Af = sqrt_subtract_bias(A, pp.bias)
-    imfilter(highpass(Af, pp.sigmahp), KernelFactors.IIRGaussian((pp.sigmalp...)), NA())
+    imfilter(highpass(Af, pp.sigmahp), KernelFactors.IIRGaussian((pp.sigmalp...,)), NA())
 end
 (pp::PreprocessSNF)(A::AbstractArray) = preprocess(pp, A)
 (pp::PreprocessSNF)(A::ImageMeta) = shareproperties(A, pp(data(A)))

test/WorkerDummy.jl

@@ -10,9 +10,9 @@ export Alg1, Alg2, Alg3
 # Dispatch on the algorithm used to perform registration
 # Each algorithm has a container it uses for storage and communication
 # with the driver process
-@compat abstract type Alg <: AbstractWorker end
+abstract type Alg <: AbstractWorker end
 
-type Alg1{A<:AbstractArray} <: Alg
+mutable struct Alg1{A<:AbstractArray} <: Alg
     fixed::A
     λ::Float64
     workerpid::Int
@@ -21,17 +21,17 @@ function Alg1(fixed, λ; pid=1)
     Alg1(maybe_sharedarray(fixed, pid), λ, pid)
 end
 
-type Alg2{A<:AbstractArray,V<:AbstractVector,M<:AbstractMatrix} <: Alg
+mutable struct Alg2{A<:AbstractArray,V<:AbstractVector,M<:AbstractMatrix} <: Alg
     fixed::A
     tform::V
     u0::M
     workerpid::Int
 end
-function Alg2{T}(fixed, ::Type{T}, sz; pid=1)
+function Alg2(fixed, ::Type{T}, sz; pid=1) where T
     Alg2(maybe_sharedarray(fixed, pid), maybe_sharedarray(T, (12,), pid), maybe_sharedarray(T, sz, pid), pid)
 end
 
-type Alg3 <: Alg
+mutable struct Alg3 <: Alg
     string::String
     workerpid::Int
 end
@@ -47,7 +47,7 @@ end
 
 function worker(algorithm::Alg2, moving, tindex, mon)
     # Do stuff to set tform
-    tform = linspace(1,12,12)+tindex
+    tform = range(1, stop=12, length=12)+tindex
     monitor!(mon, :tform, tform)
     # Do more computations...
     monitor!(mon, :u0, zeros(size(algorithm.u0))-tindex)

test/runtests.jl

@@ -1,22 +1,21 @@
 driverprocs = addprocs(2)
 
 # Work around julia #3674
-using Images, JLD, Base.Test
+using Images, JLD, Test
 using BlockRegistration, BlockRegistrationScheduler
 using RegisterDriver, RegisterWorkerShell
 @sync for p in driverprocs
     @spawnat p eval(quote
-        using Images, JLD, Base.Test
+        using Images, JLD, Test
         using BlockRegistrationScheduler, RegisterDriver, RegisterWorkerShell
     end)
 end
 
-push!(LOAD_PATH, splitdir(@__FILE__)[1])
-using WorkerDummy
+include("WorkerDummy.jl")
+using .WorkerDummy
 for p in driverprocs
-    remotecall_fetch(eval, p, :(using WorkerDummy))  # workaround #3674 if this is re-run
+    remotecall_fetch(eval, p, :(include("WorkerDummy.jl"); using .WorkerDummy))  # workaround #3674 if this is re-run
 end
-pop!(LOAD_PATH)
 
 workdir = tempname()
 mkdir(workdir)
@@ -40,7 +39,7 @@ fn = joinpath(workdir, "file2.jld")
 driver(fn, alg, img, mon)
 tform = JLD.load(fn, "tform")
 u0    = JLD.load(fn, "u0")
-@test tform[:,4] == collect(linspace(1,12,12)+4)
+@test tform[:,4] == collect(range(1, stop=12, length=12)+4)
 @test u0[:,:,2] == fill(-2,(3,3))
 rm(fn)