Skip to content

Commit 1ea9e3e

Browse files
ranochasloedeDanielDoehring
authored
Switch CI to Julia v1.10 (#1562)
* 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]>
1 parent 73a1513 commit 1ea9e3e

9 files changed

+60
-58
lines changed

‎.github/workflows/Documenter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737
- uses: julia-actions/setup-julia@v2
3838
with:
39-
version: '1.9'
39+
version: '1.10'
4040
show-versioninfo: true
4141
- uses: julia-actions/cache@v1
4242
- uses: julia-actions/julia-buildpkg@v1

‎.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
os:
1212
- ubuntu-latest
1313
version:
14-
- '1.9'
14+
- '1.10'
1515
arch:
1616
- x64
1717
steps:

‎.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
version:
55-
- '1.9'
56-
# - '~1.9.0-0' # including development versions
55+
- '1.10'
56+
# - '~1.10.0-0' # including development versions
5757
# - 'nightly'
5858
os:
5959
- ubuntu-latest
@@ -86,25 +86,25 @@ jobs:
8686
arch: x64
8787
trixi_test: threaded_legacy
8888
- version: '1.9'
89-
os: macOS-latest
89+
os: ubuntu-latest
9090
arch: x64
91-
trixi_test: mpi
92-
- version: '1.9'
93-
os: macOS-latest
91+
trixi_test: threaded_legacy
92+
- version: '1.10'
93+
os: macos-13
9494
arch: x64
95+
trixi_test: mpi
96+
- version: '1.10'
97+
os: macos-latest
98+
arch: aarch64
9599
trixi_test: threaded
96-
- version: '1.9'
100+
- version: '1.10'
97101
os: windows-latest
98102
arch: x64
99103
trixi_test: mpi
100-
- version: '1.9'
104+
- version: '1.10'
101105
os: windows-latest
102106
arch: x64
103107
trixi_test: threaded
104-
- version: '1.9'
105-
os: macos-14
106-
arch: arm64
107-
trixi_test: threaded
108108
steps:
109109
- uses: actions/checkout@v4
110110
- uses: julia-actions/setup-julia@v2

‎test/test_parabolic_1d.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ end
121121
],
122122
linf=[
123123
0.002996375101363302,
124-
0.002863904256059634,
125-
0.012691132946258676,
124+
0.0028639041695096433,
125+
0.012691132694550689,
126126
])
127127
# Ensure that we do not have excessive memory allocations
128128
# (e.g., from type instabilities)
@@ -148,8 +148,8 @@ end
148148
],
149149
linf=[
150150
0.002754803146635787,
151-
0.0028567714697580906,
152-
0.012941794048176192,
151+
0.0028567713744625124,
152+
0.012941793784197131,
153153
])
154154
# Ensure that we do not have excessive memory allocations
155155
# (e.g., from type instabilities)
@@ -168,14 +168,14 @@ end
168168
mu = mu(),
169169
Prandtl = prandtl_number()),
170170
l2=[
171-
2.5278824700860636e-5,
172-
2.5540078777006958e-5,
173-
0.00012118655083858043,
171+
2.5278845598681636e-5,
172+
2.5540145802666872e-5,
173+
0.0001211867535580826,
174174
],
175175
linf=[
176-
0.0001466387075579334,
177-
0.00019422427462629705,
178-
0.0009556446847707178,
176+
0.0001466387202588848,
177+
0.00019422419092429135,
178+
0.0009556449835592673,
179179
])
180180
# Ensure that we do not have excessive memory allocations
181181
# (e.g., from type instabilities)
@@ -195,14 +195,14 @@ end
195195
Prandtl = prandtl_number(),
196196
gradient_variables = GradientVariablesEntropy()),
197197
l2=[
198-
2.4593501090944024e-5,
199-
2.3928163240907908e-5,
200-
0.00011252309905552921,
198+
2.4593521887223632e-5,
199+
2.3928212900127102e-5,
200+
0.00011252332663824173,
201201
],
202202
linf=[
203-
0.0001185048754512863,
204-
0.0001898766501935486,
205-
0.0009597450028770993,
203+
0.00011850494672183132,
204+
0.00018987676556476442,
205+
0.0009597461727750556,
206206
])
207207
# Ensure that we do not have excessive memory allocations
208208
# (e.g., from type instabilities)

‎test/test_parabolic_2d.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,8 @@ end
579579
@test_trixi_include(joinpath(examples_dir(), "p4est_2d_dgsem",
580580
"elixir_advection_diffusion_nonperiodic_amr.jl"),
581581
tspan=(0.0, 0.01),
582-
l2=[0.007933791324450538],
583-
linf=[0.11029480573492567])
582+
l2=[0.007934195641974433],
583+
linf=[0.11030265194954081])
584584
# Ensure that we do not have excessive memory allocations
585585
# (e.g., from type instabilities)
586586
let

