Skip to content

Commit bb33d1d

Browse files
authored
Merge pull request #114 from control-toolbox/113-general-change-tol-to-1e-8
Change 1e-8 gpu
2 parents 800bfe5 + c521137 commit bb33d1d

File tree

79 files changed

+12598
-13758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+12598
-13758
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ MadNLPGPU = "0.7"
4040
MadNLPMumps = "0.5"
4141
NLPModelsIpopt = "0.11"
4242
OptimalControl = "1"
43-
OptimalControlProblems = "0.3"
43+
OptimalControlProblems = "0.4"
4444
Pkg = "1"
4545
Plots = "1.41"
4646
Printf = "1"

benchmarks/core-moonshot-gpu.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ function run()
1010
# :ducted_fan,
1111
:electric_vehicle,
1212
:glider,
13-
:insurance,
13+
## :insurance, # to be re-added (unstable / sincos issue)
1414
:jackson,
1515
:robbins,
16-
:robot,
16+
## :robot, # to be re-added (unstable / sincos issue)
1717
:rocket,
18-
:space_shuttle,
19-
:steering,
18+
## :space_shuttle, # to be re-added (unstable / sincos issue)
19+
## :steering, # to be re-added (unstable / sincos issue)
2020
:vanderpol,
2121
],
2222
solver_models=[:madnlp => [:exa, :exa_gpu]],
2323
grid_sizes=[1000, 5000, 10000, 20000],
24-
disc_methods=[:trapeze],
25-
tol=1e-6,
24+
disc_methods=[:midpoint],
25+
tol=1e-8,
2626
ipopt_mu_strategy="adaptive",
2727
print_trace=false,
2828
max_iter=1000,
29-
max_wall_time=1000.0,
29+
max_wall_time=2000.0, # updated from 1000 to 2000 for large grid_size's
3030
)
3131
println("✅ Benchmark completed successfully!")
3232
return results

benchmarks/core-mothra-gpu.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function run()
2222
solver_models=[:madnlp => [:exa, :exa_gpu]],
2323
grid_sizes=[1000, 5000, 10000, 20000],
2424
disc_methods=[:trapeze],
25-
tol=1e-6,
25+
tol=1e-8,
2626
ipopt_mu_strategy="adaptive",
2727
print_trace=false,
2828
max_iter=1000,

docs/src/assets/benchmarks/core-moonshot-gpu/Manifest.toml

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.11.7"
44
manifest_format = "2.0"
5-
project_hash = "d9f8266f85c7cd9847b7b315577707b23fa26893"
5+
project_hash = "42c817de2e51bf2c2605af6e2bbf860e25988cd8"
66

77
[[deps.ADNLPModels]]
88
deps = ["ADTypes", "ForwardDiff", "LinearAlgebra", "NLPModels", "Requires", "ReverseDiff", "SparseArrays", "SparseConnectivityTracer", "SparseMatrixColorings"]
@@ -11,9 +11,9 @@ uuid = "54578032-b7ea-4c30-94aa-7cbd1cce6c9a"
1111
version = "0.8.13"
1212

1313
[[deps.ADTypes]]
14-
git-tree-sha1 = "8be2ae325471fc20b11c27bb34b518541d07dd3a"
14+
git-tree-sha1 = "8b2b045b22740e4be20654175cc38291d48539db"
1515
uuid = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
16-
version = "1.19.0"
16+
version = "1.20.0"
1717

1818
[deps.ADTypes.extensions]
1919
ADTypesChainRulesCoreExt = "ChainRulesCore"
@@ -185,15 +185,15 @@ version = "0.6.9"
185185

186186
[[deps.CTParser]]
187187
deps = ["CTBase", "DocStringExtensions", "MLStyle", "OrderedCollections", "Parameters", "Unicode"]
188-
git-tree-sha1 = "48ec8193487a79277ff278752337c4ffb8fff691"
188+
git-tree-sha1 = "2c29ef965e67085690ad56f8758d184877e490e8"
189189
uuid = "32681960-a1b1-40db-9bff-a1ca817385d1"
190-
version = "0.7.1"
190+
version = "0.7.2"
191191

192192
[[deps.CUDA]]
193193
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Compiler_jll", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "GPUToolbox", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"]
194-
git-tree-sha1 = "38b6a1fe14fba13cdc0a44ecd2485eb5f7e16ca0"
194+
git-tree-sha1 = "27d1cd229e3e1d5542352a63ad29268439f79fe9"
195195
uuid = "052768ef-5323-5732-b1bb-66c8b64840ba"
196-
version = "5.9.4"
196+
version = "5.9.5"
197197

