Skip to content

Commit 623214b

Browse files
Vaibhavdixit02Vaibhavdixit02
committed
Format and sparsearrays only 1.10
1 parent 880fc54 commit 623214b

File tree

14 files changed

+79
-36
lines changed

14 files changed

+79
-36
lines changed

‎Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ProgressLogging = "0.1"
5858
Reexport = "1.2"
5959
ReverseDiff = "1.14"
6060
SciMLBase = "2.16.3"
61-
SparseArrays = "1.9, 1.10"
61+
SparseArrays = "1.10"
6262
SparseDiffTools = "2.14"
6363
SymbolicIndexingInterface = "0.3"
6464
Symbolics = "5.12"

‎lib/OptimizationBBO/src/OptimizationBBO.jl

+8-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,10 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
117117
else
118118
n_steps = BlackBoxOptim.num_steps(trace)
119119
curr_u = decompose_trace(trace, cache.progress)
120-
opt_state = Optimization.OptimizationState(iteration = n_steps, u = curr_u, objective = x[1], solver_state = trace)
120+
opt_state = Optimization.OptimizationState(iteration = n_steps,
121+
u = curr_u,
122+
objective = x[1],
123+
solver_state = trace)
121124
cb_call = cache.callback(opt_state, x...)
122125
end
123126