‎test/test_tree_2d_euler.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -371,16 +371,16 @@ end
371371
@test_trixi_include(joinpath(EXAMPLES_DIR,
372372
"elixir_euler_sedov_blast_wave_sc_subcell.jl"),
373373
l2=[
374-
0.4328635350273501,
375-
0.15011135840723572,
376-
0.15011135840723572,
377-
0.616129927549474,
374+
0.432804941135901,
375+
0.15009019787510924,
376+
0.15009019787510922,
377+
0.6160764058367757,
378378
],
379379
linf=[
380-
1.6145297181778906,
381-
0.8614006163026988,
382-
0.8614006163026972,
383-
6.450225090647602,
380+
1.6122663996643651,
381+
0.8612394422674909,
382+
0.8612394422674919,
383+
6.449588561676761,
384384
],
385385
tspan=(0.0, 1.0),
386386
initial_refinement_level=4,

‎test/test_tree_2d_eulermulti.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ EXAMPLES_DIR = pkgdir(Trixi, "examples", "tree_2d_dgsem")
9898
@test_trixi_include(joinpath(EXAMPLES_DIR,
9999
"elixir_eulermulti_shock_bubble_shockcapturing_subcell_minmax.jl"),
100100
l2=[
101-
73.10832638093902,
102-
1.4599215762968585,
103-
57176.014861335476,
104-
0.17812843581838675,
101+
73.10860950390489,
102+
1.4599090197303102,
103+
57176.23978426408,
104+
0.17812910616624406,
105105
0.010123079422717837,
106106
],
107107
linf=[

‎test/test_trixi.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[])
153153
r"┌ Warning: Keyword argument letter not supported with Plots.+\n└ @ Plots.+\n",
154154
r"┌ Warning: `parse\(::Type, ::Coloarant\)` is deprecated.+\n│.+\n│.+\n└ @ Plots.+\n",
155155
# TODO: Silence warning introduced by Flux v0.13.13. Should be properly fixed.
156-
r"┌ Warning: Layer with Float32 parameters got Float64 input.+\n│.+\n│.+\n│.+\n└ @ Flux.+\n"]
156+
r"┌ Warning: Layer with Float32 parameters got Float64 input.+\n│.+\n│.+\n│.+\n└ @ Flux.+\n",
157+
# NOTE: These warnings arose from Julia 1.10 onwards
158+
r"WARNING: Method definition .* in module .* at .* overwritten .*.\n"]
157159
append!(ignore_content, $additional_ignore_content)
158160
for pattern in ignore_content
159161
stderr_content = replace(stderr_content, pattern => "")

‎test/test_unstructured_2d.jl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ end
4141
1.4585198700082895e-13, 4.716940764877479e-13,
4242
],
4343
linf=[
44-
8.804956763697191e-12, 6.261199891888225e-11,
45-
2.936639820205755e-11, 1.20543575121701e-10,
44+
7.774003663030271e-12, 9.183176441496244e-11,
45+
4.5685344396417804e-11, 1.0534506600379245e-10,
4646
],
4747
tspan=(0.0, 0.1),
4848
atol=3.0e-13)
@@ -328,13 +328,13 @@ end
328328
l2=[
329329
1.2164292510839076,
330330
2.6118925543469468e-12,
331-
1.1636046671473883e-12,
331+
2.459878823146057e-12,
332332
1.2164292510839079,
333333
],
334334
linf=[
335335
1.5138512282315846,
336-
4.998482888288039e-11,
337-
2.0246214978154587e-11,
336+
4.706289937431355e-11,
337+
4.913910192312011e-11,
338338
1.513851228231574,
339339
],
340340
tspan=(0.0, 0.25))
@@ -353,13 +353,13 @@ end
353353
l2=[
354354
1.2164292510839085,
355355
1.2643106818778908e-12,
356-
7.46884905098358e-13,
356+
1.269230436589819e-12,
357357
1.2164292510839079,
358358
],
359359
linf=[
360360
1.513851228231562,
361-
1.6287765844373185e-11,
362-
6.8766999132716964e-12,
361+
1.6670644673575802e-11,
362+
1.8426585188623954e-11,
363363
1.513851228231574,
364364
],
365365
surface_flux=(FluxHydrostaticReconstruction(flux_lax_friedrichs,
@@ -381,13 +381,13 @@ end
381381
l2=[
382382
1.2164292510839083,
383383
2.590643638636187e-12,
384-
1.0945471514840143e-12,
384+
2.388742604639019e-12,
385385
1.2164292510839079,
386386
],
387387
linf=[
388388
1.5138512282315792,
389-
5.0276441977281156e-11,
390-
1.9816934589292803e-11,
389+
4.761278694199934e-11,
390+
4.910549479958249e-11,
391391
1.513851228231574,
392392
],
393393
surface_flux=(flux_wintermeyer_etal,
@@ -650,7 +650,7 @@ end
650650
l2=[4.085391175504837e-5,
651651
7.19179253772227e-5,
652652
7.191792537723135e-5,
653-
0.00021775241532855398],
653+
0.0002177522206115571],
654654
linf=[0.0004054489124620808,
655655
0.0006164432358217731,
656656
0.0006164432358186644,
@@ -701,7 +701,7 @@ end
701701
linf=[3.354871935812298e-11,
702702
7.006478730531285e-12,
703703
1.148153794261475e-11,
704-
9.041265514042607e-10],
704+
7.461231632532872e-10],
705705
tspan=(0.0, 0.05),
706706
atol=1.0e-10)
707707
# Ensure that we do not have excessive memory allocations

0 commit comments

Comments
 (0)