From d4135a8205c6b27af42803ce43eb9fbbb7e76e0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20K=C3=B6cher?= Date: Thu, 29 Oct 2015 21:51:39 +0100 Subject: [PATCH] deal.II: undo Trilinos v11 patching for SuperLU, since it will not work with SuperLU v4.x --- deal.II/packages/trilinos.package | 18 +++++++++--------- ...inos-v11-Amesos_Superludist-v3.3.cpp.patch} | 0 2 files changed, 9 insertions(+), 9 deletions(-) rename deal.II/patches/{Trilinos-v11-Amesos_Superludist.cpp.patch => Trilinos-v11-Amesos_Superludist-v3.3.cpp.patch} (100%) diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package index f20d5ef..fa7a41e 100644 --- a/deal.II/packages/trilinos.package +++ b/deal.II/packages/trilinos.package @@ -7,6 +7,15 @@ elif [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then SOURCE=https://trilinos.org/oldsite/download/files/ VERSION=11.14.3 CHECKSUM=b6e5d6b71f6e554de220aeda51794ffb + + #Note: For Trilinos v11 we need to force SuperLUDist=OFF, + # since only the deprecated SuperLUDist v3.3 together with an Amesos patch + # (and not the current SuperLUDist v4.x with the same Amesos patch) + # is working. + #Note: This issue is resolved by setting + # -D HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG + # for Trilinos v12; this is neglegted by Trilinos v11 since it is unknown. + SuperLUDist=OFF else cecho ${BAD} "Unknown Trilinos version ${TRILINOS_MAJOR_VERSION} forced, please use AUTO|12|11." @@ -115,15 +124,6 @@ CONFOPTS="${TRILINOS_CONFOPTS} \ -D Trilinos_VERBOSE_CONFIGURE:BOOL=FALSE \ -D BUILD_SHARED_LIBS:BOOL=ON" -package_specific_setup() { - # Apply Amesos patch for Trilinos v11 - if [ ${TRILINOS_MAJOR_VERSION} = "11" ] && [ ! -z "${SuperLUDist}" ] && [ ${SuperLUDist} = "ON" ]; then - # Apply patch to let Trilinos/Amesos work with SuperLUDist - cd ${UNPACK_PATH}/${EXTRACTSTO}/packages/amesos/src - patch --forward Amesos_Superludist.cpp < ${ORIG_DIR}/${PROJECT}/patches/Trilinos-v11-Amesos_Superludist.cpp.patch || true - fi -} - package_specific_register () { export TRILINOS_DIR=${INSTALL_PATH} } diff --git a/deal.II/patches/Trilinos-v11-Amesos_Superludist.cpp.patch b/deal.II/patches/Trilinos-v11-Amesos_Superludist-v3.3.cpp.patch similarity index 100% rename from deal.II/patches/Trilinos-v11-Amesos_Superludist.cpp.patch rename to deal.II/patches/Trilinos-v11-Amesos_Superludist-v3.3.cpp.patch -- 2.39.5