From 436854e13c7a6a11b9480e282a5cdde0413954c9 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Tue, 23 Jun 2020 14:05:02 -0400 Subject: [PATCH] fix trilinos tpetra when using intel MKL The choice to disable TPetra when using MKL lead to several downstream Trilinos configuration errors. Instead, just disable the two instantiations that are missing in MKL. Tested to work correctly with Intel 19.0.5 and MKL. --- deal.II-toolchain/packages/trilinos.package | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package index f633098..e4c0b3a 100644 --- a/deal.II-toolchain/packages/trilinos.package +++ b/deal.II-toolchain/packages/trilinos.package @@ -102,14 +102,16 @@ if [ "${MKL}" = "ON" ]; then -D LAPACK_LIBRARY_DIRS:STRING=${MKL_DIR}" fi - # Trilinos will complain that MKL does not support HAVE_TEUCHOS_BLASFLOAT - cecho ${BAD} "trilinos: disabling Tpetra because you are using MKL" + # Trilinos will complain that MKL does not support HAVE_TEUCHOS_BLASFLOAT. See + # the discussion in https://github.com/dealii/candi/pull/92 for more details. + cecho ${INFO} "trilinos: disabling some Tpetra instantiations because you are using MKL" CONFOPTS=" \ ${CONFOPTS} \ -D BLAS_LIBRARY_NAMES:STRING='mkl_core;mkl_sequential' \ - -D LAPACK_LIBRARY_NAMES:STRING=mkl_intel_lp64 \ - -D Trilinos_ENABLE_Tpetra=OFF" + -D Tpetra_INST_FLOAT=OFF \ + -D Tpetra_INST_COMPLEX_FLOAT=OFF \ + -D LAPACK_LIBRARY_NAMES:STRING=mkl_intel_lp64" else if [ ! -z "${BLAS_LIB}" ]; then -- 2.39.5