Skip to content

Commit 5a735b9

Browse files
authored
Merge pull request #647 from control-toolbox/646-doc-using-madnlpmumps
use MadNLPMumps in doc
2 parents 001e8e5 + c54b0e5 commit 5a735b9

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OptimalControl"
22
uuid = "5f98b655-cc9a-415a-b60e-744165666948"
33
authors = ["Olivier Cots <[email protected]>"]
4-
version = "1.1.2"
4+
version = "1.1.3"
55

66
[deps]
77
ADNLPModels = "54578032-b7ea-4c30-94aa-7cbd1cce6c9a"

docs/src/assets/Manifest.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,17 +192,17 @@ weakdeps = ["HTTP", "JSON"]
192192

193193
[[deps.CTDirect]]
194194
deps = ["CTBase", "CTModels", "DocStringExtensions", "HSL", "MKL", "SparseArrays"]
195-
git-tree-sha1 = "5f7bd0cc0a2b4ff09a6621071bdc07aa121349a2"
195+
git-tree-sha1 = "a3e796c81478034446feb316816ccfe1f250f211"
196196
uuid = "790bbbee-bee9-49ee-8912-a9de031322d5"
197-
version = "0.17.2"
198-
weakdeps = ["ADNLPModels", "ExaModels", "MadNLPMumps", "NLPModelsIpopt", "NLPModelsKnitro"]
197+
version = "0.17.3"
198+
weakdeps = ["ADNLPModels", "ExaModels", "MadNLP", "NLPModelsIpopt", "NLPModelsKnitro"]
199199

200200
[deps.CTDirect.extensions]
201201
CTDirectExtADNLP = ["ADNLPModels"]
202202
CTDirectExtExa = ["ExaModels"]
203203
CTDirectExtIpopt = ["NLPModelsIpopt"]
204204
CTDirectExtKnitro = ["NLPModelsKnitro"]
205-
CTDirectExtMadNLP = ["MadNLPMumps"]
205+
CTDirectExtMadNLP = ["MadNLP"]
206206

207207
[[deps.CTFlows]]
208208
deps = ["CTBase", "CTModels", "DocStringExtensions", "ForwardDiff", "LinearAlgebra", "MLStyle", "MacroTools"]
@@ -216,9 +216,9 @@ weakdeps = ["OrdinaryDiffEq"]
216216

217217
[[deps.CTModels]]
218218
deps = ["CTBase", "DocStringExtensions", "Interpolations", "LinearAlgebra", "MLStyle", "MacroTools", "OrderedCollections", "Parameters", "RecipesBase"]
219-
git-tree-sha1 = "5dd30f45b055084374b2613cb4c79e73420962f0"
219+
git-tree-sha1 = "f5e80274149d9910656b0c94c378cdead3f689ad"
220220
uuid = "34c4fa32-2049-4079-8329-de33c2a22e2d"
221-
version = "0.6.7"
221+
version = "0.6.8"
222222
weakdeps = ["JLD2", "JSON3", "Plots"]
223223

224224
[deps.CTModels.extensions]
@@ -1224,9 +1224,9 @@ version = "1.18.0+0"
12241224

12251225
[[deps.Libmount_jll]]
12261226
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1227-
git-tree-sha1 = "706dfd3c0dd56ca090e86884db6eda70fa7dd4af"
1227+
git-tree-sha1 = "3acf07f130a76f87c041cfb2ff7d7284ca67b072"
12281228
uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
1229-
version = "2.41.1+0"
1229+
version = "2.41.2+0"
12301230

12311231
[[deps.Libtiff_jll]]
12321232
deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "LERC_jll", "Libdl", "XZ_jll", "Zlib_jll", "Zstd_jll"]
@@ -1236,9 +1236,9 @@ version = "4.7.2+0"
12361236

12371237
[[deps.Libuuid_jll]]
12381238
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1239-
git-tree-sha1 = "d3c8af829abaeba27181db4acb485b18d15d89c6"
1239+
git-tree-sha1 = "2a7a12fc0a4e7fb773450d17975322aa77142106"
12401240
uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700"
1241-
version = "2.41.1+0"
1241+
version = "2.41.2+0"
12421242

12431243
[[deps.LineSearch]]
12441244
deps = ["ADTypes", "CommonSolve", "ConcreteStructs", "FastClosures", "LinearAlgebra", "MaybeInplace", "SciMLBase", "SciMLJacobianOperators", "StaticArraysCore"]

docs/src/manual-solve.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,14 @@ solve(ocp, :direct, :adnlp, :ipopt)
9191

9292
Dynamics and nonlinear constraints must be defined coordinatewise to use ExaModels.jl (`:exa`). Check [the problem definition manual](@ref manual-abstract-dynamics-coord) for more information.
9393

94-
For instance, let us try MadNLP solver with ExaModel modeller.
94+
!!! note
95+
96+
MadNLP is shipped only with two linear solvers (Umfpack and Lapack), which are not adapted is some cases. We recommend to use [MadNLPMumps](https://madsuite.org/MadNLP.jl/stable/installation/#Installation) to solve your optimal control problem with [MUMPS](https://mumps-solver.org) linear solver.
97+
98+
For instance, let us try MadNLPMumps solver with ExaModel modeller.
9599

96100
```@example main
97-
using MadNLP
101+
using MadNLPMumps
98102
99103
ocp = @def begin
100104
t ∈ [ t0, tf ], time

0 commit comments

Comments
 (0)