Skip to content

Commit

Permalink
Merge pull request #572 from SciML/trait_updates
Browse files Browse the repository at this point in the history
Fix trait usage downstream
  • Loading branch information
ChrisRackauckas authored Jun 29, 2024
2 parents 5a7ca13 + 43f1ef9 commit 9d13325
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
- WeakConvergence1
version:
- '1'
- '1.6'
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ LinearAlgebra = "1.6"
Logging = "1.6"
MuladdMacro = "0.2.1"
NLsolve = "4"
OrdinaryDiffEq = "6.52"
OrdinaryDiffEq = "6.85"
Random = "1.6"
RandomNumbers = "1.5.3"
RecursiveArrayTools = "2, 3"
Expand All @@ -56,7 +56,7 @@ SparseArrays = "1.6"
SparseDiffTools = "2"
StaticArrays = "0.11, 0.12, 1.0"
UnPack = "0.1, 1.0"
julia = "1.6"
julia = "1.10"

[extras]
DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
Expand Down
2 changes: 1 addition & 1 deletion src/StochasticDiffEq.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ using DocStringExtensions
beta2_default, beta1_default, gamma_default,
qmin_default, qmax_default, qsteady_min_default, qsteady_max_default,
stepsize_controller!, accept_step_controller, step_accept_controller!,
step_reject_controller!, PIController, DummyController
step_reject_controller!, PIController, DummyController, issplit

using UnPack, RecursiveArrayTools, DataStructures
using DiffEqNoiseProcess, Random, ArrayInterface
Expand Down
4 changes: 2 additions & 2 deletions test/utility_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ using StochasticDiffEq.SciMLOperators: MatrixOperator
println(Alg)
Random.seed!(0); sol1 = solve(prob1, Alg(theta=1); adaptive=false, dt=0.01)
Random.seed!(0); sol2 = solve(prob2, Alg(theta=1); adaptive=false, dt=0.01)
@test sol1(1.0) sol2(1.0) rtol=1e-4
@test sol1(1.0) sol2(1.0) rtol=1e-2
Random.seed!(0); sol1_ip = solve(prob1_ip, Alg(theta=1); adaptive=false, dt=0.01)
Random.seed!(0); sol2_ip = solve(prob2_ip, Alg(theta=1); adaptive=false, dt=0.01)
@test sol1_ip(1.0) sol2_ip(1.0) rtol=1e-4
Expand All @@ -76,7 +76,7 @@ using StochasticDiffEq.SciMLOperators: MatrixOperator
println(SKenCarp)
Random.seed!(0); sol1 = solve(prob1, SKenCarp(); adaptive=false, dt=0.01)
Random.seed!(0); sol2 = solve(prob2, SKenCarp(); adaptive=false, dt=0.01)
@test sol1(1.0) sol2(1.0) rtol=1e-4
@test sol1(1.0) sol2(1.0) rtol=1e-2
Random.seed!(0); sol1_ip = solve(prob1_ip, SKenCarp(); adaptive=false, dt=0.01)
Random.seed!(0); sol2_ip = solve(prob2_ip, SKenCarp(); adaptive=false, dt=0.01)
@test sol1_ip(1.0) sol2_ip(1.0) rtol=1e-3
Expand Down

0 comments on commit 9d13325

Please sign in to comment.