Pardiso parameter handling

Author: j-fu

Project.toml

@@ -1,7 +1,7 @@
 name = "ExtendableSparse"
 uuid = "95c220a8-a1cf-11e9-0c77-dbfce5f500b3"
 authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>"]
-version = "0.6.2"
+version = "0.6.3"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

src/pardiso_lu.jl

@@ -6,9 +6,9 @@ mutable struct PardisoLU{Tv, Ti} <: AbstractPardisoLU{Tv,Ti}
     phash::UInt64
 end
 
-function PardisoLU{Tv,Ti}(;iparm=nothing,dparm=nothing,matrixtype=nothing) where {Tv,Ti}
+function PardisoLU{Tv,Ti}(;iparm=nothing,dparm=nothing,mtype=nothing) where {Tv,Ti}
     fact=PardisoLU{Tv,Ti}(nothing,Pardiso.PardisoSolver(),0)
-    default_initialize!(fact,iparm,dparm,matrixtype)
+    default_initialize!(fact,iparm,dparm,mtype)
 end
 
 """
@@ -17,16 +17,16 @@ PardisoLU(;valuetype=Float64,
            indextype=Int64,
            iparm::Vector, 
            dparm::Vector, 
-           matrixtype=Int)
+           mtype::Int)
 
-PardisoLU(matrix; iparm,dparm,matrixtype)
+PardisoLU(matrix; iparm,dparm,mtype)
 ```
 
 LU factorization based on pardiso. For using this, you need to issue `using Pardiso`
 and have the pardiso library from  [pardiso-project.org](https://pardiso-project.org) 
 [installed](https://github.com/JuliaSparse/Pardiso.jl#pardiso-60).
 
-The optional keyword arguments `matrixtype`, `iparm`  and `dparm` are 
+The optional keyword arguments `mtype`, `iparm`  and `dparm` are 
 (Pardiso internal parameters)[https://github.com/JuliaSparse/Pardiso.jl#readme].
 
 Forsetting them, one can also access the `PardisoSolver` e.g. like
@@ -46,9 +46,9 @@ mutable struct MKLPardisoLU{Tv, Ti} <: AbstractPardisoLU{Tv,Ti}
     phash::UInt64
 end
 
-function MKLPardisoLU{Tv,Ti}(;iparm=nothing,matrixtype=nothing) where {Tv,Ti}
+function MKLPardisoLU{Tv,Ti}(;iparm=nothing,mtype=nothing) where {Tv,Ti}
     fact=MKLPardisoLU{Tv,Ti}(nothing,Pardiso.MKLPardisoSolver(),0)
-    default_initialize!(fact, iparm,nothing,matrixtype)
+    default_initialize!(fact, iparm,nothing,mtype)
 end
 
 
@@ -57,15 +57,15 @@ end
 MKLPardisoLU(;valuetype=Float64, 
            indextype=Int64,
            iparm::Vector, 
-           matrixtype=Int)
+           mtype::Int)
 
-MKLPardisoLU(matrix; iparm, matrixtype)
+MKLPardisoLU(matrix; iparm, mtype)
 ```
 
 LU factorization based on pardiso. For using this, you need to issue `using Pardiso`.
 This version  uses the early 2000's fork in Intel's MKL library.
 
-The optional keyword arguments `matrixtype` and `iparm`  are  
+The optional keyword arguments `mtype` and `iparm`  are  
 (Pardiso internal parameters)[https://github.com/JuliaSparse/Pardiso.jl#readme].
 
 For setting them you can also access the `PardisoSolver` e.g. like
@@ -79,13 +79,13 @@ MKLPardisoLU(;valuetype::Type=Float64, indextype::Type=Int64,kwargs...)=MKLPardi
 
 
 ##########################################################################################
-function default_initialize!(fact::AbstractPardisoLU{Tv,Ti}, iparm,dparm,matrixtype) where {Tv, Ti}
-    if !isnothing(matrixtype)
-        my_matrixtype=matrixtype
+function default_initialize!(fact::AbstractPardisoLU{Tv,Ti}, iparm,dparm,mtype) where {Tv, Ti}
+    if !isnothing(mtype)
+        my_mtype=mtype
     elseif Tv<:Complex
-        my_matrixtype=Pardiso.COMPLEX_NONSYM
+        my_mtype=Pardiso.COMPLEX_NONSYM
     else
-        my_matrixtype=Pardiso.REAL_NONSYM
+        my_mtype=Pardiso.REAL_NONSYM
     end
 
     Pardiso.set_matrixtype!(fact.ps,Pardiso.REAL_NONSYM)

test/runtests.jl

@@ -370,6 +370,10 @@ end
     @test test_lu2(10,10,10,lufac=MKLPardisoLU())
     @test test_lu2(25,40,1,lufac=MKLPardisoLU())
     @test test_lu2(1000,1,1,lufac=MKLPardisoLU())
+
+    @test test_lu2(10,10,10,lufac=MKLPardisoLU(mtype=2))
+    @test test_lu2(25,40,1,lufac=MKLPardisoLU(mtype=2))
+    @test test_lu2(1000,1,1,lufac=MKLPardisoLU(mtype=2))
 end
 
 
@@ -382,6 +386,11 @@ if Pardiso.PARDISO_LOADED[]
         @test test_lu2(10,10,10,lufac=PardisoLU())
         @test test_lu2(25,40,1,lufac=PardisoLU())
         @test test_lu2(1000,1,1,lufac=PardisoLU())
+
+        @test test_lu2(10,10,10,lufac=PardisoLU(mtype=2))
+        @test test_lu2(25,40,1,lufac=PardisoLU(mtype=2))
+        @test test_lu2(1000,1,1,lufac=PardisoLU(mtype=2))
+
     end
 end