Merge pull request #91 from control-toolbox/90-doc-graph-gpu-vs-cpu

90 doc graph gpu vs cpu

Author: ocots

docs/src/assets/benchmarks/core-ubuntu-latest/Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.11.7"
 manifest_format = "2.0"
-project_hash = "504321ce5e41e219898888ab0c5197c8a0da3a8b"
+project_hash = "bad3358bf5ff5a00b4825524d0fafd1b96b4e6d1"
 
 [[deps.ADNLPModels]]
 deps = ["ADTypes", "ForwardDiff", "LinearAlgebra", "NLPModels", "Requires", "ReverseDiff", "SparseArrays", "SparseConnectivityTracer", "SparseMatrixColorings"]
@@ -120,16 +120,9 @@ version = "0.5.0"
 
 [[deps.CTBase]]
 deps = ["DocStringExtensions"]
-git-tree-sha1 = "62017f38515aea94b44eaa4892e3552f5ef5dcbf"
+git-tree-sha1 = "ebc7d07d0bf4db7a841c5e7d51b4271bcf1e921c"
 uuid = "54762871-cc72-4466-b8e8-f6c8b58076cd"
-version = "0.16.4"
-
-    [deps.CTBase.extensions]
-    CTBaseDocstrings = ["HTTP", "JSON"]
-
-    [deps.CTBase.weakdeps]
-    HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-    JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+version = "0.16.2"
 
 [[deps.CTDirect]]
 deps = ["CTBase", "CTModels", "DocStringExtensions", "HSL", "MKL", "NLPModels", "SolverCore", "SparseArrays"]
@@ -321,9 +314,9 @@ version = "1.8.1"
 
 [[deps.DataStructures]]
 deps = ["OrderedCollections"]
-git-tree-sha1 = "6c72198e6a101cccdd4c9731d3985e904ba26037"
+git-tree-sha1 = "e357641bb3e0638d353c4b29ea0e40ea644066a6"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.19.1"
+version = "0.19.3"
 
 [[deps.DataValueInterfaces]]
 git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -409,9 +402,9 @@ version = "1.11.0"
 
 [[deps.FillArrays]]
 deps = ["LinearAlgebra"]
-git-tree-sha1 = "173e4d8f14230a7523ae11b9a3fa9edb3e0efd78"
+git-tree-sha1 = "5bfcd42851cf2f1b303f51525a54dc5e98d408a3"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "1.14.0"
+version = "1.15.0"
 
     [deps.FillArrays.extensions]
     FillArraysPDMatsExt = "PDMats"
@@ -578,10 +571,16 @@ uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 version = "1.7.1"
 
 [[deps.JSON]]
-deps = ["Dates", "Mmap", "Parsers", "Unicode"]
-git-tree-sha1 = "31e996f0a15c7b280ba9f76636b3ff9e2ae58c9a"
+deps = ["Dates", "Logging", "Parsers", "PrecompileTools", "StructUtils", "UUIDs", "Unicode"]
+git-tree-sha1 = "eb04df293213df64ddd720c86de3c431f5f8ccf1"
 uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-version = "0.21.4"
+version = "1.2.1"
+
+    [deps.JSON.extensions]
+    JSONArrowExt = ["ArrowTypes"]
+
+    [deps.JSON.weakdeps]
+    ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd"
 
 [[deps.JSON3]]
 deps = ["Dates", "Mmap", "Parsers", "PrecompileTools", "StructTypes", "UUIDs"]
@@ -615,9 +614,9 @@ version = "0.2.1+0"
 
 [[deps.KernelAbstractions]]
 deps = ["Adapt", "Atomix", "InteractiveUtils", "MacroTools", "PrecompileTools", "Requires", "StaticArrays", "UUIDs"]
-git-tree-sha1 = "83c617e9e9b02306a7acab79e05ec10253db7c87"
+git-tree-sha1 = "b5a371fcd1d989d844a4354127365611ae1e305f"
 uuid = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
-version = "0.9.38"
+version = "0.9.39"
 
     [deps.KernelAbstractions.extensions]
     EnzymeExt = "EnzymeCore"
