From ab3303f068d10b689569c6ff8c15c9d5245fee6f Mon Sep 17 00:00:00 2001 From: Johannes Markert <10619309+jmark@users.noreply.github.com> Date: Thu, 25 Apr 2024 13:33:04 +0200 Subject: [PATCH] Bumping to t8code v2.0.0. (#8529) Co-authored-by: Johannes Markert --- T/t8code/build_tarballs.jl | 6 +++--- T/t8code/bundled/patches/mpi-constants.patch | 14 -------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/T/t8code/build_tarballs.jl b/T/t8code/build_tarballs.jl index 4620dfe6a95..75f225291e4 100644 --- a/T/t8code/build_tarballs.jl +++ b/T/t8code/build_tarballs.jl @@ -6,10 +6,10 @@ const YGGDRASIL_DIR = "../.." include(joinpath(YGGDRASIL_DIR, "platforms", "mpi.jl")) name = "t8code" -version = v"1.6.1" +version = v"2.0.0" tarball = "https://github.com/DLR-AMR/t8code/releases/download/v$(version)/t8-$(version).tar.gz" -sha256sum = "dc96effa7c1ad1d50437fefdd0963f6ef7c943eb10a372a4e8546a5f2970a412" +sha256sum = "b83f6c204cdb663cec7e0c1059406afc4c06df236b71d7b190fb698bec44c1e0" # Collection of sources required to complete build sources = [ArchiveSource(tarball, sha256sum), DirectorySource("./bundled")] @@ -59,7 +59,7 @@ fi ${mpiopts} # Build & install -make -j${nproc} "${FLAGS[@]}" +make -j${nproc} "${FLAGS[@]}" make install """ diff --git a/T/t8code/bundled/patches/mpi-constants.patch b/T/t8code/bundled/patches/mpi-constants.patch index 48c67db3e67..398d04d08b7 100644 --- a/T/t8code/bundled/patches/mpi-constants.patch +++ b/T/t8code/bundled/patches/mpi-constants.patch @@ -40,17 +40,3 @@ #endif const char *sc_shmem_type_to_string[SC_SHMEM_NUM_TYPES] = { ---- a/src/t8_cmesh/t8_cmesh_testcases.c -+++ b/src/t8_cmesh/t8_cmesh_testcases.c -@@ -43,7 +43,10 @@ - #define T8_CMESH_MAX_NUM_XYZ_TREES 5 - #endif - --sc_MPI_Comm t8_comm_list[T8_CMESH_TEST_NUM_COMMS] = { sc_MPI_COMM_WORLD }; -+sc_MPI_Comm t8_comm_list[T8_CMESH_TEST_NUM_COMMS]; -+__attribute__((__constructor__)) static void t8_comm_list_init() { -+ t8_comm_list[0] = sc_MPI_COMM_WORLD; -+} - char t8_comm_string_list[T8_CMESH_TEST_NUM_COMMS][18] = { "sc_MPI_COMM_WORLD" }; - - /* TODO: - when disjoint bricks issues are done remove comment from t8_get_number_ of_all_testcases