Skip to content

Commit f503e94

Browse files
Fix CI (#139)
* run CI in Julia v1.10 * use ADTypes to fix deprecation warnings * relax allocation tolerances a bit * ADTypes v0.2 * revert using ADTypes * fix
1 parent 42d8125 commit f503e94

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
version:
27-
- '1'
27+
- '1.11'
28+
- '1.10'
2829
- '1.9'
2930
os:
3031
- ubuntu-latest
3132
include:
32-
- version: '1'
33+
- version: '1.10'
3334
os: macOS-latest
34-
- version: '1'
35+
- version: '1.10'
3536
os: windows-latest
3637
steps:
3738
- uses: actions/checkout@v4

test/runtests.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ end
447447
# allocations for in-place implementations
448448
alloc1 = @allocated(solve(linmod_ODE_ip, Tsit5()))
449449
alloc2 = @allocated(solve(linmod_PDS_ip, Tsit5()))
450-
@test 0.95 < alloc1 / alloc2 < 1.05
450+
@test 0.9 < alloc1 / alloc2 < 1.1
451451
end
452452

453453
@testset "PDSProblem error handling" begin
@@ -531,10 +531,10 @@ end
531531
alloc3 = @allocated(solve(linmod_PDS_ip_2, Tsit5()))
532532
alloc4 = @allocated(solve(linmod_ConsPDS_ip, Tsit5()))
533533
alloc5 = @allocated(solve(linmod_ConsPDS_ip_2, Tsit5()))
534-
@test 0.95 < alloc1 / alloc2 < 1.05
535-
@test 0.95 < alloc1 / alloc3 < 1.05
536-
@test 0.95 < alloc1 / alloc4 < 1.05
537-
@test 0.95 < alloc1 / alloc5 < 1.05
534+
@test 0.9 < alloc1 / alloc2 < 1.1
535+
@test 0.9 < alloc1 / alloc3 < 1.1
536+
@test 0.9 < alloc1 / alloc4 < 1.1
537+
@test 0.9 < alloc1 / alloc5 < 1.1
538538
end
539539

540540
@testset "Lotka-Volterra" begin
@@ -591,8 +591,8 @@ end
591591
alloc1 = @allocated(solve(lotvol_f_ip, Tsit5()))
592592
alloc2 = @allocated(solve(lotvol_PDS_ip, Tsit5()))
593593
alloc3 = @allocated(solve(lotvol_PDS_ip_2, Tsit5()))
594-
@test 0.95 < alloc1 / alloc2 < 1.05
595-
@test 0.95 < alloc1 / alloc3 < 1.05
594+
@test 0.9 < alloc1 / alloc2 < 1.1
595+
@test 0.9 < alloc1 / alloc3 < 1.1
596596
end
597597

598598
@testset "Linear advection" begin
@@ -660,11 +660,11 @@ end
660660
alloc4 = @allocated(solve(linear_advection_fd_upwind_PDS_sparse_2, Tsit5()))
661661
alloc5 = @allocated(solve(linear_advection_fd_upwind_ConsPDS_sparse, Tsit5()))
662662
alloc6 = @allocated(solve(linear_advection_fd_upwind_ConsPDS_sparse_2, Tsit5()))
663-
@test 0.95 < alloc1 / alloc2 < 1.05
664-
@test 0.95 < alloc1 / alloc3 < 1.05
665-
@test 0.95 < alloc1 / alloc4 < 1.05
666-
@test 0.95 < alloc1 / alloc5 < 1.05
667-
@test 0.95 < alloc1 / alloc6 < 1.05
663+
@test 0.9 < alloc1 / alloc2 < 1.1
664+
@test 0.9 < alloc1 / alloc3 < 1.1
665+
@test 0.9 < alloc1 / alloc4 < 1.1
666+
@test 0.9 < alloc1 / alloc5 < 1.1
667+
@test 0.9 < alloc1 / alloc6 < 1.1
668668
end
669669

670670
# Here we check that PDSFunctions and ConservativePDSFunctions can be evaluated
@@ -929,7 +929,7 @@ end
929929
end
930930

931931
# non-stiff conservative problems (in-place)
932-
# Requires autodiff=false
932+
# Requires autodiff = false
933933
probs = (prob_pds_linmod_inplace,)
934934
algs = (Euler(), ImplicitEuler(autodiff = false), Tsit5(),
935935
Rosenbrock23(autodiff = false), SDIRK2(autodiff = false),
@@ -974,7 +974,7 @@ end
974974
# Bertolazzi problem
975975
# Did not find any solver configuration to compute a reasonable solution and pass tests.
976976
# - constant time stepping requires very small dt
977-
# - adaptive time stepping generates solutions with different number of time steps
977+
# - adaptive time stepping generates solutions with different number of time steps
978978
#
979979
# Nevertheless, the following code shows that the same problem is solved in each case
980980
# prob = prob_pds_bertolazzi
@@ -1078,7 +1078,7 @@ end
10781078
dt = 0.1)
10791079
end
10801080

1081-
# Here we check that algorithms which accept input parameters return constants
1081+
# Here we check that algorithms which accept input parameters return constants
10821082
# of the same type as the inputs
10831083
@testset "Constant types" begin
10841084
algs = (MPRK22(0.5f0), MPRK22(1.0f0), MPRK22(2.0f0), MPRK43I(1.0f0, 0.5f0),

0 commit comments

Comments
 (0)