diff --git a/Project.toml b/Project.toml index 27494738..89547bb6 100644 --- a/Project.toml +++ b/Project.toml @@ -24,7 +24,7 @@ AMDGPU = "2" CTBase = "0.29, 0.30" CTModels = "0.18, 0.19" CTParser = "0.9" -CTSolvers = "0.5" +CTSolvers = "0.6" CUDA = "6" CUDSS = "0.8" CommonSolve = "0.2" diff --git a/test/ci/test_all_ocp.jl b/test/ci/test_all_ocp.jl index 482e2276..bc00387e 100644 --- a/test/ci/test_all_ocp.jl +++ b/test/ci/test_all_ocp.jl @@ -85,15 +85,14 @@ end # Deterministic on the Julia 1.12 CI runners, flaky on 1.10. # Upstream: JuliaSmoothOptimizers/ADNLPModels.jl#383 -#if !isdefined(Main, :moonlander) -# include("../problems/moonlander.jl") -#end -#@testset verbose = true showtiming = true ":moonlander" begin -# test_problem(moonlander(); adnlp_backend=:manual) -#end +if !isdefined(Main, :moonlander) + include("../problems/moonlander.jl") +end +@testset verbose = true showtiming = true ":moonlander" begin + test_problem(moonlander(); display=true) +end -# NB: the ":quadrotor" testset below always ran moonlander() (copy-paste slip) -- # quadrotor if !isdefined(Main, :quadrotor) include("../problems/quadrotor.jl") diff --git a/test/manual_test.jl b/test/manual_test.jl index 0f15ed58..a7417034 100644 --- a/test/manual_test.jl +++ b/test/manual_test.jl @@ -6,11 +6,12 @@ include("test_common.jl") include("./problems/beam.jl") include("./problems/goddard.jl") include("./problems/double_integrator.jl") +include("./problems/moonlander.jl") include("./problems/truck_trailer.jl") -sol = solve_problem(goddard(); display=true, scheme=:gauss_legendre_2) -sol1 = solve_problem(goddard(); display=true, scheme=:gauss_legendre_2, adnlp_backend=:manual) -sol2 = solve_problem(goddard(); display=true, scheme=:gauss_legendre_2_constant_control, adnlp_backend=:manual) +sol = solve_problem(moonlander(); display=true) +sol1 = solve_problem(moonlander(); display=true, adnlp_backend=:manual) + #=sol0 = solve_problem(truck_trailer(); display=false) @@ -25,4 +26,4 @@ println("J ", objective(sol2), " tf ", variable(sol2)) # cf https://github.com/JuliaSmoothOptimizers/ADNLPModels.jl/issues/280 # even then we get errors... #sol3 = solve_problem(double_integrator_minenergy(); discretizer=:direct_shooting, -#scheme=:variable, grid_size=10, display=true, backend=:generic) \ No newline at end of file +#scheme=:variable, grid_size=10, display=true, backend=:generic)