Skip to content

Commit 7b67a25

Browse files
Merge pull request #367 from SciML/fix-remaining-warnings
Fix remaining CI warnings and test failures
2 parents 34501e6 + 935fabe commit 7b67a25

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

test/gpu_kernel_de/conversions.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ monteprob = EnsembleProblem(prob, prob_func = prob_func, safetycopy = false)
2323
if ENV["GROUP"] ("Metal", "oneAPI")
2424
@test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
2525
trajectories = 10_000,
26-
saveat = 1:10)[1].t == Float32.(1:10)
26+
saveat = 1:10).u[1].t == Float32.(1:10)
2727

2828
@test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
2929
trajectories = 10_000,
30-
saveat = 1:0.1:10)[1].t == 1.0f0:0.1f0:10.0f0
30+
saveat = 1:0.1:10).u[1].t == 1.0f0:0.1f0:10.0f0
3131

3232
@test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
3333
trajectories = 10_000,
34-
saveat = 1:(1.0f0):10)[1].t == 1:1.0f0:10
34+
saveat = 1:(1.0f0):10).u[1].t == 1:1.0f0:10
3535

3636
@test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
3737
trajectories = 10_000,
38-
saveat = 1.0)[1].t == 0.0f0:1.0f0:10.0f0
38+
saveat = 1.0).u[1].t == 0.0f0:1.0f0:10.0f0
3939
end
4040

4141
@test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
4242
trajectories = 10_000,
43-
saveat = [1.0f0, 5.0f0, 10.0f0])[1].t == [1.0f0, 5.0f0, 10.0f0]
43+
saveat = [1.0f0, 5.0f0, 10.0f0]).u[1].t == [1.0f0, 5.0f0, 10.0f0]
4444

4545
@test solve(monteprob, GPUTsit5(), EnsembleGPUKernel(backend),
4646
trajectories = 10_000,
47-
saveat = [1.0, 5.0, 10.0])[1].t == [1.0f0, 5.0f0, 10.0f0]
47+
saveat = [1.0, 5.0, 10.0]).u[1].t == [1.0f0, 5.0f0, 10.0f0]

test/gpu_kernel_de/gpu_ode_continuous_callbacks.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
4141
bench_sol = solve(prob, diffeq_alg,
4242
adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
4343

44-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
44+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
4545

4646
@info "Callback: CallbackSets"
4747

@@ -54,7 +54,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
5454
bench_sol = solve(prob, diffeq_alg,
5555
adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
5656

57-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
57+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
5858

5959
@info "saveat and callbacks"
6060

@@ -67,7 +67,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
6767
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
6868
saveat = [0.0f0, 9.1f0])
6969

70-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
70+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
7171

7272
@info "save_everystep and callbacks"
7373

@@ -80,7 +80,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
8080
adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true,
8181
save_everystep = false)
8282

83-
@test norm(bench_sol.u - sol.u[1].u) < 7e-4
83+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 7e-4
8484

8585
@info "Adaptive version"
8686

@@ -94,7 +94,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
9494
adaptive = true, save_everystep = false, dt = 0.1f0, callback = cb,
9595
merge_callbacks = true)
9696

97-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
97+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
9898

9999
@info "Callback: CallbackSets"
100100

@@ -108,7 +108,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
108108
adaptive = true, dt = 0.1f0, save_everystep = false, callback = cb,
109109
merge_callbacks = true)
110110

111-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
111+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
112112

113113
@info "saveat and callbacks"
114114

@@ -123,7 +123,7 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
123123
tstops = [24.0f0, 40.0f0], saveat = [0.0f0, 9.1f0], reltol = 1.0f-6,
124124
abstol = 1.0f-6)
125125

126-
@test norm(bench_sol.u - sol.u[1].u) < 8e-4
126+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 8e-4
127127

128128
@info "Unadaptive and Adaptive comparison"
129129

test/gpu_kernel_de/gpu_sde_regression.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ for alg in algs
1212
# dX_t = u*dt + udW_t
1313
f(u, p, t) = u
1414
g(u, p, t) = u
15-
u0 = @SVector [0.5f0]
15+
local u0 = @SVector [0.5f0]
1616

