Skip to content

Commit 5ccc916

Browse files
committed
Update CI versions
1 parent 436fb7d commit 5ccc916

File tree

8 files changed

+24
-15
lines changed

8 files changed

+24
-15
lines changed

.buildkite/runtests.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ steps:
44
setup:
55
version:
66
- "1"
7+
- "1.9"
78
env:
89
GROUP: CUDA
910
plugins:
@@ -59,7 +60,7 @@ steps:
5960
setup:
6061
version:
6162
- "1"
62-
- "1.9-nightly"
63+
- "1.9"
6364
env:
6465
GROUP: oneAPI
6566
plugins:
@@ -69,8 +70,11 @@ steps:
6970
- |
7071
julia --project=test -e '
7172
import Pkg
72-
Pkg.add(; name = "oneAPI")'
73-
rm test/Manifest.toml
73+
Pkg.develop(; name="oneAPI")
74+
75+
println("+++ :julia: Building support library")
76+
include(joinpath(Pkg.devdir(), "oneAPI", "deps", "build_ci.jl"))
77+
Pkg.activate()'
7478
julia --project -e '
7579
import Pkg
7680
println("+++ :julia: Running tests")
@@ -86,8 +90,7 @@ steps:
8690
matrix:
8791
setup:
8892
version:
89-
- "1"
90-
- "1.9-nightly"
93+
- "1.9"
9194
env:
9295
GROUP: Metal
9396
plugins:

src/ensemblegpukernel/callbacks.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct GPUContinuousCallback{F1, F2, F3, F4, F5, F6, T, T2, T3, I, R} <:
4747
reltol::T2,
4848
repeat_nudge::T3) where {F1, F2, F3, F4, F5, F6, T, T2,
4949
T3, I, R,
50-
}
50+
}
5151
if save_positions != (false, false)
5252
error("Callback `save_positions` are incompatible with kernel-based GPU ODE solvers due requiring static sizing. Please ensure `save_positions = (false,false)` is set in all callback definitions used with such solvers.")
5353
end

src/ensemblegpukernel/integrators/integrator_utils.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ end
5454
IIP,
5555
S,
5656
T,
57-
}
57+
}
5858
integrator.retcode = retcode
5959
end
6060

@@ -156,7 +156,7 @@ end
156156
S,
157157
T,
158158
T1,
159-
}
159+
}
160160
# Can get rid of an allocation here with a function
161161
# get_tmp_arr(integrator.cache) which gives a pointer to some
162162
# cache array which can be modified.
@@ -185,7 +185,7 @@ end
185185
S,
186186
T,
187187
T1,
188-
}
188+
}
189189
_change_t_via_interpolation!(integrator, t, modify_save_endpoint)
190190
end
191191

@@ -322,7 +322,7 @@ end
322322
IIP,
323323
S,
324324
T,
325-
}
325+
}
326326
return nothing
327327
end
328328

@@ -333,7 +333,7 @@ end
333333
},
334334
callback,
335335
abst) where {AlgType <: GPUODEAlgorithm, IIP, S, T
336-
}
336+
}
337337
if abst == integrator.t
338338
tmp = integrator.u
339339
elseif abst == integrator.tprev

src/ensemblegpukernel/integrators/nonstiff/interpolants.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
IIP,
99
S,
1010
T,
11-
}
11+
}
1212
y₁ = integ.u
1313
k1 = integ.k1
1414
k2 = integ.k2

src/ensemblegpukernel/integrators/stiff/types.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
IIP,
44
S,
55
T,
6-
})(t) where {
6+
})(t) where {
77
AlgType <:
88
GPUODEAlgorithm,
99
IIP,
1010
S,
1111
T,
12-
}
12+
}
1313
Θ = (t - integrator.tprev) / integrator.dt
1414
_ode_interpolant(Θ, integrator.dt, integrator.uprev, integrator)
1515
end

test/ensemblegpuarray.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ solve(monteprob,TRBDF2(),EnsembleGPUArray(backend),dt=0.1,trajectories=2,saveat=
4343
@test_broken solve(monteprob,TRBDF2(),EnsembleGPUArray(backend),dt=0.1,trajectories=2,saveat=1.0f0)
4444
=#
4545

46+
GROUP == "AMDGPU" && return
47+
4648
@info "Implicit Methods"
4749

4850
function lorenz_jac(J, u, p, t)

test/ensemblegpuarray_oop.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ prob_func = (prob, i, repeat) -> remake(prob, p = rand(Float32, 3) .* p)
3434
monteprob = EnsembleProblem(prob, prob_func = prob_func, safetycopy = false)
3535
@time sol = solve(monteprob, Tsit5(), EnsembleGPUArray(backend), trajectories = 10_000,
3636
saveat = 1.0f0)
37+
38+
GROUP == "AMDGPU" && return
39+
3740
@time sol = solve(monteprob, Rosenbrock23(), EnsembleGPUArray(backend),
3841
trajectories = 10_000,
3942
saveat = 1.0f0)

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ if GROUP in SUPPORTS_DOUBLE_PRECISION
7979
end
8080
end
8181

82-
if GROUP == "CUDA"
82+
# Callbacks currently error on v1.10
83+
if GROUP == "CUDA" && VERSION <= v"1.9"
8384
# Causes dynamic function invocation
8485
@time @testset "GPU Kernelized Non Stiff ODE ContinuousCallback" begin
8586
include("gpu_kernel_de/gpu_ode_continuous_callbacks.jl")

0 commit comments

Comments
 (0)