@@ -941,15 +940,15 @@ version = "0.5.6+0"
 
 [[deps.OptimalControl]]
 deps = ["ADNLPModels", "CTBase", "CTDirect", "CTFlows", "CTModels", "CTParser", "CommonSolve", "DocStringExtensions", "ExaModels", "RecipesBase"]
-git-tree-sha1 = "b692710be9b1fba3bd14a0cb949297ba75505e79"
+git-tree-sha1 = "bd4205fab4ea6c5ad5504efcf9e5868ef253227c"
 uuid = "5f98b655-cc9a-415a-b60e-744165666948"
-version = "1.1.5"
+version = "1.1.6"
 
 [[deps.OptimalControlProblems]]
 deps = ["ADNLPModels", "CTBase", "CTDirect", "CTModels", "DocStringExtensions", "ExaModels", "OrderedCollections", "SolverCore"]
-git-tree-sha1 = "6b09a457e4a160d385d834ee90f7d2a38e8578b5"
+git-tree-sha1 = "767f6292fdb312e7151bc30a652227c8d5c5dd8d"
 uuid = "59046045-fb9c-4c23-964f-ff0a25704f96"
-version = "0.3.1"
+version = "0.3.2"
 weakdeps = ["JuMP", "OptimalControl"]
 
     [deps.OptimalControlProblems.extensions]
@@ -1136,9 +1135,9 @@ version = "1.11.0"
 
 [[deps.SparseConnectivityTracer]]
 deps = ["ADTypes", "DocStringExtensions", "FillArrays", "LinearAlgebra", "Random", "SparseArrays"]
-git-tree-sha1 = "62f3dbfa8e0bb01ce41076ee31686f0514a9e339"
+git-tree-sha1 = "ba6dc9b87304964647bd1c750b903cb360003a36"
 uuid = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
-version = "1.1.1"
+version = "1.1.2"
 
     [deps.SparseConnectivityTracer.extensions]
     SparseConnectivityTracerChainRulesCoreExt = "ChainRulesCore"
@@ -1156,19 +1155,22 @@ version = "1.1.1"
 
 [[deps.SparseMatrixColorings]]
 deps = ["ADTypes", "DocStringExtensions", "LinearAlgebra", "PrecompileTools", "Random", "SparseArrays"]
-git-tree-sha1 = "d3f3b7bb8a561b5ff20ee7cf9574841ee4e4e137"
+git-tree-sha1 = "6ed48d9a3b22417c765dc273ae3e1e4de035e7c8"
 uuid = "0a514795-09f3-496d-8182-132a7b665d35"
-version = "0.4.22"
+version = "0.4.23"
 
     [deps.SparseMatrixColorings.extensions]
     SparseMatrixColoringsCUDAExt = "CUDA"
     SparseMatrixColoringsCliqueTreesExt = "CliqueTrees"
     SparseMatrixColoringsColorsExt = "Colors"
+    SparseMatrixColoringsJuMPExt = ["JuMP", "MathOptInterface"]
 
     [deps.SparseMatrixColorings.weakdeps]
     CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
     CliqueTrees = "60701a23-6482-424a-84db-faee86b9b1f8"
     Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
+    JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
+    MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 
 [[deps.SpecialFunctions]]
 deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
@@ -1218,6 +1220,20 @@ git-tree-sha1 = "159331b30e94d7b11379037feeb9b690950cace8"
 uuid = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
 version = "1.11.0"
 
+[[deps.StructUtils]]
+deps = ["Dates", "UUIDs"]
+git-tree-sha1 = "79529b493a44927dd5b13dde1c7ce957c2d049e4"
+uuid = "ec057cc2-7a8d-4b58-b3b3-92acb9f63b42"
+version = "2.6.0"
+
+    [deps.StructUtils.extensions]
+    StructUtilsMeasurementsExt = ["Measurements"]
+    StructUtilsTablesExt = ["Tables"]
+
+    [deps.StructUtils.weakdeps]
+    Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
+    Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
+
 [[deps.StyledStrings]]
 uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b"
 version = "1.11.0"

