Changeset 18334

Timestamp:

08/05/14 16:37:59 (11 years ago)

Author:

hongjuy

Message:

CHG: new flags for greenplanet's mkl library

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -123 +123 @@
                         OSLIBS="-Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib"
                 elif test $VENDOR = intel-linux; then
+                        export CC=icc
+                        export CXX=icpc
+                        export CFLAGS=" -D_INTEL_LINUX_"
+                        export CXXFLAGS=" -D_INTEL_LINUX_"
+                elif test $VENDOR = intel-gp; then
                         export CC=icc
                         export CXX=icpc
@@ -1151 +1156 @@
                 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"
                 else
                         MKLLIB=-L"$MKL_ROOT -lmkl -lmkl_lapack -lmkl_scalapack_ilp64 -lmkl_blacs_sgimpt_ilp64 -lguide -lpthread"