17-
tspan = (0.0f0, 1.0f0)
18-
prob = SDEProblem(f, g, u0, tspan; seed = 123)
17+
local tspan = (0.0f0, 1.0f0)
18+
local prob = SDEProblem(f, g, u0, tspan; seed = 123)
1919

20-
monteprob = EnsembleProblem(prob)
20+
local monteprob = EnsembleProblem(prob)
2121

2222
dt = Float32(1 // 2^(8))
2323

2424
## solve using off-loading on CPU
25-
sol = solve(monteprob, alg, EnsembleGPUKernel(backend), dt = dt, trajectories = 1000,
25+
local sol = solve(monteprob, alg, EnsembleGPUKernel(backend), dt = dt, trajectories = 1000,
2626
adaptive = false)
2727

2828
sol = solve(monteprob, alg, EnsembleGPUKernel(backend, 0.0), dt = dt,
@@ -50,13 +50,13 @@ for alg in algs
5050
return SVector{3}(3.0f0, 3.0f0, 3.0f0)
5151
end
5252

53-
u0 = @SVector [1.0f0, 0.0f0, 0.0f0]
54-
tspan = (0.0f0, 10.0f0)
55-
prob = SDEProblem(lorenz, σ_lorenz, u0, tspan)
56-
monteprob = EnsembleProblem(prob)
53+
local u0 = @SVector [1.0f0, 0.0f0, 0.0f0]
54+
local tspan = (0.0f0, 10.0f0)
55+
local prob = SDEProblem(lorenz, σ_lorenz, u0, tspan)
56+
local monteprob = EnsembleProblem(prob)
5757
dt = Float32(1 // 2^(8))
5858

59-
sol = solve(
59+
local sol = solve(
6060
monteprob, alg, EnsembleGPUKernel(backend, 0.0), dt = dt, trajectories = 10,
6161
adaptive = false)
6262

test/gpu_kernel_de/stiff_ode/gpu_ode_continuous_callbacks.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ for alg in algs
5454
bench_sol = solve(prob, Rosenbrock23(),
5555
adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
5656

57-
@test norm(bench_sol.u - sol.u[1].u) < 8e-4
57+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 8e-4
5858

5959
@info "Callback: CallbackSets"
6060

@@ -67,7 +67,7 @@ for alg in algs
6767
bench_sol = solve(prob, Rosenbrock23(),
6868
adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true)
6969

70-
@test norm(bench_sol.u - sol.u[1].u) < 8e-4
70+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 8e-4
7171

7272
@info "saveat and callbacks"
7373

@@ -80,7 +80,7 @@ for alg in algs
8080
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
8181
saveat = [0.0f0, 9.1f0])
8282

83-
@test norm(bench_sol.u - sol.u[1].u) < 5e-4
83+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 5e-4
8484

8585
@info "save_everystep and callbacks"
8686

@@ -93,7 +93,7 @@ for alg in algs
9393
adaptive = false, dt = 0.1f0, callback = cb, merge_callbacks = true,
9494
save_everystep = false)
9595

96-
@test norm(bench_sol.u - sol.u[1].u) < 6e-4
96+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 6e-4
9797

9898
@info "Adaptive version"
9999

@@ -107,7 +107,7 @@ for alg in algs
107107
adaptive = true, save_everystep = false, dt = 0.1f0, callback = cb,
108108
merge_callbacks = true)
109109

110-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
110+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
111111

112112
@info "Callback: CallbackSets"
113113

@@ -121,7 +121,7 @@ for alg in algs
121121
adaptive = true, dt = 0.1f0, save_everystep = false, callback = cb,
122122
merge_callbacks = true)
123123

124-
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
124+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 2e-3
125125

126126
@info "saveat and callbacks"
127127

@@ -136,7 +136,7 @@ for alg in algs
136136
tstops = [24.0f0, 40.0f0], saveat = [0.0f0, 9.1f0], reltol = 1.0f-6,
137137
abstol = 1.0f-6)
138138

139-
@test norm(bench_sol.u - sol.u[1].u) < 6e-4
139+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 6e-4
140140

141141
@info "Unadaptive and Adaptive comparison"
142142

0 commit comments

Comments
 (0)