From c9f24197540bbc684b7590e70144d634e2d5747b Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 7 Jul 2023 16:34:38 +0200 Subject: [PATCH 01/15] check CI on Julia v1.10 pre-release version --- .github/workflows/Documenter.yml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 12 ++++++------ docs/Project.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml index 6b557960c8..e612ae568d 100644 --- a/.github/workflows/Documenter.yml +++ b/.github/workflows/Documenter.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/checkout@v3 - uses: julia-actions/setup-julia@v1 with: - version: '1.9' + version: '~1.10.0-0' show-versioninfo: true - uses: julia-actions/julia-buildpkg@v1 env: diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index c5c95558c8..6259a8fe43 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -11,7 +11,7 @@ jobs: os: - ubuntu-latest version: - - '1.9' + - '~1.10.0-0' arch: - x64 steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0a2c93db3..d555ed40bb 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.0-0' + # - '~1.10.0-0' # including development versions # - 'nightly' os: - ubuntu-latest @@ -83,19 +83,19 @@ jobs: os: ubuntu-latest arch: x64 trixi_test: threaded_legacy - - version: '1.9' + - version: '~1.10.0-0' os: macOS-latest arch: x64 trixi_test: mpi - - version: '1.9' + - version: '~1.10.0-0' os: macOS-latest arch: x64 trixi_test: threaded - - version: '1.9' + - version: '~1.10.0-0' os: windows-latest arch: x64 trixi_test: mpi - - version: '1.9' + - version: '~1.10.0-0' os: windows-latest arch: x64 trixi_test: threaded diff --git a/docs/Project.toml b/docs/Project.toml index 9fc974d6f3..af9cfc9ff6 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -20,5 +20,5 @@ LaTeXStrings = "1.2" Literate = "2.9" Measurements = "2.5" OrdinaryDiffEq = "6.49.1" -Plots = "1.9" +Plots = "~1.10.0-0" Trixi2Vtk = "0.3" From 36f173a2c548f1b27bc8bd8a77440f3628ce137a Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Fri, 7 Jul 2023 16:43:40 +0200 Subject: [PATCH 02/15] Update Project.toml --- docs/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Project.toml b/docs/Project.toml index af9cfc9ff6..9fc974d6f3 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -20,5 +20,5 @@ LaTeXStrings = "1.2" Literate = "2.9" Measurements = "2.5" OrdinaryDiffEq = "6.49.1" -Plots = "~1.10.0-0" +Plots = "1.9" Trixi2Vtk = "0.3" From 424233395d3c01d35f07976b20a4889b1128a8e1 Mon Sep 17 00:00:00 2001 From: Daniel Doehring Date: Tue, 23 Apr 2024 19:30:13 +0000 Subject: [PATCH 03/15] update test vals --- test/test_parabolic_1d.jl | 20 ++++++++++---------- test/test_parabolic_2d.jl | 4 ++-- test/test_tree_2d_euler.jl | 16 ++++++++-------- test/test_tree_2d_eulermulti.jl | 8 ++++---- test/test_unstructured_2d.jl | 26 +++++++++++++------------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/test_parabolic_1d.jl b/test/test_parabolic_1d.jl index 41d375e2e3..d96a0df003 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) diff --git a/test/test_parabolic_2d.jl b/test/test_parabolic_2d.jl index a18dfb353b..7749a0c478 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 b937abe92c..97a549ca4b 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 7c4a4e722e..0aaa9be1c5 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_unstructured_2d.jl b/test/test_unstructured_2d.jl index 35a380e4f2..828ab6028a 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.20543575121701e-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 From 8284734eeeb7f87da53b9b704a638467531912d5 Mon Sep 17 00:00:00 2001 From: Daniel Doehring Date: Tue, 23 Apr 2024 20:34:10 +0000 Subject: [PATCH 04/15] update tests --- test/test_parabolic_1d.jl | 10 +++++----- test/test_unstructured_2d.jl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/test_parabolic_1d.jl b/test/test_parabolic_1d.jl index d96a0df003..02a04fee12 100644 --- a/test/test_parabolic_1d.jl +++ b/test/test_parabolic_1d.jl @@ -196,13 +196,13 @@ end gradient_variables = GradientVariablesEntropy()), l2=[ 2.4593501090944024e-5, - 2.3928163240907908e-5, - 0.00011252309905552921, + 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_unstructured_2d.jl b/test/test_unstructured_2d.jl index 828ab6028a..5c228d1e04 100644 --- a/test/test_unstructured_2d.jl +++ b/test/test_unstructured_2d.jl @@ -42,7 +42,7 @@ end ], linf=[ 7.774003663030271e-12, 9.183176441496244e-11, - 4.5685344396417804e-11, 1.20543575121701e-10, + 4.5685344396417804e-11, 1.0534506600379245e-10, ], tspan=(0.0, 0.1), atol=3.0e-13) From 782653e7dc838e4c68a43c9a36e6a295a8a8e9f2 Mon Sep 17 00:00:00 2001 From: Daniel Doehring Date: Wed, 24 Apr 2024 07:27:16 +0000 Subject: [PATCH 05/15] update test vals --- test/test_parabolic_1d.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_parabolic_1d.jl b/test/test_parabolic_1d.jl index 02a04fee12..38bebdcce1 100644 --- a/test/test_parabolic_1d.jl +++ b/test/test_parabolic_1d.jl @@ -195,7 +195,7 @@ end Prandtl = prandtl_number(), gradient_variables = GradientVariablesEntropy()), l2=[ - 2.4593501090944024e-5, + 2.4593521887223632e-5, 2.3928212900127102e-5, 0.00011252332663824173, ], From 7ee975246f9dd17010df53e99aabb58af619bbc4 Mon Sep 17 00:00:00 2001 From: Daniel_Doehring Date: Wed, 24 Apr 2024 15:56:27 +0200 Subject: [PATCH 06/15] ignore warnings --- test/test_trixi.jl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index cebe2164ae..869479a895 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -153,7 +153,14 @@ 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", + "WARNING: Method definition pretty_form_utf(Base.Val{:energy_potential}) in module TrixiTestModule at /home/runner/work/Trixi.jl/Trixi.jl/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl:121 overwritten in module TrixiTestModule on the same line (check for duplicate calls to `include`).\n", + "WARNING: Method definition pretty_form_ascii(Base.Val{:energy_potential}) in module TrixiTestModule at /home/runner/work/Trixi.jl/Trixi.jl/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl:122 overwritten in module TrixiTestModule on the same line (check for duplicate calls to `include`).\n", + "WARNING: Method definition analyze(Base.Val{:energy_potential}, Any, Any, Any, Trixi.SemidiscretizationEulerGravity{SemiEuler, SemiGravity, Parameters, Cache} where Cache where Parameters<:(Trixi.ParametersEulerGravity{RealT, TimestepGravity} where TimestepGravity where RealT<:Real) where SemiGravity where SemiEuler) in module TrixiTestModule at /home/runner/work/Trixi.jl/Trixi.jl/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl:124 overwritten in module TrixiTestModule on the same line (check for duplicate calls to `include`).\n", + "WARNING: Method definition f1(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:16 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:22.\n", + "WARNING: Method definition f2(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:17 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:23.\n", + "WARNING: Method definition f3(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:18 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:24.\n", + "WARNING: Method definition f4(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:19 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:25.\n"] append!(ignore_content, $additional_ignore_content) for pattern in ignore_content stderr_content = replace(stderr_content, pattern => "") From 05c16c9417e1cec9e0b74b16dffbfb14a8a14597 Mon Sep 17 00:00:00 2001 From: Daniel_Doehring Date: Thu, 25 Apr 2024 08:53:42 +0200 Subject: [PATCH 07/15] shorten --- test/test_trixi.jl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 869479a895..cc3f65be07 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -154,13 +154,8 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[]) 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", - "WARNING: Method definition pretty_form_utf(Base.Val{:energy_potential}) in module TrixiTestModule at /home/runner/work/Trixi.jl/Trixi.jl/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl:121 overwritten in module TrixiTestModule on the same line (check for duplicate calls to `include`).\n", - "WARNING: Method definition pretty_form_ascii(Base.Val{:energy_potential}) in module TrixiTestModule at /home/runner/work/Trixi.jl/Trixi.jl/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl:122 overwritten in module TrixiTestModule on the same line (check for duplicate calls to `include`).\n", - "WARNING: Method definition analyze(Base.Val{:energy_potential}, Any, Any, Any, Trixi.SemidiscretizationEulerGravity{SemiEuler, SemiGravity, Parameters, Cache} where Cache where Parameters<:(Trixi.ParametersEulerGravity{RealT, TimestepGravity} where TimestepGravity where RealT<:Real) where SemiGravity where SemiEuler) in module TrixiTestModule at /home/runner/work/Trixi.jl/Trixi.jl/examples/paper_self_gravitating_gas_dynamics/elixir_eulergravity_jeans_instability.jl:124 overwritten in module TrixiTestModule on the same line (check for duplicate calls to `include`).\n", - "WARNING: Method definition f1(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:16 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:22.\n", - "WARNING: Method definition f2(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:17 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:23.\n", - "WARNING: Method definition f3(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:18 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:24.\n", - "WARNING: Method definition f4(Any) in module TestVisualization at /home/runner/work/Trixi.jl/Trixi.jl/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl:19 overwritten at /home/runner/work/Trixi.jl/Trixi.jl/examples/p4est_2d_dgsem/elixir_euler_source_terms_nonconforming_unstructured_flag.jl:25.\n"] + "WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", + "WARNING: Method definition .* in module .* at .* overwritten at .* .\n"] append!(ignore_content, $additional_ignore_content) for pattern in ignore_content stderr_content = replace(stderr_content, pattern => "") From 4322976655811767da6d49f3cb0b185d37b0fb24 Mon Sep 17 00:00:00 2001 From: Daniel_Doehring Date: Thu, 25 Apr 2024 08:55:44 +0200 Subject: [PATCH 08/15] comment --- test/test_trixi.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index cc3f65be07..1c1a6b6dbc 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -154,6 +154,7 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[]) 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", + # NOTE: These warnings arose from Julia 1.10 onwards "WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", "WARNING: Method definition .* in module .* at .* overwritten at .* .\n"] append!(ignore_content, $additional_ignore_content) From d0bf9a905943d0715c06154a94d3ff262178c489 Mon Sep 17 00:00:00 2001 From: Daniel_Doehring Date: Thu, 25 Apr 2024 09:29:55 +0200 Subject: [PATCH 09/15] need prefix r --- test/test_trixi.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 1c1a6b6dbc..9ee8e50923 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -155,8 +155,8 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[]) # 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", # NOTE: These warnings arose from Julia 1.10 onwards - "WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", - "WARNING: Method definition .* in module .* at .* overwritten at .* .\n"] + r"WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", + r"WARNING: Method definition .* in module .* at .* overwritten at .*.\n"] append!(ignore_content, $additional_ignore_content) for pattern in ignore_content stderr_content = replace(stderr_content, pattern => "") From c41933550abf86e9adb554c400205fda801f1953 Mon Sep 17 00:00:00 2001 From: Daniel_Doehring Date: Thu, 25 Apr 2024 10:01:08 +0200 Subject: [PATCH 10/15] test simplification --- test/test_trixi.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 9ee8e50923..558603eca4 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -155,8 +155,9 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[]) # 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", # NOTE: These warnings arose from Julia 1.10 onwards - r"WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", - r"WARNING: Method definition .* in module .* at .* overwritten at .*.\n"] + #r"WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", + #r"WARNING: Method definition .* in module .* at .* overwritten at .*.\n"] + 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 => "") From dc1285d4ac16a8223d889d29be7147beacae53c8 Mon Sep 17 00:00:00 2001 From: Daniel_Doehring Date: Thu, 25 Apr 2024 10:25:01 +0200 Subject: [PATCH 11/15] shorten --- test/test_trixi.jl | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/test_trixi.jl b/test/test_trixi.jl index 558603eca4..7819582588 100644 --- a/test/test_trixi.jl +++ b/test/test_trixi.jl @@ -155,8 +155,6 @@ macro test_nowarn_mod(expr, additional_ignore_content = String[]) # 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", # NOTE: These warnings arose from Julia 1.10 onwards - #r"WARNING: Method definition .* in module .* at .* overwritten in module .* on the same line (check for duplicate calls to `include`).\n", - #r"WARNING: Method definition .* in module .* at .* overwritten at .*.\n"] r"WARNING: Method definition .* in module .* at .* overwritten .*.\n"] append!(ignore_content, $additional_ignore_content) for pattern in ignore_content From a9e9cf5220ad6a988bee8d15daa354ab3c6353e4 Mon Sep 17 00:00:00 2001 From: Daniel Doehring Date: Fri, 26 Apr 2024 09:47:44 +0200 Subject: [PATCH 12/15] Apply suggestions from code review Co-authored-by: Michael Schlottke-Lakemper --- .github/workflows/Documenter.yml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 14 +++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Documenter.yml b/.github/workflows/Documenter.yml index 48d5ce09fa..df6623839d 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.10.0-0' + 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 758446c26f..5eba2e70f4 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -11,7 +11,7 @@ jobs: os: - ubuntu-latest version: - - '~1.10.0-0' + - '1.10' arch: - x64 steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f08fb99df8..b0151b4ce9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: fail-fast: false matrix: version: - - '~1.10.0-0' + - '1.10' # - '~1.10.0-0' # including development versions # - 'nightly' os: @@ -85,19 +85,23 @@ jobs: os: ubuntu-latest arch: x64 trixi_test: threaded_legacy - - version: '~1.10.0-0' + - version: '1.9' + os: ubuntu-latest + arch: x64 + trixi_test: threaded_legacy + - version: '1.10' os: macOS-latest arch: x64 trixi_test: mpi - - version: '~1.10.0-0' + - version: '1.10' os: macOS-latest arch: x64 trixi_test: threaded - - version: '~1.10.0-0' + - version: '1.10' os: windows-latest arch: x64 trixi_test: mpi - - version: '~1.10.0-0' + - version: '1.10' os: windows-latest arch: x64 trixi_test: threaded From a5ca4dff87def47610e6e1e87300b045c3a99b5c Mon Sep 17 00:00:00 2001 From: Daniel Doehring Date: Sun, 28 Apr 2024 08:21:59 +0200 Subject: [PATCH 13/15] Update ci.yml --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0151b4ce9..44edee6a85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,10 +105,6 @@ jobs: 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 From 48ab6581669e6911bb79181913d4ab26fa84cf8c Mon Sep 17 00:00:00 2001 From: Daniel Doehring Date: Sun, 28 Apr 2024 08:22:16 +0200 Subject: [PATCH 14/15] Apply suggestions from code review Co-authored-by: Michael Schlottke-Lakemper --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44edee6a85..b7ff4f319f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,12 +90,12 @@ jobs: arch: x64 trixi_test: threaded_legacy - version: '1.10' - os: macOS-latest - arch: x64 + os: macos-latest + arch: aarch64 trixi_test: mpi - version: '1.10' - os: macOS-latest - arch: x64 + os: macos-latest + arch: aarch64 trixi_test: threaded - version: '1.10' os: windows-latest From 6bb06ad463b06cb48115af37cc7d168b38d4b97b Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Sun, 28 Apr 2024 19:52:27 +0200 Subject: [PATCH 15/15] Update .github/workflows/ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7ff4f319f..b4b3cfa148 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,8 +90,8 @@ jobs: arch: x64 trixi_test: threaded_legacy - version: '1.10' - os: macos-latest - arch: aarch64 + os: macos-13 + arch: x64 trixi_test: mpi - version: '1.10' os: macos-latest