docs/src/assets/benchmarks/core-ubuntu-latest/Project.toml

@@ -1,6 +1,6 @@
 name = "CTBenchmarks"
 uuid = "db1dffaa-5ed3-4583-9a66-b5881c82ef11"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
 
 [deps]
@@ -29,7 +29,7 @@ DataFrames = "1"
 Dates = "1"
 InteractiveUtils = "1"
 Ipopt = "1"
-JSON = "0.21"
+JSON = "1"
 JuMP = "1"
 MadNLPGPU = "0.7"
 MadNLPMumps = "0.5"

docs/src/assets/benchmarks/core-ubuntu-latest/core-ubuntu-latest.jl

@@ -1,21 +1,8 @@
-using Pkg
-const project_dir = normpath(@__DIR__, "..")
-ENV["PROJECT"] = project_dir
+# Benchmark script for core-ubuntu-latest
+# Setup (Pkg.activate, instantiate, update, using CTBenchmarks) is handled by the workflow
 
-println("📦 Activating project environment...")
-Pkg.activate(project_dir)
-
-println("📥 Installing dependencies...")
-Pkg.instantiate()
-
-println("🔄 Updating dependencies...")
-Pkg.update()
-
-println("🔄 Loading CTBenchmarks package...")
-using CTBenchmarks
-
-println("⏱️  Ready to run core benchmark...")
 function main()
+    project_dir = normpath(@__DIR__, "..")
     outpath=joinpath(
         project_dir, "docs", "src", "assets", "benchmarks", "core-ubuntu-latest"
     )
@@ -25,7 +12,7 @@ function main()
             :beam,
             :chain,
             :double_oscillator,
-            :ducted_fan,
+            # :ducted_fan,
             :electric_vehicle,
             :glider,
             :insurance,
@@ -38,7 +25,7 @@ function main()
             :vanderpol,
         ],
         solver_models=[:ipopt => [:JuMP, :adnlp, :exa], :madnlp => [:JuMP, :adnlp, :exa]],
-        grid_sizes=[200, 500, 1000],
+        grid_sizes=[200, 500, 1000, 2000],
         disc_methods=[:trapeze],
         tol=1e-6,
         ipopt_mu_strategy="adaptive",

docs/src/assets/benchmarks/core-ubuntu-latest/data.json

@@ -186,104 +186,68 @@ function _print_results(bench_id)
     end
 end
 
-function _plot_results(bench_id)
-
-    function pratios(df_sub)
-        wide = unstack(df_sub, [:problem, :grid_size], :solver, :time)
-        if !("ipopt" in names(wide)) || !("madnlp" in names(wide))
-            return nothing
-        end
-        min_times = min.(wide.ipopt, wide.madnlp)
-        wide.r_ipopt  = wide.ipopt  ./ min_times
-        wide.r_madnlp = wide.madnlp ./ min_times
-        return wide
-    end
-
-    # write in english
+# write in english
     # use log base 2 instead of log base 1
     # group the graphs by solver–model pairs
     # on Moonshot, plot two curves: one for GPU and one for CPU
     # plot with respect to the number of iterations
     # set time to infinity if it does not converge
-    function plot_performance_profile(wide, model)
-        r_ipopt  = sort(collect(skipmissing(wide.r_ipopt)))
-        r_madnlp = sort(collect(skipmissing(wide.r_madnlp)))
-        n = length(r_ipopt)
-        y = (1:n) ./ n
-        plt = plot(
-            r_ipopt, y,
-            label = "Ipopt", lw = 2,
-            xlabel = "τ (Performance ratio)",
-            ylabel = "Proportion of solved instances ≤ τ",
-            title = "Performance profile — $(model)",
-            legend = :bottomright,
-            xscale = :log2,
-            grid = true
-        )
-        plot!(
-            r_madnlp, y,
-            label = "MadNLP", lw = 2
-        )
-        return plt
-    end
-
-    brut = _get_bench_data(bench_id) 
-    if brut === nothing
-        println("⚠️  No result (missing or invalid file) for bench_id: $bench_id")
-        return plot() 
+function _plot_results(bench_id)
+    raw = _get_bench_data(bench_id)
+    if raw === nothing
+        println("⚠️ No result (missing or invalid file) for bench_id: $bench_id")
+        return plot()
     end
 
