Skip to content

Commit

Permalink
Switch CI to Julia v1.10 (trixi-framework#1562)
Browse files Browse the repository at this point in the history
* check CI on Julia v1.10 pre-release version

* Update Project.toml

* update test vals

* update tests

* update test vals

* ignore warnings

* shorten

* comment

* need prefix r

* test simplification

* shorten

* Apply suggestions from code review

Co-authored-by: Michael Schlottke-Lakemper <[email protected]>

* Update ci.yml

* Apply suggestions from code review

Co-authored-by: Michael Schlottke-Lakemper <[email protected]>

* Update .github/workflows/ci.yml

---------

Co-authored-by: Michael Schlottke-Lakemper <[email protected]>
Co-authored-by: Daniel Doehring <[email protected]>
  • Loading branch information
3 people authored Apr 29, 2024
1 parent 73a1513 commit 1ea9e3e
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: '1.9'
version: '1.10'
show-versioninfo: true
- uses: julia-actions/cache@v1
- uses: julia-actions/julia-buildpkg@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os:
- ubuntu-latest
version:
- '1.9'
- '1.10'
arch:
- x64
steps:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
# - '~1.9.0-0' # including development versions
- '1.10'
# - '~1.10.0-0' # including development versions
# - 'nightly'
os:
- ubuntu-latest
Expand Down Expand Up @@ -86,25 +86,25 @@ jobs:
arch: x64
trixi_test: threaded_legacy
- version: '1.9'
os: macOS-latest
os: ubuntu-latest
arch: x64
trixi_test: mpi
- version: '1.9'
os: macOS-latest
trixi_test: threaded_legacy
- version: '1.10'
os: macos-13
arch: x64
trixi_test: mpi
- version: '1.10'
os: macos-latest
arch: aarch64
trixi_test: threaded
- version: '1.9'
- version: '1.10'
os: windows-latest
arch: x64
trixi_test: mpi
- version: '1.9'
- version: '1.10'
os: windows-latest
arch: x64
trixi_test: threaded
- version: '1.9'
os: macos-14
arch: arm64
trixi_test: threaded
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
Expand Down
32 changes: 16 additions & 16 deletions test/test_parabolic_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ end
],
linf=[
0.002996375101363302,
0.002863904256059634,
0.012691132946258676,
0.0028639041695096433,
0.012691132694550689,
])
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
Expand All @@ -148,8 +148,8 @@ end
],
linf=[
0.002754803146635787,
0.0028567714697580906,
0.012941794048176192,
0.0028567713744625124,
0.012941793784197131,
])
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
Expand All @@ -168,14 +168,14 @@ end
mu = mu(),
Prandtl = prandtl_number()),
l2=[
2.5278824700860636e-5,
2.5540078777006958e-5,
0.00012118655083858043,
2.5278845598681636e-5,
2.5540145802666872e-5,
0.0001211867535580826,
],
linf=[
0.0001466387075579334,
0.00019422427462629705,
0.0009556446847707178,
0.0001466387202588848,
0.00019422419092429135,
0.0009556449835592673,
])
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
Expand All @@ -195,14 +195,14 @@ end
Prandtl = prandtl_number(),
gradient_variables = GradientVariablesEntropy()),
l2=[
2.4593501090944024e-5,
2.3928163240907908e-5,
0.00011252309905552921,
2.4593521887223632e-5,
2.3928212900127102e-5,
0.00011252332663824173,
],
linf=[
0.0001185048754512863,
0.0001898766501935486,
0.0009597450028770993,
0.00011850494672183132,
0.00018987676556476442,
0.0009597461727750556,
])
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
Expand Down
4 changes: 2 additions & 2 deletions test/test_parabolic_2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,8 @@ end
@test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem",
"elixir_advection_diffusion_nonperiodic_amr.jl"),
tspan=(0.0, 0.01),
l2=[0.007933791324450538],
linf=[0.11029480573492567])
l2=[0.007934195641974433],
linf=[0.11030265194954081])
# Ensure that we do not have excessive memory allocations
# (e.g., from type instabilities)
let
Expand Down
16 changes: 8 additions & 8 deletions test/test_tree_2d_euler.jl
Original file line number Diff line number Diff line change
Expand Up @@ -371,16 +371,16 @@ end
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_euler_sedov_blast_wave_sc_subcell.jl"),
l2=[
0.4328635350273501,
0.15011135840723572,
0.15011135840723572,
0.616129927549474,
0.432804941135901,
0.15009019787510924,
0.15009019787510922,
0.6160764058367757,
],
linf=[
1.6145297181778906,
0.8614006163026988,
0.8614006163026972,
6.450225090647602,
1.6122663996643651,
0.8612394422674909,
0.8612394422674919,
6.449588561676761,
],
tspan=(0.0, 1.0),
initial_refinement_level=4,
Expand Down
8 changes: 4 additions & 4 deletions test/test_tree_2d_eulermulti.jl
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem")
@test_trixi_include(joinpath(EXAMPLES_DIR,
"elixir_eulermulti_shock_bubble_shockcapturing_subcell_minmax.jl"),
l2=[
73.10832638093902,
1.4599215762968585,
57176.014861335476,
0.17812843581838675,
73.10860950390489,
1.4599090197303102,
57176.23978426408,
0.17812910616624406,
0.010123079422717837,
],
linf=[
Expand Down
4 changes: 3 additions & 1 deletion test/test_trixi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[])
r"┌ Warning: Keyword argument letter not supported with Plots.+\n└ @ Plots.+\n",
r"┌ Warning: `parse\(::Type, ::Coloarant\)` is deprecated.+\n│.+\n│.+\n└ @ Plots.+\n",
# TODO: Silence warning introduced by Flux v0.13.13. Should be properly fixed.
r"┌ Warning: Layer with Float32 parameters got Float64 input.+\n│.+\n│.+\n│.+\n└ @ Flux.+\n"]
r"┌ Warning: Layer with Float32 parameters got Float64 input.+\n│.+\n│.+\n│.+\n└ @ Flux.+\n",
# NOTE: These warnings arose from Julia 1.10 onwards
r"WARNING: Method definition .* in module .* at .* overwritten .*.\n"]
append!(ignore_content, $additional_ignore_content)
for pattern in ignore_content
stderr_content = replace(stderr_content, pattern => "")
Expand Down
26 changes: 13 additions & 13 deletions test/test_unstructured_2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ end
1.4585198700082895e-13, 4.716940764877479e-13,
],
linf=[
8.804956763697191e-12, 6.261199891888225e-11,
2.936639820205755e-11, 1.20543575121701e-10,
7.774003663030271e-12, 9.183176441496244e-11,
4.5685344396417804e-11, 1.0534506600379245e-10,
],
tspan=(0.0, 0.1),
atol=3.0e-13)
Expand Down Expand Up @@ -328,13 +328,13 @@ end
l2=[
1.2164292510839076,
2.6118925543469468e-12,
1.1636046671473883e-12,
2.459878823146057e-12,
1.2164292510839079,
],
linf=[
1.5138512282315846,
4.998482888288039e-11,
2.0246214978154587e-11,
4.706289937431355e-11,
4.913910192312011e-11,
1.513851228231574,
],
tspan=(0.0, 0.25))
Expand All @@ -353,13 +353,13 @@ end
l2=[
1.2164292510839085,
1.2643106818778908e-12,
7.46884905098358e-13,
1.269230436589819e-12,
1.2164292510839079,
],
linf=[
1.513851228231562,
1.6287765844373185e-11,
6.8766999132716964e-12,
1.6670644673575802e-11,
1.8426585188623954e-11,
1.513851228231574,
],
surface_flux=(FluxHydrostaticReconstruction(flux_lax_friedrichs,
Expand All @@ -381,13 +381,13 @@ end
l2=[
1.2164292510839083,
2.590643638636187e-12,
1.0945471514840143e-12,
2.388742604639019e-12,
1.2164292510839079,
],
linf=[
1.5138512282315792,
5.0276441977281156e-11,
1.9816934589292803e-11,
4.761278694199934e-11,
4.910549479958249e-11,
1.513851228231574,
],
surface_flux=(flux_wintermeyer_etal,
Expand Down Expand Up @@ -650,7 +650,7 @@ end
l2=[4.085391175504837e-5,
7.19179253772227e-5,
7.191792537723135e-5,
0.00021775241532855398],
0.0002177522206115571],
linf=[0.0004054489124620808,
0.0006164432358217731,
0.0006164432358186644,
Expand Down Expand Up @@ -701,7 +701,7 @@ end
linf=[3.354871935812298e-11,
7.006478730531285e-12,
1.148153794261475e-11,
9.041265514042607e-10],
7.461231632532872e-10],
tspan=(0.0, 0.05),
atol=1.0e-10)
# Ensure that we do not have excessive memory allocations
Expand Down

0 comments on commit 1ea9e3e

Please sign in to comment.