deal.II: MKL usage for PetSC and Trilinos

diff --git a/deal.II/packages/dealii-prepare.package b/deal.II/packages/dealii-prepare.package
index c18a2362c5d28430d280d1a652aa8f997d8600a5..8af6ce67f4d72c810066822ba0a14d42d40f7332 100644 (file)
--- a/deal.II/packages/dealii-prepare.package
+++ b/deal.II/packages/dealii-prepare.package
@@ -28,18 +28,5 @@ fi
 # Transform upper case to lower case.
 PACKAGES_OFF=${PACKAGES_OFF,,}
 
-#########################################################################
-TRILINOS_CONFOPTS=" \
--D BLAS_LIBRARY_DIRS:STRING=${BLAS_DIR} \
--D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_DIR} \
-"
-
-if [[ ${MKL} == ON ]]; then
-  TRILINOS_CONFOPTS=" \
-  ${TRILINOS_CONFOPTS} \
-  -D BLAS_LIBRARY_NAMES:STRING='mkl_core;mkl_sequential' \
-  -D LAPACK_LIBRARY_NAMES:STRING=mkl_intel_lp64 \
-  "
-fi
-
 PACKAGE=dealii-prepare
+

diff --git a/deal.II/packages/petsc.package b/deal.II/packages/petsc.package
index ca19b54877154236002e914b0594427584e1581a..47da4d2ce0d0de8cac2d282e5b2eb1e8bff97235 100644 (file)
--- a/deal.II/packages/petsc.package
+++ b/deal.II/packages/petsc.package
@@ -6,6 +6,8 @@ CHECKSUM=28f842697159e16e2978732480571147
 #CHECKSUM=ignore
 BUILDCHAIN=custom
 
+#########################################################################
+
 CONFOPTS="
   --with-debugging=0
   --with-shared-libraries=1
@@ -37,6 +39,12 @@ if [ "$F90" ]; then
     CONFOPTS="${CONFOPTS} F90=$F90"
 fi
 
+if [ ! -z "${MKL_DIR}"]
+    CONFOPTS="${CONFOPTS} --with-blas-lapack-dir=${MKL_DIR}"
+fi
+
+#########################################################################
+
 package_specific_setup () {
     cd ${BUILDDIR}
     cp -rf ${UNPACK_PATH}/${EXTRACTSTO}/* .
@@ -49,3 +57,4 @@ package_specific_setup () {
 package_specific_register () {
     export PETSC_DIR=${INSTALL_PATH}/${NAME}
 }
+

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index dc9730cef3309b9d8c43c6e4d2605094d5f6fa7b..f5ab91d30cb06f366fe0dadfd71cb5d4eb4a706c 100644 (file)
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -6,6 +6,30 @@ DOWNLOADER=curl
 CHECKSUM=760f14cbce482b4b9a41d1c18297b531
 BUILDCHAIN=cmake
 
+#########################################################################
+
+if [ ! -z "${BLAS_DIR}" ]; then
+    TRILINOS_CONFOPTS="${TRILINOS_CONFOPTS} \
+                       -D BLAS_LIBRARY_DIRS:STRING=${BLAS_DIR} \
+                      "
+fi
+
+if [ ! -z "${LAPACK_DIR}" ]; then
+    TRILINOS_CONFOPTS="${TRILINOS_CONFOPTS} \
+                       -D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_DIR} \
+                      "
+fi
+
+if [ ${MKL} = "ON" ]; then
+  TRILINOS_CONFOPTS=" \
+  ${TRILINOS_CONFOPTS} \
+  -D BLAS_LIBRARY_NAMES:STRING='mkl_core;mkl_sequential' \
+  -D LAPACK_LIBRARY_NAMES:STRING=mkl_intel_lp64 \
+  "
+fi
+
+#########################################################################
+
 CONFOPTS="${TRILINOS_CONFOPTS} \
           -D Trilinos_ENABLE_OpenMP:BOOL=OFF \
           -D TPL_ENABLE_TBB:BOOL=OFF \

diff --git a/project-deal.II.cfg b/project-deal.II.cfg
index 67f53b7fc80453dfc4b2bb33c48f1144e8cb058f..edc760eae5708536b18a3b5c7f1d23178b02c94e 100644 (file)
--- a/project-deal.II.cfg
+++ b/project-deal.II.cfg
@@ -73,6 +73,7 @@ fi
 
 # Do you want to use MKL?
 MKL=OFF
+# MKL_DIR=
 # BLAS_DIR=
 # LAPACK_DIR=