Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade MadNLPHSL.jl #376

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/MadNLPHSL/Project.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
name = "MadNLPHSL"
uuid = "7fb6135f-58fe-4112-84ca-653cf5be0c77"
version = "0.5.2"
version = "0.6.0"

[deps]
HSL = "34c5aeac-e683-54a6-a0e9-6e0fdc586c50"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MadNLP = "2621e9c9-9eb4-46b1-8089-e8c72242dfb6"

[compat]
HSL = "0.4.2"
HSL = "0.5"
LinearAlgebra = "1.9"
MadNLP = "0.5,0.6,0.7,0.8"
MadNLPTests = "0.5"
julia = "1.6"
Quadmath = "0.5.10"
julia = "1.9"
Test = "1.9"

[extras]
MadNLPTests = "b52a2a03-04ab-4a5f-9698-6a2deff93217"
Quadmath = "be4d8f0f-7fa4-5f49-b795-2f01399ab2dd"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "MadNLPTests"]
test = ["MadNLPTests", "Quadmath", "Test"]
48 changes: 40 additions & 8 deletions lib/MadNLPHSL/src/MadNLPHSL.jl
Original file line number Diff line number Diff line change
@@ -1,14 +1,46 @@
module MadNLPHSL

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,
get_tril_to_full, transfer!, input_type, _madnlp_unsafe_wrap,
is_supported, default_options
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,
get_tril_to_full,
transfer!,
input_type,
_madnlp_unsafe_wrap,
is_supported,
default_options

import HSL
import HSL: mc68_control, mc68_info, ma77_control, ma77_info, ma86_control, ma86_info, ma97_control, ma97_info
import HSL:
Mc68Control,
Mc68Info,
Ma77Control,
Ma77Info,
Ma86Control,
Ma86Info,
Ma97Control,
Ma97Info

import LinearAlgebra

Expand All @@ -22,7 +54,7 @@ include("ma97.jl")
export Ma27Solver, Ma57Solver, Ma77Solver, Ma86Solver, Ma97Solver

# re-export MadNLP, including deprecated names
for name in names(MadNLP, all=true)
for name in names(MadNLP, all = true)
if Base.isexported(MadNLP, name)
@eval using MadNLP: $(name)
@eval export $(name)
Expand Down
15 changes: 2 additions & 13 deletions lib/MadNLPHSL/src/common.jl
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
@enum(Ordering::Int, AMD = 1, METIS = 3,)

@enum(
Ordering::Int,
AMD = 1,
METIS = 3,
)

@enum(
Scaling::Int,
SCALING_NONE = 0,
MC64 = 1,
MC77 = 2,
MC30 = 4,
)
@enum(Scaling::Int, SCALING_NONE = 0, MC64 = 1, MC77 = 2, MC30 = 4,)
Loading
Loading