renamed options cudss

MadNLP · Mar 2, 2024 · 770de36 · 770de36
1 parent 7a66bf6
commit 770de36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/MadNLPGPU/src/cudss.jl b/lib/MadNLPGPU/src/cudss.jl
@@ -2,7 +2,7 @@ import CUDSS
 import SparseArrays
 
 @kwdef mutable struct CudssSolverOptions <: MadNLP.AbstractOptions
-    cudss_algorithm::MadNLP.LinearFactorization = MadNLP.BUNCHKAUFMAN
+    cudss_algorithm::MadNLP.LinearFactorization = MadNLP.LDL
 end
 
 mutable struct CUDSSSolver{T} <: MadNLP.AbstractLinearSolver{T}
@@ -28,7 +28,7 @@ function CUDSSSolver(
         "G"
     elseif opt.cudss_algorithm == MadNLP.CHOLESKY
         "SPD"
-    elseif opt.cudss_algorithm == MadNLP.BUNCHKAUFMAN
+    elseif opt.cudss_algorithm == MadNLP.LDL
         "S"
     end
 
@@ -73,7 +73,7 @@ end
 
 MadNLP.input_type(::Type{CUDSSSolver}) = :csc
 MadNLP.default_options(::Type{CUDSSSolver}) = CudssSolverOptions()
-MadNLP.is_inertia(M::CUDSSSolver) = (M.opt.cudss_algorithm ∈ (MadNLP.CHOLESKY, MadNLP.BUNCHKAUFMAN))
+MadNLP.is_inertia(M::CUDSSSolver) = (M.opt.cudss_algorithm ∈ (MadNLP.CHOLESKY, MadNLP.LDL))
 function inertia(M::CUDSSSolver)
     n = size(M.tril, 1)
     if M.opt.cudss_algorithm == MadNLP.CHOLESKY
@@ -83,7 +83,7 @@ function inertia(M::CUDSSSolver)
         else
             return (0, n, 0)
         end
-    elseif M.opt.cudss_algorithm == MadNLP.BUNCHKAUFMAN
+    elseif M.opt.cudss_algorithm == MadNLP.LDL
         # N.B.: cuDSS does not always return the correct inertia.
         (k, l) = CUDSS.cudss_get(M.inner, "inertia")
         k = min(n, k) # TODO: add safeguard for inertia

diff --git a/src/LinearSolvers/linearsolvers.jl b/src/LinearSolvers/linearsolvers.jl
@@ -124,11 +124,13 @@ struct SolveException <: Exception end
 struct InertiaException <: Exception end
 LinearSolverException=Union{SymbolicException,FactorizationException,SolveException,InertiaException}
 
-@enum(LinearFactorization::Int,
+@enum(
+    LinearFactorization::Int,
     BUNCHKAUFMAN = 1,
     LU = 2,
     QR = 3,
     CHOLESKY = 4,
+    LDL = 5,
 )
 
 # iterative solvers