From 838e46d060ec3b8e0f13575e0ef7616cdb09dbc9 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Thu, 13 Jun 2024 18:09:55 +0200 Subject: [PATCH 1/5] swap installation order of Trixi.jl and LibTrixi.jl --- utils/libtrixi-init-julia | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/libtrixi-init-julia b/utils/libtrixi-init-julia index fdac701b..059f688e 100755 --- a/utils/libtrixi-init-julia +++ b/utils/libtrixi-init-julia @@ -335,14 +335,6 @@ fi [ $? -eq 0 ] || die "could not configure system HDF5 library for Julia" echo -# Develop LibTrixi.jl -echo "Install LibTrixi.jl..." -JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \ - $julia_exec --project=. \ - -e "using Pkg; Pkg.develop(path=\"$libtrixi_jl_path\")" -[ $? -eq 0 ] || die "could not install LibTrixi.jl" -echo - # Install remaining dependencies echo "Install Trixi.jl and OrdinaryDiffEq.jl..." JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \ @@ -354,6 +346,14 @@ Pkg.add([\"Trixi\", \"OrdinaryDiffEq\"]) [ $? -eq 0 ] || die "could not install dependencies" echo +# Develop LibTrixi.jl +echo "Install LibTrixi.jl..." +JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \ + $julia_exec --project=. \ + -e "using Pkg; Pkg.develop(path=\"$libtrixi_jl_path\")" +[ $? -eq 0 ] || die "could not install LibTrixi.jl" +echo + # Install and precompile everything if [ $SKIP_PRECOMPILE -ne 1 ]; then echo "Precompile all packages ..." From d99a91f5665a2850aaab46c0de6caa27f8a38c56 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Fri, 14 Jun 2024 10:19:01 +0200 Subject: [PATCH 2/5] bump t8code version to 2.0.0 --- .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 4cb5284e..7a465503 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,13 +37,13 @@ jobs: julia_version: - '1.10' t8code_version: - - '1.4.1' + - '2.0.0' include: - os: ubuntu-latest test_type: package-compiler arch: x64 julia_version: '1.9.3' # 1.9.4: missing nghttp2 symbols in libcurl - t8code_version: '1.4.1' + t8code_version: '2.0.0' env: # Necessary for HDF5 to play nice with Julia LD_PRELOAD: /lib/x86_64-linux-gnu/libcurl.so.4 From 3767281108876ee4eee447b8c05b211ad50fcd61 Mon Sep 17 00:00:00 2001 From: Benedict <135045760+benegee@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:42:12 +0200 Subject: [PATCH 3/5] Update utils/libtrixi-init-julia Co-authored-by: Michael Schlottke-Lakemper --- utils/libtrixi-init-julia | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/libtrixi-init-julia b/utils/libtrixi-init-julia index 059f688e..d19391d2 100755 --- a/utils/libtrixi-init-julia +++ b/utils/libtrixi-init-julia @@ -335,7 +335,10 @@ fi [ $? -eq 0 ] || die "could not configure system HDF5 library for Julia" echo -# Install remaining dependencies +# Install Trixi.jl and OrdinaryDiffEq.jl first +# Rationale: By first installing Trixi.jl, we ensure that we use its latest version, +# even if it does not play nicely with the latest version of OrdinaryDiffEq.jl. +# xref: https://github.com/trixi-framework/libtrixi/issues/190 echo "Install Trixi.jl and OrdinaryDiffEq.jl..." JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \ $julia_exec --project=. \ From f7268d0dd0cc7f41050281538e0fdd29af114b83 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Mon, 17 Jun 2024 13:41:22 +0200 Subject: [PATCH 4/5] nelementsglobal change in Trixi.jl --- LibTrixi.jl/src/api_jl.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LibTrixi.jl/src/api_jl.jl b/LibTrixi.jl/src/api_jl.jl index 3a31215b..22b3d6a4 100644 --- a/LibTrixi.jl/src/api_jl.jl +++ b/LibTrixi.jl/src/api_jl.jl @@ -77,8 +77,8 @@ end function trixi_nelements_global_jl(simstate) - _, _, solver, cache = mesh_equations_solver_cache(simstate.semi) - return nelementsglobal(solver, cache) + mesh, _, solver, cache = mesh_equations_solver_cache(simstate.semi) + return nelementsglobal(mesh, solver, cache) end From 9dad64a8f83b8ae51ede99d2c5358deea10d1108 Mon Sep 17 00:00:00 2001 From: Benedict <135045760+benegee@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:19:07 +0200 Subject: [PATCH 5/5] Bump Trixi.jl compat version nelementsglobal was changed in v.0.7.16 https://github.com/trixi-framework/Trixi.jl/pull/1865 --- LibTrixi.jl/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LibTrixi.jl/Project.toml b/LibTrixi.jl/Project.toml index ba6680d0..c7caed10 100644 --- a/LibTrixi.jl/Project.toml +++ b/LibTrixi.jl/Project.toml @@ -13,7 +13,7 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" MPI = "0.20.13" OrdinaryDiffEq = "6.53.2" Pkg = "1.8" -Trixi = "0.5.29, 0.6, 0.7" +Trixi = "0.7.16" julia = "1.8" [preferences.OrdinaryDiffEq]