Use safetestsets

Author: utkarsh530

src/algorithms.jl

@@ -87,7 +87,7 @@ struct SerialPSO <: PSOAlogrithm
 end
 
 function ParallelPSOKernel(num_particles::Int;
-        global_update = false, backend = CPU())
+        global_update = true, backend = CPU())
     ParallelPSOKernel(num_particles, global_update, backend)
 end
 

src/kernels.jl

@@ -13,7 +13,6 @@
     update_pos = max.(particle.position, prob.lb)
     update_pos = min.(update_pos, prob.ub)
     @set! particle.position = update_pos
-    # @set! particle.position = min(particle.position, ub)
 
     @set! particle.cost = prob.f(particle.position, prob.p)
 

src/utils.jl

@@ -109,5 +109,9 @@ end
 function check_init_bounds(prob)
     lb = prob.lb === nothing ? fill(eltype(prob.u0)(-Inf), length(prob.u0)) : prob.lb
     ub = prob.ub === nothing ? fill(eltype(prob.u0)(Inf), length(prob.u0)) : prob.ub
+    if prob.u0 isa SArray
+        lb = SVector{length(lb), eltype(lb)}(lb)
+        ub = SVector{length(ub), eltype(ub)}(ub)
+    end
     lb, ub
 end

test/Project.toml

@@ -1,5 +1,8 @@
 [deps]
+CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/gpu.jl

@@ -1,27 +1,47 @@
-Random.seed!(1234)
+using PSOGPU, StaticArrays, SciMLBase, Test, LinearAlgebra, Random
 
-## Solving the rosenbrock problem
-lb = @SArray ones(Float32, N)
-lb = -1 * lb
-ub = @SArray fill(Float32(10.0), N)
+DEVICE = get(ENV, "GROUP", "CUDA")
 
-function rosenbrock(x, p)
-    sum(p[2] * (x[i + 1] - x[i]^2)^2 + (p[1] - x[i])^2 for i in 1:(length(x) - 1))
+@eval using $(Symbol(DEVICE))
+
+if DEVICE == "CUDA"
+    backend = CUDABackend()
+elseif DEVICE == "AMDGPU"
+    backend = ROCBackend()
 end
 
-x0 = @SArray zeros(Float32, N)
-p = @SArray Float32[1.0, 100.0]
+@testset "Rosenbrock GPU tests $(N)" for N in 2:4
+    Random.seed!(1234)
+
+    ## Solving the rosenbrock problem
+    lb = @SArray ones(Float32, N)
+    lb = -1 * lb
+    ub = @SArray fill(Float32(10.0), N)
+
+    function rosenbrock(x, p)
+        sum(p[2] * (x[i + 1] - x[i]^2)^2 + (p[1] - x[i])^2 for i in 1:(length(x) - 1))
+    end
+
+    x0 = @SArray zeros(Float32, N)
+    p = @SArray Float32[1.0, 100.0]
 
-prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub)
+    prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub)
 
-n_particles = 1000
+    n_particles = 100
 
