From 21f34395c51b6bd0d1ad61df3465e6532686c6a7 Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Thu, 11 Apr 2024 22:36:38 -0500 Subject: [PATCH 1/4] Reexport MadNLP from MadNLP/libs --- lib/MadNLPGPU/src/MadNLPGPU.jl | 8 ++++++++ lib/MadNLPHSL/src/MadNLPHSL.jl | 8 ++++++++ lib/MadNLPMumps/src/MadNLPMumps.jl | 8 ++++++++ lib/MadNLPPardiso/src/MadNLPPardiso.jl | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/lib/MadNLPGPU/src/MadNLPGPU.jl b/lib/MadNLPGPU/src/MadNLPGPU.jl index f6f48455..0dd1d442 100644 --- a/lib/MadNLPGPU/src/MadNLPGPU.jl +++ b/lib/MadNLPGPU/src/MadNLPGPU.jl @@ -57,4 +57,12 @@ end export LapackGPUSolver +# re-export MadNLP, including deprecated names +for name in names(MadNLP, all=true) + if Base.isexported(MadNLP, name) + @eval using MadNLP: $(name) + @eval export $(name) + end +end + end # module diff --git a/lib/MadNLPHSL/src/MadNLPHSL.jl b/lib/MadNLPHSL/src/MadNLPHSL.jl index bc239b71..b0226a95 100644 --- a/lib/MadNLPHSL/src/MadNLPHSL.jl +++ b/lib/MadNLPHSL/src/MadNLPHSL.jl @@ -21,4 +21,12 @@ include("ma97.jl") export Ma27Solver, Ma57Solver, Ma77Solver, Ma86Solver, Ma97Solver +# re-export MadNLP, including deprecated names +for name in names(MadNLP, all=true) + if Base.isexported(MadNLP, name) + @eval using MadNLP: $(name) + @eval export $(name) + end +end + end # module diff --git a/lib/MadNLPMumps/src/MadNLPMumps.jl b/lib/MadNLPMumps/src/MadNLPMumps.jl index 8ba261ee..62ec1652 100644 --- a/lib/MadNLPMumps/src/MadNLPMumps.jl +++ b/lib/MadNLPMumps/src/MadNLPMumps.jl @@ -286,4 +286,12 @@ is_supported(::Type{MumpsSolver},::Type{Float64}) = true export MumpsSolver +# re-export MadNLP, including deprecated names +for name in names(MadNLP, all=true) + if Base.isexported(MadNLP, name) + @eval using MadNLP: $(name) + @eval export $(name) + end +end + end # module diff --git a/lib/MadNLPPardiso/src/MadNLPPardiso.jl b/lib/MadNLPPardiso/src/MadNLPPardiso.jl index 2a50c3b9..32a943ac 100644 --- a/lib/MadNLPPardiso/src/MadNLPPardiso.jl +++ b/lib/MadNLPPardiso/src/MadNLPPardiso.jl @@ -23,4 +23,12 @@ end export PardisoSolver, PardisoMKLSolver +# re-export MadNLP, including deprecated names +for name in names(MadNLP, all=true) + if Base.isexported(MadNLP, name) + @eval using MadNLP: $(name) + @eval export $(name) + end +end + end # module From 56408c83ac3da7d948845295d2ef4773d093034c Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Fri, 12 Apr 2024 08:57:22 -0500 Subject: [PATCH 2/4] Mumps bug fixed --- lib/MadNLPMumps/src/MadNLPMumps.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/MadNLPMumps/src/MadNLPMumps.jl b/lib/MadNLPMumps/src/MadNLPMumps.jl index 62ec1652..41373b1c 100644 --- a/lib/MadNLPMumps/src/MadNLPMumps.jl +++ b/lib/MadNLPMumps/src/MadNLPMumps.jl @@ -3,7 +3,7 @@ module MadNLPMumps import StaticArrays: SVector, setindex import MUMPS_seq_jll import MadNLP: - parsefile, dlopen, + MadNLP, parsefile, dlopen, @kwdef, MadNLPLogger, @debug, @warn, @error, SparseMatrixCSC, SubVector, SymbolicException,FactorizationException,SolveException,InertiaException, From a2008208152b69e1a1ad01dba9ac47d4b655da34 Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Fri, 12 Apr 2024 09:46:50 -0500 Subject: [PATCH 3/4] HSL bug fix --- lib/MadNLPHSL/src/MadNLPHSL.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/MadNLPHSL/src/MadNLPHSL.jl b/lib/MadNLPHSL/src/MadNLPHSL.jl index b0226a95..8bfd265b 100644 --- a/lib/MadNLPHSL/src/MadNLPHSL.jl +++ b/lib/MadNLPHSL/src/MadNLPHSL.jl @@ -1,6 +1,6 @@ module MadNLPHSL -import MadNLP: @kwdef, MadNLPLogger, @debug, @warn, @error, +import MadNLP: MadNLP, @kwdef, MadNLPLogger, @debug, @warn, @error, AbstractOptions, AbstractLinearSolver, set_options!, SparseMatrixCSC, SubVector, SymbolicException,FactorizationException,SolveException,InertiaException, introduce, factorize!, solve!, improve!, is_inertia, inertia, findIJ, nnz, From cf101b4820f9782a7f2e5361af01ea06ff92416d Mon Sep 17 00:00:00 2001 From: Sungho Shin Date: Fri, 12 Apr 2024 10:08:32 -0500 Subject: [PATCH 4/4] updated readme accordingly --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4b4da475..3ecb9f68 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ model = Model(()->MadNLP.Optimizer(linear_solver=LapackCPUSolver)) #### HSL (requires extension `MadNLPHSL`) ```julia -using MadNLP, MadNLPHSL, JuMP +using MadNLPHSL, JuMP # ... model = Model(()->MadNLP.Optimizer(linear_solver=Ma27Solver)) model = Model(()->MadNLP.Optimizer(linear_solver=Ma57Solver)) @@ -96,7 +96,7 @@ model = Model(()->MadNLP.Optimizer(linear_solver=Ma97Solver)) #### Mumps (requires extension `MadNLPMumps`) ```julia -using MadNLP, MadNLPMumps, JuMP +using MadNLPMumps, JuMP # ... model = Model(()->MadNLP.Optimizer(linear_solver=MumpsSolver)) ``` @@ -104,7 +104,7 @@ model = Model(()->MadNLP.Optimizer(linear_solver=MumpsSolver)) #### Pardiso (requires extension `MadNLPPardiso`) ```julia -using MadNLP, MadNLPPardiso, JuMP +using MadNLPPardiso, JuMP # ... model = Model(()->MadNLP.Optimizer(linear_solver=PardisoSolver)) model = Model(()->MadNLP.Optimizer(linear_solver=PardisoMKLSolver)) @@ -113,7 +113,7 @@ model = Model(()->MadNLP.Optimizer(linear_solver=PardisoMKLSolver)) #### CUDA (requires extension `MadNLPGPU`) ```julia -using MadNLP, MadNLPGPU, JuMP +using MadNLPGPU, JuMP # ... model = Model(()->MadNLP.Optimizer(linear_solver=LapackGPUSolver)) # for dense problems model = Model(()->MadNLP.Optimizer(linear_solver=CUDSSSolver)) # for sparse problems