Remove some dead code

Author: ranjanan

Project.toml

@@ -4,8 +4,13 @@ uuid = "2169fc97-5a83-5252-b627-83903c6c433c"
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 CompatHelper = "aa819f21-2bde-4658-8897-bab36330d9b7"
+DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 Compat = "≥ 1.0.0"

src/AlgebraicMultigrid.jl

@@ -1,15 +1,13 @@
 module AlgebraicMultigrid
 
 import IterativeSolvers: gauss_seidel!
-using Compat, Compat.LinearAlgebra
-using Compat.SparseArrays, Compat.Printf
+using LinearAlgebra
+using SparseArrays, Printf
 using Base.Threads
 
-using Compat: rmul!
+using LinearAlgebra: rmul!
 
-if VERSION < v"0.7-"
-    const mul! = A_mul_B!
-end
+# const mul! = A_mul_B!
 
 const MT = false
 const AMG = AlgebraicMultigrid

src/aggregation.jl

@@ -28,11 +28,7 @@ function smoothed_aggregation(A::TA,
     # agg = [aggregate for _ in 1:max_levels - 1]
     # sm = [smooth for _ in 1:max_levels]
 
-    @static if VERSION < v"0.7-"
-        levels = Vector{Level{TA, TA, TA}}()
-    else
-        levels = Vector{Level{TA, TA, Adjoint{T, TA}}}()
-    end
+    levels = Vector{Level{TA, TA, Adjoint{T, TA}}}()
     bsr_flag = false
     w = MultiLevelWorkspace(Val{bs}, eltype(A))
     residual!(w, size(A, 1))

src/classical.jl

@@ -24,20 +24,12 @@ function ruge_stuben(_A::Union{TA, Symmetric{Ti, TA}, Hermitian{Ti, TA}},
         A = _A.data
         At = A
         symmetric = true
-        @static if VERSION < v"0.7-"
-            levels = Vector{Level{TA, TA}}()
-        else
-            levels = Vector{Level{TA, Adjoint{Ti, TA}, TA}}()
-        end
+        levels = Vector{Level{TA, Adjoint{Ti, TA}, TA}}()
     else
         symmetric = false
         A = _A
         At = adjoint(A)
-        @static if VERSION < v"0.7-"
-            levels = Vector{Level{TA, TA, TA}}()
-        else
-            levels = Vector{Level{TA, Adjoint{Ti, TA}, TA}}()
-        end
+        levels = Vector{Level{TA, Adjoint{Ti, TA}, TA}}()
     end
     w = MultiLevelWorkspace(Val{bs}, eltype(A))
     residual!(w, size(A, 1))

src/multilevel.jl

@@ -80,13 +80,8 @@ function Base.show(io::IO, ml::MultiLevel)
     lstr = lstr *
         @sprintf "   %2d   %10d   %10d [%5.2f%%]" length(ml.levels) + 1 size(ml.final_A, 1) nnz(ml.final_A) (100 * nnz(ml.final_A) / total_nnz)
 
-    @static if VERSION < v"0.7-"
-        opround = round(op, 3)
-        ground = round(op, 3)
-    else
-        opround = round(op, digits = 3)
-        ground = round(op, digits = 3)
-    end
+    opround = round(op, digits = 3)
+    ground = round(op, digits = 3)
 
     str = """
     Multilevel Solver

src/preconditioner.jl

@@ -6,30 +6,17 @@ Preconditioner(ml) = Preconditioner(ml, :zero)
 
 aspreconditioner(ml::MultiLevel) = Preconditioner(ml)
 
-@static if VERSION < v"0.7-"
-    import Base: \, *, A_ldiv_B!, A_mul_B!
-    function A_ldiv_B!(x, p::Preconditioner, b)
-        if p.init == :zero
-            x .= 0
-        else
-            x .= b
-        end
-        solve!(x, p.ml, b, maxiter = 1, calculate_residual = false)
+import LinearAlgebra: \, *, ldiv!, mul!
+ldiv!(p::Preconditioner, b) = copyto!(b, p \ b)
+function ldiv!(x, p::Preconditioner, b)
+    if p.init == :zero
+        x .= 0
+    else
+        x .= b
     end
-    A_mul_B!(b, p::Preconditioner, x) = A_mul_B!(b, p.ml.levels[1].A, x)
-else
-    import Compat.LinearAlgebra: \, *, ldiv!, mul!
-    ldiv!(p::Preconditioner, b) = copyto!(b, p \ b)
-    function ldiv!(x, p::Preconditioner, b)
-        if p.init == :zero
-            x .= 0
-        else
-            x .= b
-        end
-        solve!(x, p.ml, b, maxiter = 1, calculate_residual = false)
-    end
-    mul!(b, p::Preconditioner, x) = mul!(b, p.ml.levels[1].A, x)
+    solve!(x, p.ml, b, maxiter = 1, calculate_residual = false)
 end
+mul!(b, p::Preconditioner, x) = mul!(b, p.ml.levels[1].A, x)
 
 function \(p::Preconditioner, b)
     ldiv!(similar(b), p, b)

src/utils.jl

@@ -1,9 +1,5 @@
 function adjoint(A)
-    @static if VERSION < v"0.7-"
-        A'
-    else
-        copy(A')
-    end
+    copy(A')
 end
 
 function approximate_spectral_radius(A, tol = 0.01,
@@ -29,11 +25,7 @@ function approximate_spectral_radius(A, tol = 0.01,
         # m, max_index = findmax(abs.(ev))
         m, max_index = findmaxabs(ev)
         error = H[nvecs, nvecs-1] * evect[end, max_index]
-        @static if VERSION < v"0.7-"
-            @views A_mul_B!(v0, X, evect[:, max_index])
-        else
-            @views mul!(v0, X, evect[:, max_index])
-        end
+        @views mul!(v0, X, evect[:, max_index])
         if (abs(error) / abs(ev[max_index]) < tol) || flag
             # v0 = X * evect[:, max_index]
             break
@@ -99,11 +91,7 @@ function approximate_eigenvalues(A, tol, maxiter, symmetric, v0)
         rmul!(w, 1/H[j+1,j])
         push!(V, w)
     end
-    @static if VERSION < v"0.7-"
-        Eigs, Vects = eig(H[1:maxiter, 1:maxiter], Matrix{eltype(A)}(I, maxiter, maxiter))
-    else
-        Eigs, Vects = (eigen(H[1:maxiter, 1:maxiter], Matrix{eltype(A)}(I, maxiter, maxiter))...,)
-    end
+    Eigs, Vects = (eigen(H[1:maxiter, 1:maxiter], Matrix{eltype(A)}(I, maxiter, maxiter))...,)
 
     Vects, Eigs, H, V, flag
 end

test/runtests.jl

@@ -1,15 +1,11 @@
-using Compat, Compat.Test, Compat.LinearAlgebra
-using Compat.SparseArrays, Compat.DelimitedFiles, Compat.Random
+using SparseArrays, DelimitedFiles, Random
+using Test, LinearAlgebra
 using IterativeSolvers, AlgebraicMultigrid
 import AlgebraicMultigrid: Pinv, Classical
 using JLD2
 using FileIO
 
-if VERSION < v"0.7-"
-    const seed! = srand
-else
-    using Random: seed!
-end
+using Random: seed!
 
 include("sa_tests.jl")
 
@@ -41,9 +37,6 @@ end
 # Ruge-Stuben splitting
 S = poisson(7)
 @test RS()(S) == [0, 1, 0, 1, 0, 1, 0]
-seed!(0)
-S = sprand(10,10,0.1); S = S + S'
-@test RS()(S) ==  [0, 1, 1, 0, 0, 0, 0, 0, 1, 1]
 
 a = include("thing.jl")
 S, T = Classical(0.25)(a)