198198
[deps.CUDA.extensions]
199199
ChainRulesCoreExt = "ChainRulesCore"
@@ -233,9 +233,9 @@ version = "0.19.2+0"
233233

234234
[[deps.CUDSS]]
235235
deps = ["CEnum", "CUDA", "CUDSS_jll", "GPUToolbox", "LinearAlgebra", "SparseArrays"]
236-
git-tree-sha1 = "6356218f3c9a7509d1d830b7ec14e870faf65020"
236+
git-tree-sha1 = "1429e807b57bcc65be0a286de31897adc374fd56"
237237
uuid = "45b445bb-4962-46a0-9369-b4df9d0f772e"
238-
version = "0.6.1"
238+
version = "0.6.3"
239239

240240
[[deps.CUDSS_jll]]
241241
deps = ["Artifacts", "CUDA_Runtime_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
@@ -553,15 +553,15 @@ version = "1.11.0"
553553

554554
[[deps.GLFW_jll]]
555555
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll", "libdecor_jll", "xkbcommon_jll"]
556-
git-tree-sha1 = "fcb0584ff34e25155876418979d4c8971243bb89"
556+
git-tree-sha1 = "b7bfd56fa66616138dfe5237da4dc13bbd83c67f"
557557
uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
558-
version = "3.4.0+2"
558+
version = "3.4.1+0"
559559

560560
[[deps.GPUArrays]]
561-
deps = ["Adapt", "GPUArraysCore", "KernelAbstractions", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "ScopedValues", "Serialization", "Statistics"]
562-
git-tree-sha1 = "8ddb438e956891a63a5367d7fab61550fc720026"
561+
deps = ["Adapt", "GPUArraysCore", "KernelAbstractions", "LLVM", "LinearAlgebra", "Printf", "Random", "Reexport", "ScopedValues", "Serialization", "SparseArrays", "Statistics"]
562+
git-tree-sha1 = "18da8dd0b6aded0c47184e9d2a17573ae8257f36"
563563
uuid = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7"
564-
version = "11.2.6"
564+
version = "11.3.1"
565565

566566
[deps.GPUArrays.extensions]
567567
JLD2Ext = "JLD2"
@@ -577,9 +577,9 @@ version = "0.2.0"
577577

578578
[[deps.GPUCompiler]]
579579
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "PrecompileTools", "Preferences", "Scratch", "Serialization", "TOML", "Tracy", "UUIDs"]
580-
git-tree-sha1 = "90554fe518adab1b4c8f7a04d26c414482a240ca"
580+
git-tree-sha1 = "6e5a25bc455da8e8d88b6b7377e341e9af1929f0"
581581
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
582-
version = "1.7.4"
582+
version = "1.7.5"
583583

584584
[[deps.GPUToolbox]]
585585
deps = ["LLVM"]
@@ -589,15 +589,21 @@ version = "1.0.0"
589589

590590
[[deps.GR]]
591591
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
592-
git-tree-sha1 = "f52c27dd921390146624f3aab95f4e8614ad6531"
592+
git-tree-sha1 = "f305bdb91e1f3fcc687944c97f2ede40585b1bd5"
593593
uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
594-
version = "0.73.18"
594+
version = "0.73.19"
595+
596+
[deps.GR.extensions]
597+
GRIJuliaExt = "IJulia"
598+
599+
[deps.GR.weakdeps]
600+
IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
595601

596602
[[deps.GR_jll]]
597603
deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
598-
git-tree-sha1 = "4b0406b866ea9fdbaf1148bc9c0b887e59f9af68"
604+
git-tree-sha1 = "de439fbc02b9dc0e639e67d7c5bd5811ff3b6f06"
599605
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
600-
version = "0.73.18+0"
606+
version = "0.73.19+1"
601607

602608
[[deps.GettextRuntime_jll]]
603609
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll"]
@@ -613,9 +619,9 @@ version = "9.55.1+0"
613619

614620
[[deps.Glib_jll]]
615621
deps = ["Artifacts", "GettextRuntime_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE2_jll", "Zlib_jll"]
616-
git-tree-sha1 = "50c11ffab2a3d50192a228c313f05b5b5dc5acb2"
622+
git-tree-sha1 = "6b4d2dc81736fe3980ff0e8879a9fc7c33c44ddf"
617623
uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
618-
version = "2.86.0+0"
624+
version = "2.86.2+0"
619625

620626
[[deps.Graphite2_jll]]
621627
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -1079,10 +1085,10 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
10791085
version = "1.11.0"
10801086

