Skip to content

Commit 3cfa812

Browse files
committed
format
1 parent 378b20f commit 3cfa812

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

benchmarks/CPU_vs_GPU/benchmark.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ for n_particles in Ns
7777
## CPU solve
7878
backend = CPU()
7979
opt = ParallelSyncPSOKernel(n_particles; backend)
80-
init_gbest, particles = ParallelParticleSwarms.init_particles(prob, opt, typeof(prob.u0))
80+
init_gbest, particles = ParallelParticleSwarms.init_particles(
81+
prob, opt, typeof(prob.u0))
8182

8283
particles_eltype = eltype(particles) === Float64 ? Float32 : eltype(particles)
8384

src/ode_pso.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ function parameter_estim_ode!(prob::ODEProblem, cache,
9292

9393
KernelAbstractions.synchronize(backend)
9494

95-
gbest = ParallelParticleSwarms.SPSOGBest(best_particle.best_position, best_particle.best_cost)
95+
gbest = ParallelParticleSwarms.SPSOGBest(
96+
best_particle.best_position, best_particle.best_cost)
9697
w = w * wdamp
9798
end
9899
return gbest
@@ -145,7 +146,8 @@ function parameter_estim_ode!(prob::ODEProblem, cache,
145146

146147
KernelAbstractions.synchronize(backend)
147148

148-
gbest = ParallelParticleSwarms.SPSOGBest(best_particle.best_position, best_particle.best_cost)
149+
gbest = ParallelParticleSwarms.SPSOGBest(
150+
best_particle.best_position, best_particle.best_cost)
149151
w = w * wdamp
150152
end
151153
return gbest

test/lbfgs.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ l0 = rosenbrock(x0, p)
4444
@show sol.objective
4545

4646
@time sol = Optimization.solve(prob,
47-
ParallelParticleSwarms.HybridPSO(; local_opt = ParallelParticleSwarms.BFGS(), backend = backend),
47+
ParallelParticleSwarms.HybridPSO(;
48+
local_opt = ParallelParticleSwarms.BFGS(), backend = backend),
4849
maxiters = 30)
4950
@show sol.objective
5051

@@ -67,6 +68,7 @@ l0 = rosenbrock(x0, p)
6768
@show sol.objective
6869

6970
@time sol = Optimization.solve(prob,
70-
ParallelParticleSwarms.HybridPSO(; local_opt = ParallelParticleSwarms.BFGS(), backend = backend),
71+
ParallelParticleSwarms.HybridPSO(;
72+
local_opt = ParallelParticleSwarms.BFGS(), backend = backend),
7173
local_maxiters = 30)
7274
@show sol.objective

test/regression.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using ParallelParticleSwarms, StaticArrays, SciMLBase, Test, LinearAlgebra, Random, KernelAbstractions
1+
using ParallelParticleSwarms, StaticArrays, SciMLBase, Test, LinearAlgebra, Random,
2+
KernelAbstractions
23
using QuasiMonteCarlo
34

45
@testset "Rosenbrock test dimension = $(N)" for N in 2:3

test/reinit.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using ParallelParticleSwarms, StaticArrays, SciMLBase, Test, LinearAlgebra, Random, KernelAbstractions
1+
using ParallelParticleSwarms, StaticArrays, SciMLBase, Test, LinearAlgebra, Random,
2+
KernelAbstractions
23
using QuasiMonteCarlo
34

45
## Solving the rosenbrock problem
@@ -28,10 +29,14 @@ cache = init(prob, ParallelSyncPSOKernel(n_particles; backend = CPU()))
2829

2930
reinit!(cache)
3031

31-
cache = init(prob, ParallelParticleSwarms.HybridPSO(; local_opt = ParallelParticleSwarms.BFGS(), backend = CPU()))
32+
cache = init(prob,
33+
ParallelParticleSwarms.HybridPSO(;
34+
local_opt = ParallelParticleSwarms.BFGS(), backend = CPU()))
3235

3336
reinit!(cache)
3437

35-
cache = init(prob, ParallelParticleSwarms.HybridPSO(; local_opt = ParallelParticleSwarms.LBFGS(), backend = CPU()))
38+
cache = init(prob,
39+
ParallelParticleSwarms.HybridPSO(;
40+
local_opt = ParallelParticleSwarms.LBFGS(), backend = CPU()))
3641

3742
reinit!(cache)

0 commit comments

Comments
 (0)