S should be a concrete type in the workspaces (#977)

* S should be a concrete type in the workspaces

* Fix a typo

* Fix the GPU tests

Author: amontoison

src/bicgstab.jl

@@ -131,8 +131,8 @@ kwargs_bicgstab = (:c, :M, :N, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose,
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
-    ktypeof(c) <: S || error("ktypeof(c) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
+    ktypeof(c) == S || error("ktypeof(c) must be equal to $S")
 
     # Set up workspace.
     allocate_if(!MisI, solver, :t , S, solver.x)  # The length of t is n

src/bilq.jl

@@ -124,8 +124,8 @@ kwargs_bilq = (:c, :transfer_to_bicg, :M, :N, :ldiv, :atol, :rtol, :itmax, :time
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
-    ktypeof(c) <: S || error("ktypeof(c) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
+    ktypeof(c) == S || error("ktypeof(c) must be equal to $S")
 
     # Compute the adjoint of A, M and N
     Aᴴ = A'

src/bilqr.jl

@@ -119,8 +119,8 @@ kwargs_bilqr = (:transfer_to_bicg, :atol, :rtol, :itmax, :timemax, :verbose, :hi
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
-    ktypeof(c) <: S || error("ktypeof(c) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
+    ktypeof(c) == S || error("ktypeof(c) must be equal to $S")
 
     # Compute the adjoint of A
     Aᴴ = A'

src/block_gmres.jl

@@ -109,7 +109,7 @@ kwargs_block_gmres = (:M, :N, :ldiv, :restart, :reorthogonalization, :atol, :rto
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-matrix products."
-    ktypeof(B) <: SM || error("ktypeof(B) is not a subtype of $SM")
+    ktypeof(B) == SM || error("ktypeof(B) must be equal to $SM")
 
     # Set up workspace.
     allocate_if(!MisI  , solver, :Q , SM, solver.n, solver.p)

src/block_krylov_solvers.jl

@@ -42,15 +42,15 @@ mutable struct BlockMinresSolver{T,FC,SV,SM} <: BlockKrylovSolver{T,FC,SV,SM}
 end
 
 function BlockMinresSolver(m::Integer, n::Integer, p::Integer, SV::Type, SM::Type)
-  FC = eltype(SV)
-  T  = real(FC)
-  ΔX = SM(undef, 0, 0)
-  X  = SM(undef, n, p)
-  P  = SM(undef, 0, 0)
-  Q  = SM(undef, n, p)
-  C  = SM(undef, p, p)
-  D  = SM(undef, 2p, p)
-  Φ  = SM(undef, p, p)
+  FC   = eltype(SV)
+  T    = real(FC)
+  ΔX   = SM(undef, 0, 0)
+  X    = SM(undef, n, p)
+  P    = SM(undef, 0, 0)
+  Q    = SM(undef, n, p)
+  C    = SM(undef, p, p)
+  D    = SM(undef, 2p, p)
+  Φ    = SM(undef, p, p)
   Vₖ₋₁ = SM(undef, n, p)
   Vₖ   = SM(undef, n, p)
   wₖ₋₂ = SM(undef, n, p)
@@ -59,6 +59,8 @@ function BlockMinresSolver(m::Integer, n::Integer, p::Integer, SV::Type, SM::Typ
   Hₖ₋₁ = SM(undef, 2p, p)
   τₖ₋₂ = SV(undef, p)
   τₖ₋₁ = SV(undef, p)
+  SV = isconcretetype(SV) ? SV : typeof(τₖ₋₁)
+  SM = isconcretetype(SM) ? SM : typeof(X)
   stats = SimpleStats(0, false, false, false, T[], T[], T[], 0.0, "unknown")
   solver = BlockMinresSolver{T,FC,SV,SM}(m, n, p, ΔX, X, P, Q, C, D, Φ, Vₖ₋₁, Vₖ, wₖ₋₂, wₖ₋₁, Hₖ₋₂, Hₖ₋₁, τₖ₋₂, τₖ₋₁, false, stats)
   return solver
@@ -119,6 +121,8 @@ function BlockGmresSolver(m::Integer, n::Integer, p::Integer, SV::Type, SM::Type
   R  = SM[SM(undef, p, p) for i = 1 : div(memory * (memory+1), 2)]
   H  = SM[SM(undef, 2p, p) for i = 1 : memory]
   τ  = SV[SV(undef, p) for i = 1 : memory]
+  SV = isconcretetype(SV) ? SV : typeof(τ)
+  SM = isconcretetype(SM) ? SM : typeof(X)
   stats = SimpleStats(0, false, false, false, T[], T[], T[], 0.0, "unknown")
   solver = BlockGmresSolver{T,FC,SV,SM}(m, n, p, ΔX, X, W, P, Q, C, D, V, Z, R, H, τ, false, stats)
   return solver

src/block_minres.jl

@@ -101,7 +101,7 @@ kwargs_block_minres = (:M, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :his
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-matrix products."
-    ktypeof(B) <: SM || error("ktypeof(B) is not a subtype of $SM")
+    ktypeof(B) == SM || error("ktypeof(B) must be equal to $SM")
 
     # Set up workspace.
     Vₖ₋₁, Vₖ = solver.Vₖ₋₁, solver.Vₖ

src/car.jl

@@ -113,7 +113,7 @@ kwargs_car = (:M, :ldiv, :atol, :rtol, :itmax, :timemax, :verbose, :history, :ca
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
 
     # Set up workspace.
     allocate_if(!MisI, solver, :Mu, S, solver.x)  # The length of Mu is n

src/cg.jl

@@ -123,7 +123,7 @@ kwargs_cg = (:M, :ldiv, :radius, :linesearch, :atol, :rtol, :itmax, :timemax, :v
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
 
     # Set up workspace.
     allocate_if(!MisI, solver, :z, S, solver.x)  # The length of z is n

src/cg_lanczos.jl

@@ -118,7 +118,7 @@ kwargs_cg_lanczos = (:M, :ldiv, :check_curvature, :atol, :rtol, :itmax, :timemax
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
 
     # Set up workspace.
     allocate_if(!MisI, solver, :v, S, solver.x)  # The length of v is n

src/cg_lanczos_shift.jl

@@ -114,7 +114,7 @@ kwargs_cg_lanczos_shift = (:M, :ldiv, :check_curvature, :atol, :rtol, :itmax, :t
 
     # Check type consistency
     eltype(A) == FC || @warn "eltype(A) ≠ $FC. This could lead to errors or additional allocations in operator-vector products."
-    ktypeof(b) <: S || error("ktypeof(b) is not a subtype of $S")
+    ktypeof(b) == S || error("ktypeof(b) must be equal to $S")
 
     # Set up workspace.
     allocate_if(!MisI, solver, :v, S, solver.Mv)  # The length of v is n