10811087
[[deps.MathOptInterface]]
1082-
deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "DataStructures", "ForwardDiff", "JSON3", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"]
1083-
git-tree-sha1 = "a2cbab4256690aee457d136752c404e001f27768"
1088+
deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "ForwardDiff", "JSON3", "LinearAlgebra", "MutableArithmetics", "NaNMath", "OrderedCollections", "PrecompileTools", "Printf", "SparseArrays", "SpecialFunctions", "Test"]
1089+
git-tree-sha1 = "1381263d06a9526c4449238b32b1e01bed6b7ce9"
10841090
uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
1085-
version = "1.46.0"
1091+
version = "1.47.0"
10861092

10871093
[[deps.MbedTLS]]
10881094
deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"]
@@ -1209,9 +1215,9 @@ version = "0.8.5+0"
12091215

12101216
[[deps.OpenSSL]]
12111217
deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "NetworkOptions", "OpenSSL_jll", "Sockets"]
1212-
git-tree-sha1 = "386b47442468acfb1add94bf2d85365dea10cbab"
1218+
git-tree-sha1 = "1d1aaa7d449b58415f97d2839c318b70ffb525a0"
12131219
uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
1214-
version = "1.6.0"
1220+
version = "1.6.1"
12151221

12161222
[[deps.OpenSSL_jll]]
12171223
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -1233,9 +1239,9 @@ version = "1.1.6"
12331239

12341240
[[deps.OptimalControlProblems]]
12351241
deps = ["ADNLPModels", "CTBase", "CTDirect", "CTModels", "DocStringExtensions", "ExaModels", "OrderedCollections", "SolverCore"]
1236-
git-tree-sha1 = "767f6292fdb312e7151bc30a652227c8d5c5dd8d"
1242+
git-tree-sha1 = "9df33870ed17ed765a10b3725fd50758fc721182"
12371243
uuid = "59046045-fb9c-4c23-964f-ff0a25704f96"
1238-
version = "0.3.2"
1244+
version = "0.4.0"
12391245
weakdeps = ["JuMP", "OptimalControl"]
12401246

12411247
[deps.OptimalControlProblems.extensions]
@@ -1305,9 +1311,9 @@ version = "1.4.4"
13051311

13061312
[[deps.Plots]]
13071313
deps = ["Base64", "Contour", "Dates", "Downloads", "FFMPEG", "FixedPointNumbers", "GR", "JLFzf", "JSON", "LaTeXStrings", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "PrecompileTools", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "RelocatableFolders", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "TOML", "UUIDs", "UnicodeFun", "Unzip"]
1308-
git-tree-sha1 = "12ce661880f8e309569074a61d3767e5756a199f"
1314+
git-tree-sha1 = "7b990898534ea9797bf9bf21bd086850e5d9f817"
13091315
uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
1310-
version = "1.41.1"
1316+
version = "1.41.2"
13111317

13121318
[deps.Plots.extensions]
13131319
FileIOExt = "FileIO"
@@ -1343,9 +1349,9 @@ version = "1.5.0"
13431349

13441350
[[deps.PrettyTables]]
13451351
deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "REPL", "Reexport", "StringManipulation", "Tables"]
1346-
git-tree-sha1 = "6b8e2f0bae3f678811678065c09571c1619da219"
1352+
git-tree-sha1 = "c5a07210bd060d6a8491b0ccdee2fa0235fc00bf"
13471353
uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
1348-
version = "3.1.0"
1354+
version = "3.1.2"
13491355

13501356
[[deps.Printf]]
13511357
deps = ["Unicode"]
@@ -1511,10 +1517,14 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
15111517
version = "1.11.0"
15121518

15131519
[[deps.SolverCore]]
1514-
deps = ["LinearAlgebra", "NLPModels", "Printf"]
1515-
git-tree-sha1 = "03a1e0d2d39b9ebc9510f2452c0adfbe887b9cb2"
1520+
deps = ["Printf"]
1521+
git-tree-sha1 = "83289e4a837c2cced03bf8efc138bbaf42f4983b"
15161522
uuid = "ff4d7338-4cf1-434d-91df-b86cb86fb843"
1517-
version = "0.3.8"
1523+
version = "0.3.9"
1524+
weakdeps = ["NLPModels"]
1525+
1526+
[deps.SolverCore.extensions]
1527+
SolverCoreNLPModelsExt = "NLPModels"
15181528

15191529
[[deps.SortingAlgorithms]]
15201530
deps = ["DataStructures"]
@@ -1610,21 +1620,21 @@ weakdeps = ["SparseArrays"]
16101620

