Changeset 12624

Timestamp:

07/10/12 10:58:30 (13 years ago)

Author:

schlegel

Message:

add discover options for libs

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (5 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -60 +60 @@
                         export CFLAGS=" -D_INTEL_LINUX_"
                         export CXXFLAGS=" -D_INTEL_LINUX_"
+                elif test $VENDOR = intel-discover; then
+                        export CC=icc
+                        export CXX=icpc
+                        export CXXFLAGS=" -O3 -D_INTEL_LINUX_ "
+                        export CFLAGS=" -O3 -D_INTEL_LINUX_ "
                 elif test $VENDOR = intel-pleiades; then
                         export CC=icc
@@ -751 +756 @@
                 dnl defaults
                 HAVE_SCALAPACK=yes
-                SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
+                if test $VENDOR = intel-discover; then
+                 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lmkl_scalapack_lp64"
+                else
+                 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
+                fi
 
                 AC_DEFINE([_HAVE_SCALAPACK_],[1],[with Scalapack in ISSM src])
@@ -771 +780 @@
                 HAVE_BLASLAPACK=yes
                 BLASLAPACKINCL=""
-                
+        
+                if test $VENDOR = intel-discover; then
+                 BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide -lpthread"
+                else
                 dnl: branch on whether we are running on windows or linux.
                 case "${host_os}" in
@@ -784 +796 @@
                         ;;
                 esac
+                fi
 
                 AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src])
@@ -881 +894 @@
                 HAVE_BLACS=yes
                 BLACSINCL=""
-                BLACSLIB=-L"$BLACS_ROOT/ -lblacs"
+                if test $VENDOR = intel-discover; then
+                 BLACSLIB=-L"$BLACS_ROOT/ -lmkl_blacs_intelmpi_lp64"
+                else
+                 BLACSLIB=-L"$BLACS_ROOT/ -lblacs"
+                fi
         
                 AC_DEFINE([_HAVE_BLACS_],[1],[with Blacs in ISSM src])