Skip to content

Commit 8d3ff5f

Browse files
fix: pin HarmoniqsBenchmarks to compat-widened branch, autoformat
- Pin HarmoniqsBenchmarks source to fix/widen-dto-compat branch which has DirectTrajOpt compat "0.8, 0.9" (fixes Pkg.instantiate failure) - Run JuliaFormatter on benchmark files Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a7f1246 commit 8d3ff5f

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

benchmark/Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ TestItems = "1c621080-faea-4a02-84b6-bbd5e436b8fe"
1515

1616
[sources]
1717
DirectTrajOpt = {path = ".."}
18-
HarmoniqsBenchmarks = {url = "https://github.com/harmoniqs/HarmoniqsBenchmarks.jl"}
18+
# TODO: remove rev pin once HarmoniqsBenchmarks.jl#2 merges to main
19+
HarmoniqsBenchmarks = {url = "https://github.com/harmoniqs/HarmoniqsBenchmarks.jl", rev = "fix/widen-dto-compat"}

benchmark/benchmarks.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using TestItems
88
include("$(joinpath(@__DIR__, "problem_utils.jl"))")
99

1010
N = 51
11-
prob = make_bilinear_problem(; N=N, seed=42)
11+
prob = make_bilinear_problem(; N = N, seed = 42)
1212

1313
evaluator, Z_vec = build_evaluator(prob)
1414
dims = evaluator_dims(evaluator)
@@ -59,7 +59,8 @@ using TestItems
5959
try
6060
String(strip(read(`git rev-parse --short HEAD`, String)))
6161
catch
62-
; "unknown"
62+
;
63+
"unknown"
6364
end
6465
),
6566
benchmark_name = "evaluator_micro_bilinear_N51",
@@ -98,15 +99,15 @@ end
9899

99100
runner = get(ENV, "BENCHMARK_RUNNER", "local")
100101

101-
prob_ipopt = make_bilinear_problem(; N=51, seed=42)
102+
prob_ipopt = make_bilinear_problem(; N = 51, seed = 42)
102103
result_ipopt = benchmark_solve!(
103104
prob_ipopt,
104105
IpoptOptions(max_iter = 200, print_level = 0);
105106
benchmark_name = "bilinear_N51_ipopt",
106107
runner = runner,
107108
)
108109

109-
prob_madnlp = make_bilinear_problem(; N=51, seed=42)
110+
prob_madnlp = make_bilinear_problem(; N = 51, seed = 42)
110111
result_madnlp = benchmark_solve!(
111112
prob_madnlp,
112113
MadNLPOptions(max_iter = 200, print_level = 6);

benchmark/problem_utils.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ function make_scaled_problem(; N::Int, state_dim::Int, n_controls::Int = 2, seed
7171
final = (u = zeros(n_controls),),
7272
goal = (x = x_goal,),
7373
)
74-
integrators =
75-
[BilinearIntegrator(G, :x, :u, traj), DerivativeIntegrator(:u, :du, traj)]
74+
integrators = [BilinearIntegrator(G, :x, :u, traj), DerivativeIntegrator(:u, :du, traj)]
7675
J = QuadraticRegularizer(:u, traj, 1.0)
7776
return DirectTrajOptProblem(traj, J, integrators)
7877
end

0 commit comments

Comments
 (0)