16111621
[[deps.StatsAPI]]
16121622
deps = ["LinearAlgebra"]
1613-
git-tree-sha1 = "9d72a13a3f4dd3795a195ac5a44d7d6ff5f552ff"
1623+
git-tree-sha1 = "178ed29fd5b2a2cfc3bd31c13375ae925623ff36"
16141624
uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
1615-
version = "1.7.1"
1625+
version = "1.8.0"
16161626

16171627
[[deps.StatsBase]]
16181628
deps = ["AliasTables", "DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
1619-
git-tree-sha1 = "064b532283c97daae49e544bb9cb413c26511f8c"
1629+
git-tree-sha1 = "be5733d4a2b03341bdcab91cea6caa7e31ced14b"
16201630
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
1621-
version = "0.34.8"
1631+
version = "0.34.9"
16221632

16231633
[[deps.StringManipulation]]
16241634
deps = ["PrecompileTools"]
1625-
git-tree-sha1 = "725421ae8e530ec29bcbdddbe91ff8053421d023"
1635+
git-tree-sha1 = "a3c1536470bf8c5e02096ad4853606d7c8f62721"
16261636
uuid = "892a3eda-7b42-436c-8928-eab12a02cf0e"
1627-
version = "0.4.1"
1637+
version = "0.4.2"
16281638

16291639
[[deps.StructTypes]]
16301640
deps = ["Dates", "UUIDs"]
@@ -2006,9 +2016,9 @@ version = "1.28.1+0"
20062016

20072017
[[deps.libpng_jll]]
20082018
deps = ["Artifacts", "JLLWrappers", "Libdl", "Zlib_jll"]
2009-
git-tree-sha1 = "07b6a107d926093898e82b3b1db657ebe33134ec"
2019+
git-tree-sha1 = "de8ab4f01cb2d8b41702bab9eaad9e8b7d352f73"
20102020
uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
2011-
version = "1.6.50+0"
2021+
version = "1.6.53+0"
20122022

20132023
[[deps.libvorbis_jll]]
20142024
deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll"]
@@ -2052,6 +2062,6 @@ version = "4.1.0+0"
20522062

20532063
[[deps.xkbcommon_jll]]
20542064
deps = ["Artifacts", "JLLWrappers", "Libdl", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"]
2055-
git-tree-sha1 = "fbf139bce07a534df0e699dbb5f5cc9346f95cc1"
2065+
git-tree-sha1 = "a1fc6507a40bf504527d0d4067d718f8e179b2b8"
20562066
uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd"
2057-
version = "1.9.2+0"
2067+
version = "1.13.0+0"

docs/src/assets/benchmarks/core-moonshot-gpu/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "CTBenchmarks"
22
uuid = "db1dffaa-5ed3-4583-9a66-b5881c82ef11"
3-
version = "0.2.3"
3+
version = "0.3.1"
44
authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
55

66
[deps]
@@ -40,7 +40,7 @@ MadNLPGPU = "0.7"
4040
MadNLPMumps = "0.5"
4141
NLPModelsIpopt = "0.11"
4242
OptimalControl = "1"
43-
OptimalControlProblems = "0.3"
43+
OptimalControlProblems = "0.4"
4444
Pkg = "1"
4545
Plots = "1.41"
4646
Printf = "1"

docs/src/assets/benchmarks/core-moonshot-gpu/core-moonshot-gpu.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ function run()
1010
# :ducted_fan,
1111
:electric_vehicle,
1212
:glider,
13-
:insurance,
13+
## :insurance, # to be re-added (unstable / sincos issue)
1414
:jackson,
1515
:robbins,
16-
:robot,
16+
## :robot, # to be re-added (unstable / sincos issue)
1717
:rocket,
18-
:space_shuttle,
19-
:steering,
18+
## :space_shuttle, # to be re-added (unstable / sincos issue)
19+
## :steering, # to be re-added (unstable / sincos issue)
2020
:vanderpol,
2121
],
2222
solver_models=[:madnlp => [:exa, :exa_gpu]],
2323
grid_sizes=[1000, 5000, 10000, 20000],
24-
disc_methods=[:trapeze],
25-
tol=1e-6,
24+
disc_methods=[:midpoint],
25+
tol=1e-8,
2626
ipopt_mu_strategy="adaptive",
2727
print_trace=false,
2828
max_iter=1000,
29-
max_wall_time=1000.0,
29+
max_wall_time=2000.0, # updated from 1000 to 2000 for large grid_size's
3030
)
3131
println("✅ Benchmark completed successfully!")
3232
return results

docs/src/assets/benchmarks/core-moonshot-gpu/core-moonshot-gpu.json

Lines changed: 1024 additions & 2036 deletions
Large diffs are not rendered by default.
Binary file not shown.

0 commit comments

Comments
 (0)