Skip to content

Commit 4b901d4

Browse files
committed
Fix tests
1 parent 9b6f12c commit 4b901d4

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

test/gpu.jl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,7 @@ sol = solve(prob, ParallelPSOKernel(n_particles; backend), maxiters = 500)
2121
@test sol.objective < 1e-4
2222

2323
sol = solve(prob,
24-
ParallelSyncPSO(n_particles, backend),
25-
maxiters = 500)
26-
27-
@test sol.objective < 1e-4
28-
29-
prob = OptimizationProblem(rosenbrock, x0, p)
30-
31-
n_particles = 2000
32-
33-
sol = solve(prob,
34-
ParallelPSOKernel(n_particles; threaded = true),
24+
ParallelSyncPSOKernel(n_particles, backend),
3525
maxiters = 500)
3626

3727
@test sol.objective < 1e-4

test/regression.jl

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,61 @@ end
1212
x0 = @SArray zeros(Float32, N)
1313
p = @SArray Float32[1.0, 100.0]
1414

15+
array_prob = OptimizationProblem(rosenbrock,
16+
zeros(Float32, N),
17+
Float32[1.0, 100.0];
18+
lb = lb,
19+
ub = ub)
20+
1521
prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub)
1622

1723
n_particles = 1000
1824

19-
sol = solve(prob,
20-
ParallelPSOKernel(n_particles; threaded = true),
25+
sol = solve(array_prob,
26+
ParallelPSOArray(n_particles),
2127
maxiters = 500)
2228

2329
@test sol.objective < 1e-4
2430

2531
sol = solve(prob,
26-
ParallelPSOKernel(n_particles; threaded = false),
32+
SerialPSO(n_particles),
2733
maxiters = 500)
2834

2935
@test sol.objective < 1e-4
3036

3137
lb = @SVector fill(Float32(-Inf), N)
3238
ub = @SVector fill(Float32(Inf), N)
33-
prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub, N)
39+
40+
array_prob = remake(array_prob; lb = lb, ub = ub)
41+
prob = remake(prob; lb = lb, ub = ub)
3442

3543
n_particles = 2000
3644

37-
sol = solve(prob,
38-
ParallelPSOKernel(n_particles; threaded = true),
45+
sol = solve(array_prob,
46+
ParallelPSOArray(n_particles),
3947
maxiters = 500)
4048

4149
@test sol.objective < 1e-4
4250

4351
sol = solve(prob,
44-
ParallelPSOKernel(n_particles; threaded = false),
52+
SerialPSO(n_particles),
4553
maxiters = 500)
4654

4755
@test sol.objective < 1e-4
4856

49-
prob = OptimizationProblem(rosenbrock, x0, p)
57+
array_prob = remake(array_prob; lb = nothing, ub = nothing)
58+
prob = remake(prob; lb = nothing, ub = nothing)
5059

5160
n_particles = 2000
5261

53-
sol = solve(prob,
54-
ParallelPSOKernel(n_particles; threaded = true),
62+
sol = solve(array_prob,
63+
ParallelPSOArray(n_particles),
5564
maxiters = 500)
5665

5766
@test sol.objective < 1e-4
5867

5968
sol = solve(prob,
60-
ParallelPSOKernel(n_particles; threaded = false),
69+
SerialPSO(n_particles),
6170
maxiters = 500)
6271

6372
@test sol.objective < 1e-4

0 commit comments

Comments
 (0)