Changeset 21229

Timestamp:

09/23/16 16:16:09 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do not use --with-mkl-dir anymore but --with-mkl-libflags and provide all flags

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -1373 +1373 @@
         dnl }}}
         dnl mkl{{{
-        AC_ARG_WITH([mkl-dir],
-          AS_HELP_STRING([--with-mkl-dir=DIR],[mkl root directory]),
-          [MKL_ROOT=$withval],[MKL_ROOT="no"])
-                          
-        dnl Check whether mkl is enabled
-        AC_MSG_CHECKING([for mkl])
-        if test "x$MKL_ROOT" = "xno" ; then
-                HAVE_MKL=no
-        else
-                HAVE_MKL=yes
-                if ! test -d "$MKL_ROOT"; then
-                        AC_MSG_ERROR([mkl directory provided ($MKL_ROOT) does not exist]);
-                fi
-        fi
-        AC_MSG_RESULT($HAVE_MKL)
-        
-        dnl mkl headers and libraries
-        if test "x$HAVE_MKL" == "xyes"; then
-         dnl look at $ISSM_DIR/externalpackages/petsc/install/lib/petsc/conf/petscvariables BLASLAPACK_LIB
-                MKLINCL=""
-                if test x$VENDOR = xintel-pleiades; then
-         MKLLIB="-Wl,-rpath,$MKL_ROOT -L/$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
-                elif test x$VENDOR = xintel-discover; then
-                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm"
-                elif test x$VENDOR = xintel-acenet; then
-                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
-                elif test x$VENDOR = xintel-gp; then
-                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
-                elif test x$VENDOR = xintel-lonestar; then
-                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"
-                else
-                        MKLLIB=-L"$MKL_ROOT -lmkl -lmkl_lapack -lmkl_scalapack_ilp64 -lmkl_blacs_sgimpt_ilp64 -lguide -lpthread"
-                fi
-                AC_DEFINE([_HAVE_MKL_],[1],[with mkl in ISSM src])
-                AC_SUBST([MKLLIB])
-                AC_SUBST([MKLINCL])
-        fi
+                AC_ARG_WITH([mkl-libflags],
+                                        AS_HELP_STRING([--with-mkl-libflags=LIBS],[mkl libraries to be used]),
+                                        [MKL_LIBFLAGS=$withval],[MKL_LIBFLAGS="no"])
+
+                  dnl Check whether mkl is enabled
+                  AC_MSG_CHECKING([for mkl])
+                  if test "x$MKL_LIBFLAGS" = "xno" ; then
+                                HAVE_MKL=no
+                  else
+                                HAVE_MKL=yes
+                                KMLLIB="$KML_LIBFLAGS"
+                                AC_DEFINE([_HAVE_MKL_],[1],[with mkl in ISSM src])
+                                AC_SUBST([MKLLIB])
+                                AC_SUBST([MKLINCL])
+                        fi
+                        AC_MSG_RESULT($HAVE_MKL)
         dnl }}}
         dnl plapack{{{