From ef9f5565f8aa372e2c3ced8546a6458b3006dcbc Mon Sep 17 00:00:00 2001 From: tmigot Date: Tue, 1 Apr 2025 19:06:26 -0400 Subject: [PATCH 1/2] Specify reset! SolverCore and NLPModels --- src/main.jl | 2 +- src/trarc_solver.jl | 2 +- test/allocs.jl | 12 ++++++------ test/runtests.jl | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.jl b/src/main.jl index e5fb1cd..0d9d396 100644 --- a/src/main.jl +++ b/src/main.jl @@ -113,7 +113,7 @@ function SolverCore.solve!( xt, xtnext, ∇f, ∇fnext = workspace.xt, workspace.xtnext, workspace.∇f, workspace.∇fnext d = workspace.d Hx = get_hess(workspace.Hstruct) - reset!(stats) + SolverCore.reset!(stats) α = TR.α₀ max_unsuccinarow = TR.max_unsuccinarow diff --git a/src/trarc_solver.jl b/src/trarc_solver.jl index 184f948..a6db4e4 100644 --- a/src/trarc_solver.jl +++ b/src/trarc_solver.jl @@ -141,7 +141,7 @@ end function SolverCore.reset!(solver::TRARCSolver, nlp::AbstractNLPModel) @assert nlp.meta.nvar == solver.stp.pb.meta.nvar @assert nlp.meta.ncon == solver.stp.pb.meta.ncon - reset!(solver) + SolverCore.reset!(solver) solver.stp.pb = nlp reinit!(solver.stp) solver diff --git a/test/allocs.jl b/test/allocs.jl index 475454d..335344f 100644 --- a/test/allocs.jl +++ b/test/allocs.jl @@ -41,8 +41,8 @@ using NLPModelsTest, NLPModels, SolverCore solver = TRARCSolver(nlp; hess_type = ht, pdata_type = PDataKARC) stats = GenericExecutionStats(nlp) SolverCore.solve!(solver, nlp, stats) - reset!(solver) - reset!(nlp) + SolverCore.reset!(solver) + NLPModels.reset!(nlp) al = @wrappedallocs SolverCore.solve!(solver, nlp, stats) @test al == 0 end @@ -58,8 +58,8 @@ using NLPModelsTest, NLPModels, SolverCore solver = TRARCSolver(nlp; hess_type = ht, pdata_type = PDataKARC) stats = GenericExecutionStats(nlp) SolverCore.solve!(solver, nlp, stats) - reset!(solver) - reset!(nlp) + SolverCore.reset!(solver) + NLPModels.reset!(nlp) al = @wrappedallocs SolverCore.solve!(solver, nlp, stats) @test al == 0 end @@ -88,10 +88,10 @@ norm_∇f = norm(∇f) using Profile, PProf Profile.Allocs.clear() NLPModels.reset!(nlp) -reset!(solver) +SolverCore.reset!(solver) @time solve!(solver, nlp, stats) NLPModels.reset!(nlp) -reset!(solver) +SolverCore.reset!(solver) @time Profile.Allocs.@profile sample_rate=1 solve!(solver, nlp, stats) PProf.Allocs.pprof(from_c = false) diff --git a/test/runtests.jl b/test/runtests.jl index 30b0c91..1747698 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -39,10 +39,10 @@ end eval(solver)(nlpstop, verbose = verbose) final_nlp_at_x, optimal = nlpstop.current_state, nlpstop.meta.optimal @test optimal - reset!(nlp) + NLPModels.reset!(nlp) stats = eval(solver)(nlp, verbose = verbose) @test stats.status == :first_order - reset!(nlp) + NLPModels.reset!(nlp) end end From 2f3636f071b1dcc6b052a8f59be8352420117c48 Mon Sep 17 00:00:00 2001 From: tmigot Date: Tue, 1 Apr 2025 19:12:15 -0400 Subject: [PATCH 2/2] fix ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 409e0d1..54b2a7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: actions/cache@v1 + - uses: actions/cache@v4 env: cache-name: cache-artifacts with: