Skip to content

Commit 34501e6

Browse files
ChrisRackauckasChrisRackauckas
authored
Merge pull request #365 from SciML/fix-abstractvectorofarray-deprecation
Fix Julia 1.11 AbstractVectorOfArray indexing deprecation warnings
2 parents bdfe50b + 35dbd01 commit 34501e6

12 files changed

+104
-104
lines changed

‎test/distributed_multi_gpu.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ monteprob = EnsembleProblem(prob, prob_func = prob_func_distributed)
3434

3535
@test length(filter(x -> x.u != sol.u[1].u, sol.u)) != 0 # 0 element array
3636
@test length(filter(x -> x.u != sol2.u[6].u, sol.u)) != 0 # 0 element array
37-
@test all(all(sol[i].prob.p .== pre_p_distributed[i] .* p) for i in 1:10)
38-
@test all(all(sol2[i].prob.p .== pre_p_distributed[i] .* p) for i in 1:10)
37+
@test all(all(sol.u[i].prob.p .== pre_p_distributed[i] .* p) for i in 1:10)
38+
@test all(all(sol2.u[i].prob.p .== pre_p_distributed[i] .* p) for i in 1:10)
3939

4040
#To set 1 GPU per device:
4141
#=

‎test/ensemblegpuarray.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ monteprob = EnsembleProblem(prob, prob_func = prob_func)
3030

3131
@test length(filter(x -> x.u != sol.u[1].u, sol.u)) != 0 # 0 element array
3232
@test length(filter(x -> x.u != sol2.u[6].u, sol.u)) != 0 # 0 element array
33-
@test all(all(sol[i].prob.p .== pre_p[i] .* p) for i in 1:10)
34-
@test all(all(sol2[i].prob.p .== pre_p[i] .* p) for i in 1:10)
33+
@test all(all(sol.u[i].prob.p .== pre_p[i] .* p) for i in 1:10)
34+
@test all(all(sol2.u[i].prob.p .== pre_p[i] .* p) for i in 1:10)
3535

3636
@time solve(monteprob, Tsit5(), EnsembleCPUArray(), trajectories = 10, saveat = 1.0f0)
3737
@time solve(monteprob, Tsit5(), EnsembleThreads(), trajectories = 10, saveat = 1.0f0)

‎test/gpu_kernel_de/finite_diff.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ for alg in (GPURosenbrock23(autodiff = false), GPURodas4(autodiff = false),
2626
@info alg
2727
sol = solve(monteprob, alg, EnsembleGPUKernel(backend, 0.0),
2828
trajectories = 2, save_everystep = false, adaptive = true, dt = 0.01f0)
29-
@test norm(sol[1].u - osol.u) < 2e-4
29+
@test norm(sol.u[1].u - osol.u) < 2e-4
3030

3131
# massive threads
3232
sol = solve(monteprob, alg, EnsembleGPUKernel(backend, 0.0),

‎test/gpu_kernel_de/gpu_ode_continuous_callbacks.jl‎

Lines changed: 8 additions & 8 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[1].u) < 2e-3
44+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 2e-3
57+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 2e-3
70+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 7e-4
83+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 2e-3
97+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 2e-3
111+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 8e-4
126+
@test norm(bench_sol.u - sol.u[1].u) < 8e-4
127127

128128
@info "Unadaptive and Adaptive comparison"
129129

@@ -137,5 +137,5 @@ for (alg, diffeq_alg) in zip(algs, diffeq_algs)
137137
adaptive = true, dt = 0.1f0, callback = cb, merge_callbacks = true,
138138
saveat = [0.0f0, 9.1f0])
139139

140-
@test norm(asol[1].u - sol[1].u) < 7e-4
140+
@test norm(asol.u[1].u - sol.u[1].u) < 7e-4
141141
end

‎test/gpu_kernel_de/gpu_ode_discrete_callbacks.jl‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ for alg in algs
3434
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
3535
tstops = [2.40f0])
3636

37-
@test norm(bench_sol(2.40f0) - sol[1](2.40f0)) < 2e-3
38-
@test norm(bench_sol.u - sol[1].u) < 5e-3
37+
@test norm(bench_sol(2.40f0) - sol.u[1](2.40f0)) < 2e-3
38+
@test norm(bench_sol.u - sol.u[1].u) < 5e-3
3939

4040
#Test the truncation error due to floating point math, encountered when adjusting t for tstops
4141
local sol = solve(monteprob, alg, EnsembleGPUKernel(backend),
@@ -47,8 +47,8 @@ for alg in algs
4747
adaptive = false, dt = 0.01f0, callback = cb, merge_callbacks = true,
4848
tstops = [4.0f0])
4949

50-
@test norm(bench_sol(4.0f0) - sol[1](4.0f0)) < 2e-6
51-
@test norm(bench_sol.u - sol[1].u) < 3e-5
50+
@test norm(bench_sol(4.0f0) - sol.u[1](4.0f0)) < 2e-6
51+
@test norm(bench_sol.u - sol.u[1].u) < 3e-5
5252

5353
@info "Callback: CallbackSets"
5454

@@ -70,9 +70,9 @@ for alg in algs
7070
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
7171
tstops = [2.40f0, 4.0f0])
7272

73-
@test norm(bench_sol(2.40f0) - sol[1](2.40f0)) < 2e-3
74-
@test norm(bench_sol(4.0f0) - sol[1](4.0f0)) < 3e-3
75-
@test norm(bench_sol.u - sol[1].u) < 7e-3
73+
@test norm(bench_sol(2.40f0) - sol.u[1](2.40f0)) < 2e-3
74+
@test norm(bench_sol(4.0f0) - sol.u[1](4.0f0)) < 3e-3
75+
@test norm(bench_sol.u - sol.u[1].u) < 7e-3
7676

7777
@info "saveat and callbacks"
7878

@@ -85,9 +85,9 @@ for alg in algs
8585
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
8686
tstops = [2.40f0, 4.0f0], saveat = [0.0f0, 6.0f0])
8787

88-
@test norm(bench_sol(2.40f0) - sol[1](2.40f0)) < 1e-3
89-
@test norm(bench_sol(6.0f0) - sol[1](6.0f0)) < 3e-3
90-
@test norm(bench_sol.u - sol[1].u) < 3e-3
88+
@test norm(bench_sol(2.40f0) - sol.u[1](2.40f0)) < 1e-3
89+
@test norm(bench_sol(6.0f0) - sol.u[1](6.0f0)) < 3e-3
90+
@test norm(bench_sol.u - sol.u[1].u) < 3e-3
9191

9292
@info "save_everystep and callbacks"
9393

@@ -100,9 +100,9 @@ for alg in algs
100100
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
101101
tstops = [2.40f0, 4.0f0], save_everystep = false)
102102

103-
@test norm(bench_sol(2.40f0) - sol[1](2.40f0)) < 3e-5
104-
@test norm(bench_sol(4.0f0) - sol[1](4.0f0)) < 5e-5
105-
@test norm(bench_sol.u - sol[1].u) < 2e-4
103+
@test norm(bench_sol(2.40f0) - sol.u[1](2.40f0)) < 3e-5
104+
@test norm(bench_sol(4.0f0) - sol.u[1](4.0f0)) < 5e-5
105+
@test norm(bench_sol.u - sol.u[1].u) < 2e-4
106106

107107
@info "Adaptive version"
108108

@@ -118,8 +118,8 @@ for alg in algs
118118
merge_callbacks = true,
119119
tstops = [4.0f0])
120120

121-
@test norm(bench_sol(4.0f0) - sol[1](4.0f0)) < 5e-5
122-
@test norm(bench_sol.u - sol[1].u) < 2e-4
121+
@test norm(bench_sol(4.0f0) - sol.u[1](4.0f0)) < 5e-5
122+
@test norm(bench_sol.u - sol.u[1].u) < 2e-4
123123

124124
@info "Callback: CallbackSets"
125125

@@ -133,9 +133,9 @@ for alg in algs
133133
merge_callbacks = true,
134134
tstops = [2.40f0, 4.0f0])
135135

136-
@test norm(bench_sol(2.40f0) - sol[1](2.40f0)) < 6e-4
137-
@test norm(bench_sol(4.0f0) - sol[1](4.0f0)) < 1e-3
138-
@test norm(bench_sol.u - sol[1].u) < 3e-3
136+
@test norm(bench_sol(2.40f0) - sol.u[1](2.40f0)) < 6e-4
137+
@test norm(bench_sol(4.0f0) - sol.u[1](4.0f0)) < 1e-3
138+
@test norm(bench_sol.u - sol.u[1].u) < 3e-3
139139

140140
@info "saveat and callbacks"
141141

@@ -151,9 +151,9 @@ for alg in algs
151151
tstops = [2.40f0, 4.0f0], saveat = [0.0f0, 6.0f0], reltol = 1.0f-7,
152152
abstol = 1.0f-7)
153153

154-
@test norm(bench_sol(2.40f0) - sol[1](2.40f0)) < 7e-3
155-
@test norm(bench_sol(6.0f0) - sol[1](6.0f0)) < 2e-2
156-
@test norm(bench_sol.u - sol[1].u) < 2e-2
154+
@test norm(bench_sol(2.40f0) - sol.u[1](2.40f0)) < 7e-3
155+
@test norm(bench_sol(6.0f0) - sol.u[1](6.0f0)) < 2e-2
156+
@test norm(bench_sol.u - sol.u[1].u) < 2e-2
157157

158158
@info "Unadaptive and Adaptive comparison"
159159

@@ -167,9 +167,9 @@ for alg in algs
167167
adaptive = true, dt = 1.0f0, callback = cb, merge_callbacks = true,
168168
tstops = [2.40f0, 4.0f0], saveat = [0.0f0, 4.0f0])
169169

170-
@test norm(asol[1](2.40f0) - sol[1](2.40f0)) < 3e-3
171-
@test norm(asol[1](4.0f0) - sol[1](4.0f0)) < 5e-3
172-
@test norm(asol[1].u - sol[1].u) < 5e-3
170+
@test norm(asol.u[1](2.40f0) - sol.u[1](2.40f0)) < 3e-3
171+
@test norm(asol.u[1](4.0f0) - sol.u[1](4.0f0)) < 5e-3
172+
@test norm(asol.u[1].u - sol.u[1].u) < 5e-3
173173

174174
@info "Terminate callback"
175175

@@ -184,6 +184,6 @@ for alg in algs
184184
adaptive = false, dt = 1.0f0, callback = cb, merge_callbacks = true,
185185
tstops = [2.40f0])
186186

187-
@test norm(bench_sol.t - sol[1].t) < 2e-3
188-
@test norm(bench_sol.u - sol[1].u) < 5e-3
187+
@test norm(bench_sol.t - sol.u[1].t) < 2e-3
188+
@test norm(bench_sol.u - sol.u[1].u) < 5e-3
189189
end

‎test/gpu_kernel_de/gpu_ode_regression.jl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ for alg in algs
3636
bench_asol = solve(prob, Vern9(), dt = 0.1f-1, save_everystep = false, abstol = 1.0f-7,
3737
reltol = 1.0f-7)
3838

39-
@test norm(bench_sol.u[end] - sol[1].u[end]) < 5e-3
40-
@test norm(bench_asol.u - asol[1].u) < 8e-4
39+
@test norm(bench_sol.u[end] - sol.u[1].u[end]) < 5e-3
40+
@test norm(bench_asol.u - asol.u[1].u) < 8e-4
4141

4242
### solve parameters
4343

@@ -54,13 +54,13 @@ for alg in algs
5454
bench_asol = solve(prob, Vern9(), dt = 0.1f-1, save_everystep = false, abstol = 1.0f-7,
5555
reltol = 1.0f-7, saveat = saveat)
5656

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

59-
@test norm(bench_sol.u - sol[1].u) < 2e-4
60-
@test norm(bench_asol.u - asol[1].u) < 2e-4
59+
@test norm(bench_sol.u - sol.u[1].u) < 2e-4
60+
@test norm(bench_asol.u - asol.u[1].u) < 2e-4
6161

62-
@test length(sol[1].u) == length(saveat)
63-
@test length(asol[1].u) == length(saveat)
62+
@test length(sol.u[1].u) == length(saveat)
63+
@test length(asol.u[1].u) == length(saveat)
6464

6565
saveat = collect(0.0f0:0.1f0:10.0f0)
6666