-sol = solve(prob, ParallelPSOKernel(n_particles; backend), maxiters = 500)
+    sol = solve(prob, ParallelPSOKernel(n_particles; backend), maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.retcode == ReturnCode.Default
 
-sol = solve(prob,
-    ParallelSyncPSOKernel(n_particles, backend),
-    maxiters = 500)
+    sol = solve(prob,
+        ParallelPSOKernel(n_particles; backend, global_update = false),
+        maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.retcode == ReturnCode.Default
+
+    sol = solve(prob,
+        ParallelSyncPSOKernel(n_particles, backend),
+        maxiters = 500)
+
+    @test sol.objective < 6e-4
+end

test/regression.jl

@@ -1,72 +1,76 @@
-## Solving the rosenbrock problem
-Random.seed!(1)
+using PSOGPU, StaticArrays, SciMLBase, Test, LinearAlgebra, Random
 
-lb = @SArray ones(Float32, N)
-lb = -1 * lb
-ub = @SArray fill(Float32(10.0), N)
+@testset "Rosenbrock test dimension = $(N)" for N in 2:4
 
-function rosenbrock(x, p)
-    sum(p[2] * (x[i + 1] - x[i]^2)^2 + (p[1] - x[i])^2 for i in 1:(length(x) - 1))
-end
+    ## Solving the rosenbrock problem
+    Random.seed!(1234)
+    lb = @SArray ones(Float32, N)
+    lb = -1 * lb
+    ub = @SArray fill(Float32(10.0), N)
+
+    function rosenbrock(x, p)
+        sum(p[2] * (x[i + 1] - x[i]^2)^2 + (p[1] - x[i])^2 for i in 1:(length(x) - 1))
+    end
 
-x0 = @SArray zeros(Float32, N)
-p = @SArray Float32[1.0, 100.0]
+    x0 = @SArray zeros(Float32, N)
+    p = @SArray Float32[1.0, 100.0]
 
-array_prob = OptimizationProblem(rosenbrock,
-    zeros(Float32, N),
-    Float32[1.0, 100.0];
-    lb = lb,
-    ub = ub)
+    array_prob = OptimizationProblem(rosenbrock,
+        zeros(Float32, N),
+        Float32[1.0, 100.0];
+        lb = lb,
+        ub = ub)
 
-prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub)
+    prob = OptimizationProblem(rosenbrock, x0, p; lb = lb, ub = ub)
 
-n_particles = 1000
+    n_particles = 1000
 
-sol = solve(array_prob,
-    ParallelPSOArray(n_particles),
-    maxiters = 500)
+    sol = solve(array_prob,
+        ParallelPSOArray(n_particles),
+        maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.objective < 3e-4
 
-sol = solve(prob,
-    SerialPSO(n_particles),
-    maxiters = 500)
+    sol = solve(prob,
+        SerialPSO(n_particles),
+        maxiters = 600)
 
-@test sol.objective < 1e-4
+    @test sol.objective < 1e-4
 
-lb = @SVector fill(Float32(-Inf), N)
-ub = @SVector fill(Float32(Inf), N)
+    lb = @SVector fill(Float32(-Inf), N)
+    ub = @SVector fill(Float32(Inf), N)
 
-array_prob = remake(array_prob; lb = lb, ub = ub)
-prob = remake(prob; lb = lb, ub = ub)
+    array_prob = remake(array_prob; lb = lb, ub = ub)
+    prob = remake(prob; lb = lb, ub = ub)
 
-n_particles = 2000
+    n_particles = 2000
 
-sol = solve(array_prob,
-    ParallelPSOArray(n_particles),
-    maxiters = 500)
+    sol = solve(array_prob,
+        ParallelPSOArray(n_particles),
+        maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.objective < 1e-4
 
-sol = solve(prob,
-    SerialPSO(n_particles),
-    maxiters = 500)
+    sol = solve(prob,
+        SerialPSO(n_particles),
+        maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.objective < 1e-4
 
-array_prob = remake(array_prob; lb = nothing, ub = nothing)
-prob = remake(prob; lb = nothing, ub = nothing)
+    array_prob = remake(array_prob; lb = nothing, ub = nothing)
+    prob = remake(prob; lb = nothing, ub = nothing)
 
-n_particles = 2000
+    n_particles = 2000
 
-sol = solve(array_prob,
-    ParallelPSOArray(n_particles),
-    maxiters = 500)
+    sol = solve(array_prob,
+        ParallelPSOArray(n_particles),
+        maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.objective < 1e-4
 
-sol = solve(prob,
-    SerialPSO(n_particles),
-    maxiters = 500)
+    sol = solve(prob,
+        SerialPSO(n_particles),
+        maxiters = 500)
 
-@test sol.objective < 1e-4
+    @test sol.objective < 1e-4
+end

test/runtests.jl

@@ -1,22 +1,10 @@
-using PSOGPU
-using Test, StaticArrays, LinearAlgebra, Random
+using SafeTestsets
+using Test
 
 const GROUP = get(ENV, "GROUP", "CPU")
 
-@testset "Rosenbrock test dimension = $(n)" for n in 2:4
-    global N = n
-    include("./regression.jl")
-end
+@safetestset "Regression tests" include("./regression.jl")
 
 if GROUP != "CPU"
-    @eval using $(Symbol(GROUP))
-    if GROUP == "CUDA"
-        backend = CUDABackend()
-    elseif GROUP == "AMDGPU"
-        backend = ROCBackend()
-    end
-
-    @testset "Rosenbrock on gpu" begin
-        include("./gpu.jl")
-    end
+    @safetestset "GPU optimizers tests" include("./gpu.jl")
 end