@@ -178,7 +181,10 @@ function SciMLBase.__solve(cache::Optimization.OptimizationCache{
178181
t1 = time()
179182

180183
opt_ret = Symbol(opt_res.stop_reason)
181-
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations, time = t1 - t0, fevals = opt_res.f_calls)
184+
stats = Optimization.OptimizationStats(;
185+
iterations = opt_res.iterations,
186+
time = t1 - t0,
187+
fevals = opt_res.f_calls)
182188
SciMLBase.build_solution(cache, cache.opt,
183189
BlackBoxOptim.best_candidate(opt_res),
184190
BlackBoxOptim.best_fitness(opt_res);

‎lib/OptimizationCMAEvolutionStrategy/src/OptimizationCMAEvolutionStrategy.jl

+8-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ function __map_optimizer_args(prob::OptimizationCache, opt::CMAEvolutionStrategy
2222
end
2323

2424
mapped_args = (; lower = prob.lb,
25-
upper = prob.ub, logger = CMAEvolutionStrategy.BasicLogger(prob.u0; verbosity = 0, callback = callback))
25+
upper = prob.ub,
26+
logger = CMAEvolutionStrategy.BasicLogger(prob.u0;
27+
verbosity = 0,
28+
callback = callback))
2629

2730
if !isnothing(maxiters)
2831
mapped_args = (; mapped_args..., maxiter = maxiters)
@@ -105,7 +108,10 @@ function SciMLBase.__solve(cache::OptimizationCache{
105108
t1 = time()
106109

107110
opt_ret = opt_res.stop.reason
108-
stats = Optimization.OptimizationStats(; iterations = length(opt_res.logger.fmedian), time = t1 - t0, fevals = length(opt_res.logger.fmedian))
111+
stats = Optimization.OptimizationStats(;
112+
iterations = length(opt_res.logger.fmedian),
113+
time = t1 - t0,
114+
fevals = length(opt_res.logger.fmedian))
109115
SciMLBase.build_solution(cache, cache.opt,
110116
opt_res.logger.xbest[end],
111117
opt_res.logger.fbest[end]; original = opt_res,

‎lib/OptimizationCMAEvolutionStrategy/test/runtests.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using Test
1212
@test 10 * sol.objective < l1
1313

1414
function cb(state, args...)
15-
if state.iteration %10 == 0
15+
if state.iteration % 10 == 0
1616
println(state.u)
1717
end
1818
return false

‎lib/OptimizationEvolutionary/src/OptimizationEvolutionary.jl

+4-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ function SciMLBase.__solve(cache::OptimizationCache{
8585

8686
function _cb(trace)
8787
curr_u = decompose_trace(trace).metadata["x"][end]
88-
opt_state = Optimization.OptimizationState(; iteration = decompose_trace(trace).iteration,
88+
opt_state = Optimization.OptimizationState(;
89+
iteration = decompose_trace(trace).iteration,
8990
u = curr_u,
9091
objective = x[1],
9192
solver_state = trace)
@@ -132,8 +133,8 @@ function SciMLBase.__solve(cache::OptimizationCache{
132133
end
133134
t1 = time()
134135
opt_ret = Symbol(Evolutionary.converged(opt_res))
135-
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations
136-
, time = t1 - t0, fevals = opt_res.f_calls)
136+
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
137+
time = t1 - t0, fevals = opt_res.f_calls)
137138
SciMLBase.build_solution(cache, cache.opt,
138139
Evolutionary.minimizer(opt_res),
139140
Evolutionary.minimum(opt_res); original = opt_res,

‎lib/OptimizationEvolutionary/test/runtests.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Random.seed!(1234)
3636
@test sol.objective < l1
3737

3838
function cb(state, args...)
39-
if state.iteration %10 == 0
39+
if state.iteration % 10 == 0
4040
println(state.u)
4141
end
4242
return false

‎lib/OptimizationFlux/src/OptimizationFlux.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function SciMLBase.__solve(cache::OptimizationCache{
102102
end
103103

104104
t1 = time()
105-
stats = Optimization.OptimizationStats(; iterations = maxiters,
105+
stats = Optimization.OptimizationStats(; iterations = maxiters,
106106
time = t1 - t0, fevals = maxiters, gevals = maxiters)
107107
SciMLBase.build_solution(cache, opt, θ, x[1], stats = stats)
108108
# here should be build_solution to create the output message

‎lib/OptimizationGCMAES/src/OptimizationGCMAES.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ function SciMLBase.__solve(cache::OptimizationCache{
114114
cache.ub; opt_args...)
115115
end
116116
t1 = time()
117-
stats = Optimization.OptimizationStats(; iterations = maxiters === nothing ? 0 : maxiters,
118-
time = t1 - t0)
117+
stats = Optimization.OptimizationStats(;
118+
iterations = maxiters === nothing ? 0 : maxiters,
119+
time = t1 - t0)
119120
SciMLBase.build_solution(cache, cache.opt,
120121
opt_xmin, opt_fmin; retcode = Symbol(Bool(opt_ret)),
121-
stats = stats
122-
)
122+
stats = stats)
123123
end
124124

125125
end

‎lib/OptimizationMOI/src/nlp.jl

+3-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ function MOI.eval_objective(evaluator::MOIOptimizationNLPEvaluator, x)
218218
else
219219
l = evaluator.f(x, evaluator.p)
220220
evaluator.iteration += 1
221-
state = Optimization.OptimizationState(iteration = evaluator.iteration, u = x, objective = l[1])
221+
state = Optimization.OptimizationState(iteration = evaluator.iteration,
222+
u = x,
223+
objective = l[1])
222224
evaluator.callback(state, l)
223225
return l
224226
end

‎lib/OptimizationOptimJL/src/OptimizationOptimJL.jl

+26-11
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,12 @@ function SciMLBase.__solve(cache::OptimizationCache{
133133
error("Use OptimizationFunction to pass the derivatives or automatically generate them with one of the autodiff backends")
134134

135135
function _cb(trace)
136-
θ = cache.opt isa Optim.NelderMead ? decompose_trace(trace).metadata["centroid"] : decompose_trace(trace).metadata["x"]
137-
opt_state = Optimization.OptimizationState(iteration = trace.iteration, u = θ, objective = x[1], solver_state = trace)
136+
θ = cache.opt isa Optim.NelderMead ? decompose_trace(trace).metadata["centroid"] :
137+
decompose_trace(trace).metadata["x"]
138+
opt_state = Optimization.OptimizationState(iteration = trace.iteration,
139+
u = θ,
140+
objective = x[1],
141+
solver_state = trace)
138142
cb_call = cache.callback(opt_state, x...)
139143
if !(cb_call isa Bool)
140144
error("The callback should return a boolean `halt` for whether to stop the optimization process.")
@@ -208,8 +212,9 @@ function SciMLBase.__solve(cache::OptimizationCache{
208212
opt_res = Optim.optimize(optim_f, cache.u0, cache.opt, opt_args)
209213
t1 = time()
210214
opt_ret = Symbol(Optim.converged(opt_res))
211-
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
212-
time = t1 - t0, fevals = opt_res.f_calls, gevals = opt_res.g_calls, hevals = opt_res.h_calls)
215+
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
216+
time = t1 - t0, fevals = opt_res.f_calls, gevals = opt_res.g_calls,
217+
hevals = opt_res.h_calls)
213218
SciMLBase.build_solution(cache, cache.opt,
214219
opt_res.minimizer,
215220
cache.sense === Optimization.MaxSense ? -opt_res.minimum :
@@ -247,8 +252,13 @@ function SciMLBase.__solve(cache::OptimizationCache{
247252
cur, state = iterate(cache.data)
248253

249254
function _cb(trace)
250-
θ = !(cache.opt isa Optim.SAMIN) && cache.opt.method == Optim.NelderMead() ? decompose_trace(trace).metadata["centroid"] : decompose_trace(trace).metadata["x"]
251-
opt_state = Optimization.OptimizationState(iteration = trace.iteration, u = θ, objective = x[1], solver_state = trace)
255+
θ = !(cache.opt isa Optim.SAMIN) && cache.opt.method == Optim.NelderMead() ?
256+
decompose_trace(trace).metadata["centroid"] :
257+
decompose_trace(trace).metadata["x"]
258+
opt_state = Optimization.OptimizationState(iteration = trace.iteration,
259+
u = θ,
260+
objective = x[1],
261+
solver_state = trace)
252262
cb_call = cache.callback(opt_state, x...)
253263
if !(cb_call isa Bool)
254264
error("The callback should return a boolean `halt` for whether to stop the optimization process.")
@@ -297,8 +307,9 @@ function SciMLBase.__solve(cache::OptimizationCache{
297307
opt_res = Optim.optimize(optim_f, cache.lb, cache.ub, cache.u0, cache.opt, opt_args)
298308
t1 = time()
299309
opt_ret = Symbol(Optim.converged(opt_res))
300-
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
301-
time = t1 - t0, fevals = opt_res.f_calls, gevals = opt_res.g_calls, hevals = opt_res.h_calls)
310+
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
311+
time = t1 - t0, fevals = opt_res.f_calls, gevals = opt_res.g_calls,
312+
hevals = opt_res.h_calls)
302313
SciMLBase.build_solution(cache, cache.opt,
303314
opt_res.minimizer, opt_res.minimum;
304315
original = opt_res, retcode = opt_ret, stats = stats)
@@ -331,7 +342,10 @@ function SciMLBase.__solve(cache::OptimizationCache{
331342
cur, state = iterate(cache.data)
332343

333344
function _cb(trace)
334-
opt_state = Optimization.OptimizationState(iteration = trace.iteration, u = decompose_trace(trace).metadata["x"], objective = x[1], solver_state = trace)
345+
opt_state = Optimization.OptimizationState(iteration = trace.iteration,
346+
u = decompose_trace(trace).metadata["x"],
347+
objective = x[1],
348+
solver_state = trace)
335349
cb_call = cache.callback(opt_state, x...)
336350
if !(cb_call isa Bool)
337351
error("The callback should return a boolean `halt` for whether to stop the optimization process.")
@@ -412,8 +426,9 @@ function SciMLBase.__solve(cache::OptimizationCache{
412426
opt_res = Optim.optimize(optim_f, optim_fc, cache.u0, cache.opt, opt_args)
413427
t1 = time()
414428
opt_ret = Symbol(Optim.converged(opt_res))
415-
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
416-
time = t1 - t0, fevals = opt_res.f_calls, gevals = opt_res.g_calls, hevals = opt_res.h_calls)
429+
stats = Optimization.OptimizationStats(; iterations = opt_res.iterations,
430+
time = t1 - t0, fevals = opt_res.f_calls, gevals = opt_res.g_calls,
431+
hevals = opt_res.h_calls)
417432
SciMLBase.build_solution(cache, cache.opt,
418433
opt_res.minimizer, opt_res.minimum;
419434
original = opt_res, retcode = opt_ret,

‎lib/OptimizationOptimisers/src/OptimizationOptimisers.jl

+10-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ function SciMLBase.__solve(cache::OptimizationCache{
6767
for (i, d) in enumerate(data)
6868
cache.f.grad(G, θ, d...)
6969
x = cache.f(θ, cache.p, d...)
70-
opt_state = Optimization.OptimizationState(iteration = i, u = θ, objective = x[1], gradient = G, solver_state = state)
70+
opt_state = Optimization.OptimizationState(iteration = i,
71+
u = θ,
72+
objective = x[1],
73+
gradient = G,
74+
solver_state = state)
7175
cb_call = cache.callback(opt_state, x...)
7276
if !(cb_call isa Bool)
7377
error("The callback should return a boolean `halt` for whether to stop the optimization process. Please see the `solve` documentation for information.")
@@ -88,7 +92,11 @@ function SciMLBase.__solve(cache::OptimizationCache{
8892
x = min_err
8993
θ = min_θ
9094
cache.f.grad(G, θ, d...)
91-
opt_state = Optimization.OptimizationState(iteration = i, u = θ, objective = x[1], gradient = G, solver_state = state)
95+
opt_state = Optimization.OptimizationState(iteration = i,
96+
u = θ,
97+
objective = x[1],
98+
gradient = G,
99+
solver_state = state)
92100
cache.callback(opt_state, x...)
93101
break
94102
end

‎lib/OptimizationOptimisers/test/runtests.jl

+7-3
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@ using Zygote
6161

6262
prob = OptimizationProblem(optprob, x0, _p)
6363
function callback(state, l)
64-
Optimisers.adjust!(state.solver_state, 0.1/state.iteration)
64+
Optimisers.adjust!(state.solver_state, 0.1 / state.iteration)
6565
return false
6666
end
67-
sol = solve(prob, Optimisers.Adam(0.1), maxiters = 1000, progress = false, callback = callback)
67+
sol = solve(prob,
68+
Optimisers.Adam(0.1),
69+
maxiters = 1000,
70+
progress = false,
71+
callback = callback)
6872
end
6973

70-
@test_throws ArgumentError sol = solve(prob, Optimisers.Adam())
74+
@test_throws ArgumentError sol=solve(prob, Optimisers.Adam())
7175
end

‎src/stats_state.jl

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ struct OptimizationStats
77
hevals::Int
88
end
99

10-
OptimizationStats(; iterations = 0, time = 0.0, fevals = 0, gevals = 0, hevals = 0) =
10+
function OptimizationStats(; iterations = 0, time = 0.0, fevals = 0, gevals = 0, hevals = 0)
1111
OptimizationStats(iterations, time, fevals, gevals, hevals)
12+
end
1213

1314
struct OptimizationState{X, O, G, H, S}
1415
iteration::Int
@@ -19,6 +20,7 @@ struct OptimizationState{X, O, G, H, S}
1920
solver_state::S
2021
end
2122

22-
OptimizationState(; iteration = 0, u = nothing, objective = nothing,
23-
gradient = nothing, hessian = nothing, solver_state = nothing) =
23+
function OptimizationState(; iteration = 0, u = nothing, objective = nothing,
24+
gradient = nothing, hessian = nothing, solver_state = nothing)
2425
OptimizationState(iteration, u, objective, gradient, hessian, solver_state)
26+
end

‎test/diffeqfluxtests.jl

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ end
3535

3636
iter = 0
3737
callback = function (state, l, pred)
38-
3938
display(l)
4039

4140
# using `remake` to re-create our `prob` with current parameters `p`

0 commit comments

Comments
 (0)