@@ -75,22 +75,22 @@ for alg in algs
7575
bench_asol = solve(prob, Vern9(), dt = 0.1f-1, save_everystep = false, abstol = 1.0f-7,
7676
reltol = 1.0f-7, saveat = saveat)
7777

78-
@test norm(asol[1].u[end] - sol[1].u[end]) < 6e-3
78+
@test norm(asol.u[1].u[end] - sol.u[1].u[end]) < 6e-3
7979

80-
@test norm(bench_sol.u - sol[1].u) < 2e-3
81-
@test norm(bench_asol.u - asol[1].u) < 5e-3
80+
@test norm(bench_sol.u - sol.u[1].u) < 2e-3
81+
@test norm(bench_asol.u - asol.u[1].u) < 5e-3
8282

83-
@test length(sol[1].u) == length(saveat)
84-
@test length(asol[1].u) == length(saveat)
83+
@test length(sol.u[1].u) == length(saveat)
84+
@test length(asol.u[1].u) == length(saveat)
8585

8686
local sol = solve(monteprob, alg, EnsembleGPUKernel(backend), trajectories = 2,
8787
adaptive = false, dt = 0.01f0, save_everystep = false)
8888

8989
bench_sol = solve(prob, Vern9(), adaptive = false, dt = 0.01f0, save_everystep = false)
9090

91-
@test norm(bench_sol.u - sol[1].u) < 5e-3
91+
@test norm(bench_sol.u - sol.u[1].u) < 5e-3
9292

93-
@test length(sol[1].u) == length(bench_sol.u)
93+
@test length(sol.u[1].u) == length(bench_sol.u)
9494

9595
### Huge number of threads
9696
local sol = solve(monteprob, alg, EnsembleGPUKernel(backend), trajectories = 10_000,

‎test/gpu_kernel_de/gpu_sde_convergence.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ prob = SDEProblem(f, g, u₀, tspan, p; seed = 1234)
1414
dts = 1 .// 2 .^ (5:-1:2)
1515

1616
ensemble_prob = EnsembleProblem(prob;
17-
output_func = (sol, i) -> (sol[end], false))
17+
output_func = (sol, i) -> (sol.u[end], false))
1818

1919
@info "EM"
2020
dts = 1 .// 2 .^ (12:-1:8)

‎test/gpu_kernel_de/gpu_sde_regression.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for alg in algs
3333

3434
us = reshape(mean(sol_array, dims = 3), size(sol_array, 2))
3535

36-
us_exact = 0.5f0 * exp.(sol[1].t)
36+
us_exact = 0.5f0 * exp.(sol.u[1].t)
3737

3838
@test norm(us - us_exact, Inf) < 6e-2
3939

@@ -67,7 +67,7 @@ for alg in algs
6767
adaptive = false, save_everystep = false)
6868

6969
@test sol.converged == true
70-
@test length(sol[1].u) == 2
70+
@test length(sol.u[1].u) == 2
7171

7272
saveat = [0.3f0, 0.5f0]
7373

@@ -111,4 +111,4 @@ sol = solve(
111111
adaptive = false, save_everystep = false)
112112

113113
@test sol.converged == true
114-
@test length(sol[1].u) == 2
114+
@test length(sol.u[1].u) == 2

‎test/gpu_kernel_de/stiff_ode/gpu_ode_continuous_callbacks.jl‎

Lines changed: 8 additions & 8 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[1].u) < 8e-4
57+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 8e-4
70+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 5e-4
83+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 6e-4
96+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 2e-3
110+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 2e-3
124+
@test norm(bench_sol.u - sol.u[1].u) < 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[1].u) < 6e-4
139+
@test norm(bench_sol.u - sol.u[1].u) < 6e-4
140140

141141
@info "Unadaptive and Adaptive comparison"
142142

@@ -150,5 +150,5 @@ for alg in algs
150150
adaptive = true, dt = 0.1f0, callback = cb, merge_callbacks = true,
151151
saveat = [0.0f0, 9.1f0])
152152

153-
@test norm(asol[1].u - sol[1].u) < 7e-4
153+
@test norm(asol.u[1].u - sol.u[1].u) < 7e-4
154154
end

0 commit comments

Comments
 (0)