Changeset 19321

Timestamp:

04/24/15 16:10:38 (10 years ago)

Author:

schlegel

Message:

CHG: Updates for discover intel13

Location:

issm/trunk-jpl

Files:

• configs/config-discover-intel13.sh (added)
• configs/config-discover.sh (deleted)
• m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -1276 +1276 @@
                 BLASLAPACKINCL=""
                 if test x$VENDOR = xintel-discover; then
-                        BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide -lpthread"
+                   dnl works for intel 11
+                        dnl BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide -lpthread "
+                        dnl dnl works for intel 13
+                        BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack95_lp64 -lmkl_rt " 
                 else
                         dnl: branch on whether we are running on windows or linux.
@@ -1318 +1321 @@
                 if test x$VENDOR = xintel-pleiades; then
                         MKLLIB=-L"$MKL_ROOT -lmkl_core -lmkl_blas95_lp64 -lmkl_lapack95_lp64 -liomp5 -lpthread -lmkl_intel_thread -lmkl_intel_sp2dp"
+                elif test x$VENDOR = xintel-discover; then
+                        MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread"
                 elif test x$VENDOR = xintel-acenet; then
                         MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"