Skip to content

Commit faf8890

Browse files
authored
Merge branch 'SciML:master' into nonlinearsolve-tests
2 parents 1a54084 + de37851 commit faf8890

File tree

5 files changed

+13
-3
lines changed

5 files changed

+13
-3
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ steps:
3838
env:
3939
BUILDKITE_PLUGIN_JULIA_VERSION: "{{matrix.version}}"
4040
GROUP: "{{matrix.group}}"
41+
JULIA_NUM_THREADS: 2
4142
plugins:
4243
- JuliaCI/julia#v1
4344
- staticfloat/metahook:
@@ -49,7 +50,6 @@ steps:
4950
'
5051
- JuliaCI/julia-test#v1:
5152
coverage: false
52-
julia_args: "--threads=auto"
5353
agents:
5454
os: "linux"
5555
queue: "juliaecosystem"

.github/workflows/Downstream.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ jobs:
7474
- uses: codecov/codecov-action@v5
7575
with:
7676
token: ${{ secrets.CODECOV_TOKEN }}
77-
file: lcov.info
77+
files: lcov.info
7878
fail_ci_if_error: false

lib/OrdinaryDiffEqCore/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OrdinaryDiffEqCore"
22
uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
33
authors = ["ParamThakkar123 <[email protected]>"]
4-
version = "1.14.1"
4+
version = "1.15.0"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

lib/OrdinaryDiffEqCore/src/initialize_dae.jl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ function _initialize_dae!(integrator, prob::DAEProblem,
9494
end
9595
end
9696

97+
function _initialize_dae!(integrator, prob::DiscreteProblem,
98+
alg::DefaultInit, x::Union{Val{true}, Val{false}})
99+
if SciMLBase.has_initializeprob(prob.f)
100+
# integrator.opts.abstol is `false` for `DiscreteProblem`.
101+
_initialize_dae!(integrator, prob, OverrideInit(one(eltype(prob.u0)) * 1e-12), x)
102+
end
103+
end
104+
97105
## Nonlinear Solver Defaulting
98106

99107
## If an alg is given use it

test/multithreading/ode_extrapolation_tests.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Import packages
22
using OrdinaryDiffEqExtrapolation, DiffEqDevTools, Test, Random
33

4+
println("Running on $(Threads.nthreads()) thread(s).")
5+
46
# Define test problems
57
# Note that the time span in ODEProblemLibrary is given by
68
# Float64 numbers

0 commit comments

Comments
 (0)