-    rows = get(brut, "results", Any[])
+    rows = get(raw, "results", Any[])
     if isempty(rows)
-        println("⚠️  No ('results') recorded in the benchmark file.")
+        println("⚠️ No ('results') recorded in the benchmark file.")
         return plot()
     end
 
     df = DataFrame(rows)
-
     df_successful = filter(row -> row.success == true && row.benchmark !== nothing, df)
     if isempty(df_successful)
-        println("⚠️  No successful benchmark entry to analyze.")
-        return plot() 
+        println("⚠️ No successful benchmark entry to analyze.")
+        return plot()
     end
 
     df_successful.time = [row.benchmark["time"] for row in eachrow(df_successful)]
     select!(df_successful, [:problem, :model, :solver, :grid_size, :time])
-    sort!(df_successful, [:model, :problem, :grid_size, :solver])
-    models = unique(df_successful.model)
-    model_plots = Plots.Plot[]
-
-    println("\nGenerating performance profiles by model :\n")
+    df_successful = dropmissing(df_successful, :time)
+    sort!(df_successful, [:problem, :grid_size, :model, :solver])
 
-    for m in models
-        df_sub = filter(row -> row.model == m, df_successful)
+    df_min = combine(groupby(df_successful, [:problem, :grid_size]), :time => minimum => :min_time)
+    df_successful = leftjoin(df_successful, df_min, on = [:problem, :grid_size])
+    df_successful.ratio = df_successful.time ./ df_successful.min_time
 
-        wide = pratios(df_sub) 
-        
-        if wide === nothing
-            println("Skipped model $(m) (one of the solvers missing)")
-            continue
-        end
-
-        plt = plot_performance_profile(wide, m)
+    df_successful.combo = string.("(", df_successful.model, ", ", df_successful.solver, ")")
 
-        push!(model_plots, plt)
-        println("✅ Plot created for the model $(m)")
-    end
+    function performance_profile(df)
+        combos = unique(df.combo)
+        plt = plot(
+            xlabel = "τ (Performance ratio)",
+            ylabel = "Proportion of solved instances ≤ τ",
+            title = "Performance profile — Global models × solvers",
+            legend = :bottomright,
+            xscale = :log2,
+            grid = true,
+            lw = 2,
+            size = (900, 600)
+        )
 
+        for c in combos
+            sub = filter(row -> row.combo == c, df)
+            ratios = sort(collect(skipmissing(sub.ratio)))
+            n = length(ratios)
+            y = (1:n) ./ n
+            plot!(ratios, y, label = c)
+        end
 
-    n_plots = length(model_plots)
-    if n_plots == 0
-        println("⚠️  No model plot could be generated.")
-        return plot() 
+        return plt
     end
 
-    println("\nDone: Combining $n_plots plots...")
-    
-    return plot(model_plots...; 
-        layout = (n_plots, 1),
-        size = (800, 500 * n_plots), 
-        left_margin = 10Plots.mm,
-        bottom_margin = 10Plots.mm
-    )
-end
+    plt = performance_profile(df_successful)
+    println("✅ Global performance profile generated.")
+    return plt
+end

docs/src/assets/utils.jl

@@ -5,7 +5,7 @@ include(joinpath(@__DIR__, "assets", "utils.jl"))
 
 # Define benchmark IDs
 const BENCH_CORE_UBUNTU = "core-ubuntu-latest"
-const BENCH_CORE_MOONSHOT = "core-moonshot"
+const BENCH_CORE_MOONSHOT = "core-moonshot-gpu"
 ```
 
 ## Ubuntu Latest
@@ -72,6 +72,10 @@ ENV_NAME = BENCH
 
 ### ⚡ Results
 
+```@example BENCH
+_plot_results(BENCH_CORE_MOONSHOT) # hide
+```
+
 ```@example BENCH
 _print_results(BENCH_CORE_MOONSHOT) # hide
 nothing # hide