compiles yay

Author: vpuri3

src/LinearSolve.jl

@@ -49,7 +49,7 @@ export LUFactorization, SVDFactorization, QRFactorization, GenericFactorization,
 export KrylovJL, KrylovJL_CG, KrylovJL_GMRES, KrylovJL_BICGSTAB, KrylovJL_MINRES,
        IterativeSolversJL, IterativeSolversJL_CG, IterativeSolversJL_GMRES,
        IterativeSolversJL_BICGSTAB, IterativeSolversJL_MINRES,
-       PardisoJL, PardisoJL_Default
+       PardisoJL
 export DefaultLinSolve
 
 end

src/wrappers.jl

@@ -313,11 +313,11 @@ end
 function PardisoJL(solver_type=Pardiso.nothing,)
 
     return PardisoJL(nthreads, solver_type, matrix_type, solve_phase,
-                     release_phase, setup_func)
+                     release_phase, iparm, dparm)
 end
 
 function init_cacheval(alg::PardisoJL, cache::LinearCache)
-    @unpack nthreads, solver_type, matrix_type
+    @unpack nthreads, solver_type, matrix_type, iparm, dparm = alg
 
     solver = Pardiso.PARDISO_LOADED[] ? PardisoSolver() : MKLPardisoSolver()
 
@@ -328,13 +328,13 @@ function init_cacheval(alg::PardisoJL, cache::LinearCache)
     matrix_type !== nothing && Pardiso.set_matrixtype!(solver, matrix_type)
     cache.verbose && Pardiso.set_msglvl!(solver, Pardiso.MESSAGE_LEVEL_ON)
 
-    iparm !== nothing begin # pass in vector of tuples like [(iparm, key)]
+    iparm !== nothing && begin # pass in vector of tuples like [(iparm, key)]
         for i in length(iparm)
             Pardiso.set_iparm!(solver, iparm[i]...)
         end
     end
 
-    dparm !== nothing begin
+    dparm !== nothing && begin
         for i in length(dparm)
             Pardiso.set_dparm!(solver, dparm[i]...)
         end
@@ -344,25 +344,24 @@ function init_cacheval(alg::PardisoJL, cache::LinearCache)
 end
 
 function SciMLBase.solve(cache::LinearCache, alg::PardisoJL; kwargs...)
-    @unpack cacheval, A, b, u = cache
+    @unpack A, b, u, cacheval = cache
 
     if cache.isfresh
         solver = init_cacheval(alg, cache)
         cache = set_cacheval(cache, solver)
     end
 
-    abstol  = cache.abstol
-    reltol  = cache.reltol
-
+    abstol = cache.abstol
+    reltol = cache.reltol
     kwargs = (abstol=abstol, reltol=reltol, alg.kwargs...)
 
-    Pardiso.set_phase!(ps, alg.phase)
-
+    """
+    figure out whatever phase is. should set_phase call be in init_cacheval?
+    can we use phase to store factorization in cache?
+    """
+    Pardiso.set_phase!(cacheval, alg.solve_phase)
     Pardiso.solve!(cacheval, u, A, b)
-
-    # is this necessary?
-    Pardiso.set_phase!(ps, Pardiso.RELEASE_ALL)
+    Pardiso.set_phase!(cacheval, alg.release_phase) # is this necessary?
 
     return cache.u
 end
-