From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 20 Sep 2018 19:27:20 +0000 (-0600)
Subject: update trilinos to 12.12
X-Git-Tag: v9.2.0-r1~9^2~6
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f957fa6f1bf95eefc4a3bacd7a24b3e0da1d2ef;p=candi.git

update trilinos to 12.12

- update to 12.12
- enable complex support
- require tpetra and add instantiations (fixes problems in
https://github.com/dealii/dealii/pull/7180 )
- disable boost (not needed and causes build to fail)
---

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index ffe0151..d864383 100644
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -3,11 +3,14 @@ if [ -z "${TRILINOS_MAJOR_VERSION}" ]; then
 fi
 
 if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ] || [ ${TRILINOS_MAJOR_VERSION} = "12" ]; then
+    VERSION=12-12-1
+    CHECKSUM=ecd4606fa332212433c98bf950a69cc7
+
 
     # note: the official trilinos tarball changed md5sum but we confirmed that the contents is
     # identical. We accept both hashes here.
-    VERSION=12-10-1
-    CHECKSUM="667333dbd7c0f031d47d7c5511fd0810 40f28628b63310f9bd17c26d9ebe32b1"
+    #VERSION=12-10-1
+    #CHECKSUM="667333dbd7c0f031d47d7c5511fd0810 40f28628b63310f9bd17c26d9ebe32b1"
     
     #VERSION=12-4-2
     #CHECKSUM=4c25a757d86bde3531090bd900a2cea8
@@ -124,13 +127,9 @@ fi
 if [ ! -z "${SUPERLU_DIR}" ]; then
     cecho ${INFO} "trilinos: configuration with SuperLU_dist"
     
-    # we need to disable complex support in teuchos, see
-    #   https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html
-    
     CONFOPTS="\
         ${CONFOPTS} \
           -D TPL_ENABLE_SuperLUDist:BOOL=ON \
-          -D Teuchos_ENABLE_COMPLEX:BOOL=OFF \
           -D TPL_SuperLUDist_LIBRARIES:FILEPATH=${SUPERLU_DIR}/lib/libsuperlu_dist.${LDSUFFIX} \
           -D SuperLUDist_INCLUDE_DIRS:PATH=${SUPERLU_DIR}/include \
           -D HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON \
@@ -146,12 +145,29 @@ CONFOPTS="${TRILINOS_CONFOPTS} \
           -D Trilinos_ENABLE_OpenMP:BOOL=OFF \
           -D TPL_ENABLE_TBB:BOOL=OFF \
           -D Trilinos_VERBOSE_CONFIGURE:BOOL=FALSE \
-          -D Trilinos_ENABLE_Sacado:BOOL=ON \
+          -D Trilinos_ENABLE_Amesos=ON                      \
+          -D Trilinos_ENABLE_Epetra=ON                      \
+          -D Trilinos_ENABLE_EpetraExt=ON                   \
+          -D Trilinos_ENABLE_Ifpack=ON                      \
+          -D Trilinos_ENABLE_Tpetra=ON                      \
+          -D   Tpetra_INST_INT_UNSIGNED_LONG=ON \
+          -D   Tpetra_INST_COMPLEX_DOUBLE=ON \
+          -D   Tpetra_INST_COMPLEX_FLOAT=ON \
+          -D   Tpetra_INST_FLOAT=ON \
+          -D   Tpetra_INST_SERIAL=ON \
+          -D Trilinos_ENABLE_AztecOO=ON                     \
+          -D Trilinos_ENABLE_Sacado=ON                      \
+          -D Trilinos_ENABLE_Teuchos=ON                     \
+          -D   Teuchos_ENABLE_COMPLEX:BOOL=ON \
+          -D   Teuchos_ENABLE_FLOAT:BOOL=ON \
+          -D Trilinos_ENABLE_MueLu=ON                       \
+          -D Trilinos_ENABLE_ML=ON                          \
+          -D Trilinos_ENABLE_ROL=ON                         \
+          -D Trilinos_ENABLE_Zoltan=ON                      \
           -D Trilinos_ENABLE_Stratimikos:BOOL=ON \
+          -D TPL_ENABLE_Boost=OFF \
           -D Trilinos_ENABLE_Belos:BOOL=ON \
-          -D Trilinos_ENABLE_MueLu:BOOL=ON \
           -D Trilinos_ENABLE_Amesos2:BOOL=ON \
-          -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
           -D CMAKE_BUILD_TYPE:STRING=RELEASE \
           -D CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE \
           -D BUILD_SHARED_LIBS:BOOL=ON"