Merge pull request #233 from tkonolige/fix_diag_indices

Fix DiagonalIndices when sparse matrix indices are not Int64.

Author: haampie

src/stationary_sparse.jl

@@ -12,8 +12,8 @@ struct DiagonalIndices{Tv, Ti <: Integer}
         diag = Vector{Ti}(undef, A.n)
 
         for col = 1 : A.n
-            r1 = A.colptr[col]
-            r2 = A.colptr[col + 1] - 1
+            r1 = Int(A.colptr[col])
+            r2 = Int(A.colptr[col + 1] - 1)
             r1 = searchsortedfirst(A.rowval, col, r1, r2, Base.Order.Forward)
             if r1 > r2 || A.rowval[r1] != col || iszero(A.nzval[r1])
                 throw(LinearAlgebra.SingularException(col))

test/cg.jl

@@ -58,7 +58,7 @@ end
     rmul!(rhs, inv(norm(rhs)))
     tol = 1e-5
 
-    @testset "Matrix" begin
+    @testset "SparseMatrixCSC{$T, $Ti}" for T in (Float64, Float32), Ti in (Int64, Int32)
         xCG = cg(A, rhs; tol=tol, maxiter=100)
         xJAC = cg(A, rhs; Pl=P, tol=tol, maxiter=100)
         @test norm(A * xCG - rhs) ≤ tol

test/gmres.jl

@@ -33,7 +33,7 @@ n = 10
     @test norm(A * x - b) / norm(b) ≤ tol
 end
 
-@testset "SparseMatrixCSC{$T}" for T in (Float64, ComplexF64)
+@testset "SparseMatrixCSC{$T, $Ti}" for T in (Float64, ComplexF64), Ti in (Int64, Int32)
     A = sprand(T, n, n, 0.5) + I
     b = rand(T, n)
     F = lu(A)

test/idrs.jl

@@ -29,7 +29,7 @@ Random.seed!(1234567)
     end
 end
 
-@testset "SparseMatrixCSC{$T}" for T in (Float64, ComplexF64)
+@testset "SparseMatrixCSC{$T, $Ti}" for T in (Float64, ComplexF64), Ti in (Int64, Int32)
     A = sprand(T, n, n, 0.5) + n * I
     b = rand(T, n)
     tol = √eps(real(T))

test/minres.jl

@@ -51,7 +51,7 @@ end
     @test hist.isconverged
 end
 
-@testset "SparseMatrixCSC{$T}" for T in (Float32, Float64, ComplexF32, ComplexF64)
+@testset "SparseMatrixCSC{$T, $Ti}" for T in (Float32, Float64, ComplexF32, ComplexF64), Ti in (Int64, Int32)
     A = let
         B = sprand(n, n, 2 / n)
         B + B' + I

test/stationary.jl

@@ -16,7 +16,7 @@ m = 6
 ω = 1.2
 Random.seed!(1234322)
 
-@testset "SparseMatrix{$T}" for T in (Float32, Float64, ComplexF32, ComplexF64)
+@testset "SparseMatrix{$T, $Ti}" for T in (Float32, Float64, ComplexF32, ComplexF64), Ti in (Int64, Int32)
     @testset "Sparse? $sparse" for sparse = (true, false)
         # Diagonally dominant
         if sparse