Skip to content

Commit ee8d2f4

Browse files
committed
format
1 parent a441d2c commit ee8d2f4

File tree

7 files changed

+22
-35
lines changed

7 files changed

+22
-35
lines changed

benchmarks/CPU_vs_GPU/benchmark.jl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ plt = plot(Ns,
205205
xticks = xticks,
206206
yticks = yticks,
207207
marker = :circle,
208-
dpi = 600
209-
# color = :Green
208+
dpi = 600 # color = :Green
210209
)
211210

212211
plt = plot!(Ns,
@@ -216,8 +215,7 @@ plt = plot!(Ns,
216215
linewidth = 2,
217216
label = "ParallelSyncPSOKernel: CPU",
218217
marker = :circle,
219-
ls = :dash
220-
# color = :Orange
218+
ls = :dash # color = :Orange
221219
)
222220

223221
plt = plot!(Ns,
@@ -226,8 +224,7 @@ plt = plot!(Ns,
226224
yaxis = :log,
227225
linewidth = 2,
228226
label = "ParallelPSOKernel (Async): GPU",
229-
marker = :circle
230-
# color = :Green
227+
marker = :circle # color = :Green
231228
)
232229

233230
plt = plot!(Ns,
@@ -236,8 +233,7 @@ plt = plot!(Ns,
236233
yaxis = :log,
237234
linewidth = 2,
238235
label = "ParallelPSOKernel (Queue-lock): GPU",
239-
marker = :circle
240-
# color = :Green
236+
marker = :circle # color = :Green
241237
)
242238

243239
plt = plot!(Ns,
@@ -246,8 +242,7 @@ plt = plot!(Ns,
246242
yaxis = :log,
247243
linewidth = 2,
248244
label = "HybridPSO-LBFGS: GPU",
249-
marker = :circle
250-
# color = :Green
245+
marker = :circle # color = :Green
251246
)
252247

253248
savefig("benchmark_hybrid.svg")

benchmarks/CPU_vs_GPU/wp_algs.jl

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ plt = plot(gpu_sync_times,
167167
xticks = xticks,
168168
yticks = yticks,
169169
marker = :circle,
170-
dpi = 600
171-
# color = :Green
170+
dpi = 600 # color = :Green
172171
)
173172

174173
plt = plot!(cpu_times,
@@ -187,8 +186,7 @@ plt = plot!(gpu_async_times,
187186
yaxis = :log,
188187
linewidth = 2,
189188
label = "ParallelPSOKernel (Async): GPU",
190-
marker = :circle
191-
# color = :Green
189+
marker = :circle # color = :Green
192190
)
193191

194192
plt = plot!(gpu_queue_lock_times,
@@ -197,8 +195,7 @@ plt = plot!(gpu_queue_lock_times,
197195
yaxis = :log,
198196
linewidth = 2,
199197
label = "ParallelPSOKernel (Queue-lock): GPU",
200-
marker = :circle
201-
# color = :Green
198+
marker = :circle # color = :Green
202199
)
203200

204201
plt = plot!(gpu_hybrid_times,
@@ -207,8 +204,7 @@ plt = plot!(gpu_hybrid_times,
207204
yaxis = :log,
208205
linewidth = 2,
209206
label = "HybridPSO-LBFGS: GPU",
210-
marker = :circle
211-
# color = :Green
207+
marker = :circle # color = :Green
212208
)
213209

214210
savefig("wp_pso.svg")
@@ -434,8 +430,7 @@ plt = plot(lbfgs_time,
434430
xticks = xticks,
435431
yticks = yticks,
436432
marker = :circle,
437-
dpi = 600
438-
# color = :Green
433+
dpi = 600 # color = :Green
439434
)
440435

441436
plt = plot!(adam_time,
@@ -444,8 +439,7 @@ plt = plot!(adam_time,
444439
yaxis = :log,
445440
linewidth = 2,
446441
label = "ADAM",
447-
marker = :circle
448-
# color = :Orange
442+
marker = :circle # color = :Orange
449443
)
450444

451445
plt = plot!(pso_cpu_time,
@@ -454,8 +448,7 @@ plt = plot!(pso_cpu_time,
454448
# yaxis = :log,
455449
linewidth = 2,
456450
label = "ParallelSyncPSOKernel: CPU",
457-
marker = :circle
458-
# color = :Green
451+
marker = :circle # color = :Green
459452
)
460453

461454
plt = plot!(queue_lock_time,
@@ -464,8 +457,7 @@ plt = plot!(queue_lock_time,
464457
yaxis = :log,
465458
linewidth = 2,
466459
label = "ParallelPSOKernel (queue-lock): GPU",
467-
marker = :circle
468-
# color = :Orange
460+
marker = :circle # color = :Orange
469461
)
470462

471463
plt = plot!(hybrid_time,
@@ -474,8 +466,7 @@ plt = plot!(hybrid_time,
474466
yaxis = :log,
475467
linewidth = 2,
476468
label = "HybridPSO-LBFGS: GPU",
477-
marker = :circle
478-
# color = :Orange
469+
marker = :circle # color = :Orange
479470
)
480471

481472
plt = plot!(bbo_time,
@@ -484,8 +475,7 @@ plt = plot!(bbo_time,
484475
# yaxis = :log,
485476
linewidth = 2,
486477
label = "BlackboxOptim",
487-
marker = :circle
488-
# color = :Green
478+
marker = :circle # color = :Green
489479
)
490480

491481
savefig("wp_algs.svg")

benchmarks/Fitzhugh_Nagumo/ode_estimation.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ ub = @SArray fill(5.0f0, 4)
6161

6262
u_guess = @MArray zeros(Float32, 4)
6363

64-
optprob = OptimizationProblem(Optimization.OptimizationFunction(loss,
64+
optprob = OptimizationProblem(
65+
Optimization.OptimizationFunction(loss,
6566
Optimization.AutoForwardDiff()),
6667
u_guess,
6768
(prob_short, t_short))

benchmarks/Lotka_Volterra/lotka_volterra.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ optprob = OptimizationProblem(loss, opt_u0, (prob_short, t_short); lb = lb, ub =
5353

5454
u_guess = @MArray zeros(Float64, 4)
5555

56-
optprob = OptimizationProblem(Optimization.OptimizationFunction(loss,
56+
optprob = OptimizationProblem(
57+
Optimization.OptimizationFunction(loss,
5758
Optimization.AutoForwardDiff()),
5859
u_guess,
5960
(prob_short, t_short))

benchmarks/NeuralODE/adam_opt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using Pkg
33
Pkg.activate(@__DIR__)
44

55
using SimpleChains,
6-
StaticArrays, OrdinaryDiffEq, SciMLSensitivity, Optimization, OptimizationFlux, Plots
6+
StaticArrays, OrdinaryDiffEq, SciMLSensitivity, Optimization, OptimizationFlux, Plots
77

88
using CUDA
99
device!(2)

benchmarks/adam_opt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using SimpleChains,
2-
StaticArrays, OrdinaryDiffEq, SciMLSensitivity, Optimization, OptimizationFlux, Plots
2+
StaticArrays, OrdinaryDiffEq, SciMLSensitivity, Optimization, OptimizationFlux, Plots
33

44
#device!(2)
55
# Get Tesla V100S

src/PSOGPU.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ include("./bfgs.jl")
6868
include("./hybrid.jl")
6969

7070
export ParallelPSOKernel,
71-
ParallelSyncPSOKernel, ParallelPSOArray, SerialPSO, OptimizationProblem, solve
71+
ParallelSyncPSOKernel, ParallelPSOArray, SerialPSO, OptimizationProblem, solve
7272
end

0 commit comments

Comments
 (0)