Skip to content

Commit 3fb7510

Browse files
authored
Merge branch 'SciML:master' into fix-ordinarydiffeq-2719
2 parents 447b118 + 1bc5db6 commit 3fb7510

File tree

6 files changed

+48
-5
lines changed

6 files changed

+48
-5
lines changed

.github/workflows/Downgrade.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Downgrade
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
paths-ignore:
7+
- 'docs/**'
8+
- 'benchmark/**'
9+
push:
10+
branches:
11+
- master
12+
paths-ignore:
13+
- 'docs/**'
14+
- 'benchmark/**'
15+
jobs:
16+
test:
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
downgrade_mode: ['alldeps']
21+
julia-version: ['1.10']
22+
group: ['Core']
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: julia-actions/setup-julia@v2
26+
with:
27+
version: ${{ matrix.julia-version }}
28+
- uses: julia-actions/julia-downgrade-compat@v2
29+
with:
30+
skip: Pkg,TOML
31+
- uses: julia-actions/julia-buildpkg@v1
32+
- uses: julia-actions/julia-runtest@v1
33+
with:
34+
ALLOW_RERESOLVE: false
35+
env:
36+
GROUP: ${{ matrix.group }}

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "DiffEqBase"
22
uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
33
authors = ["Chris Rackauckas <accounts@chrisrackauckas.com>"]
4-
version = "6.181.0"
4+
version = "6.183.0"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/callbacks.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ has_continuous_callback(cb::DiscreteCallback) = false
5050
has_continuous_callback(cb::ContinuousCallback) = true
5151
has_continuous_callback(cb::VectorContinuousCallback) = true
5252
has_continuous_callback(cb::CallbackSet) = !isempty(cb.continuous_callbacks)
53-
has_continuous_callback(cb::Nothing) = false#======================================================##======================================================#
53+
has_continuous_callback(cb::Nothing) = false
5454

5555
# Callback handling
5656

@@ -478,7 +478,7 @@ function find_callback_time(integrator, callback::VectorContinuousCallback, coun
478478
bottom_t = integrator.tprev
479479
end
480480
if callback.rootfind != SciMLBase.NoRootFind && !isdiscrete(integrator.alg)
481-
min_t = nextfloat(top_t)
481+
min_t = isone(integrator.tdir) ? nextfloat(top_t) : prevfloat(top_t)
482482
min_event_idx = -1
483483
for idx in 1:length(event_idx)
484484
if ArrayInterface.allowed_getindex(event_idx, idx) != 0

src/solve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ function step!(integ::NullODEIntegrator, dt = nothing, stop_at_tdt = false)
693693
if !isnothing(dt)
694694
integ.t += dt
695695
else
696-
integ.t = integ.sol[end]
696+
integ.t = integ.sol.t[end]
697697
end
698698
return nothing
699699
end

test/downstream/null_de.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,10 @@ end
9595
@test_nowarn SciMLBase.u_modified!(integ, Float64[])
9696
@test SciMLBase.successful_retcode(SciMLBase.check_error(integ))
9797
end
98+
99+
@testset "`step!` without dt" begin
100+
prob = ODEProblem(Returns(nothing), nothing, (0.0, 1.0))
101+
integ = init(prob, Tsit5())
102+
@test_nowarn step!(integ)
103+
@test integ.t 1.0
104+
end

test/gpu/simple_gpu.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using OrdinaryDiffEq, CUDA, LinearAlgebra, Test, StaticArrays, ADTypes
1+
using OrdinaryDiffEq, DiffEqBase, CUDA, LinearAlgebra, Test, StaticArrays, ADTypes
22
function f(u, p, t)
33
A * u
44
end

0 commit comments

Comments
 (0)