From 1ea9e3ebd99faca7702a579af60cf9a164f4f99b Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 29 Apr 2024 09:10:02 +0200 Subject: [PATCH] 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 * Update ci.yml * Apply suggestions from code review Co-authored-by: Michael Schlottke-Lakemper * Update .github/workflows/ci.yml --------- Co-authored-by: Michael Schlottke-Lakemper Co-authored-by: Daniel Doehring --- .github/workflows/Documenter.yml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 24 ++++++++++++------------ test/test_parabolic_1d.jl | 32 ++++++++++++++++---------------- test/test_parabolic_2d.jl | 4 ++-- test/test_tree_2d_euler.jl | 16 ++++++++-------- test/test_tree_2d_eulermulti.jl | 8 ++++---- test/test_trixi.jl | 4 +++- test/test_unstructured_2d.jl | 26 +++++++++++++------------- 9 files changed, 60 insertions(+), 58 deletions(-) diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml index 1ac862d2c85..df6623839d7 100644 --- a/.github/workflows/Documenter.yml +++ b/.github/workflows/Documenter.yml @@ -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 diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 15575717f11..5eba2e70f4f 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -11,7 +11,7 @@ jobs: os: - ubuntu-latest version: - - '1.9' + - '1.10' arch: - x64 steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27f7af7c528..b4b3cfa1487 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/test/test_parabolic_1d.jl b/test/test_parabolic_1d.jl index 41d375e2e31..38bebdcce1d 100644 --- a/test/test_parabolic_1d.jl +++ b/test/test_parabolic_1d.jl @@ -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) @@ -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) @@ -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) @@ -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) diff --git a/test/test_parabolic_2d.jl b/test/test_parabolic_2d.jl index a18dfb353b7..7749a0c4780 100644 --- a/test/test_parabolic_2d.jl +++ b/test/test_parabolic_2d.jl @@ -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 diff --git a/test/test_tree_2d_euler.jl b/test/test_tree_2d_euler.jl index b937abe92c0..97a549ca4b8 100644 --- a/test/test_tree_2d_euler.jl +++ b/test/test_tree_2d_euler.jl @@ -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, diff --git a/test/test_tree_2d_eulermulti.jl b/test/test_tree_2d_eulermulti.jl index 7c4a4e722e3..0aaa9be1c5c 100644 --- a/test/test_tree_2d_eulermulti.jl +++ b/test/test_tree_2d_eulermulti.jl @@ -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=[ diff --git a/test/test_trixi.jl b/test/test_trixi.jl index cebe2164ae6..78195825886 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -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 => "") diff --git a/test/test_unstructured_2d.jl b/test/test_unstructured_2d.jl index 35a380e4f24..5c228d1e04c 100644 --- a/test/test_unstructured_2d.jl +++ b/test/test_unstructured_2d.jl @@ -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) @@ -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)) @@ -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, @@ -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, @@ -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, @@ -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