[Dart-dev] DART/branches Revision: 13161

[dart at ucar.edu]

thoar at ucar.edu
2019-05-03 14:02:04 -0600 (Fri, 03 May 2019)
63
Better support for the lapack and blas ... from the Intel MKL




Modified: DART/branches/mizzi/mkmf/mkmf.template.intel.linux
===================================================================
--- DART/branches/mizzi/mkmf/mkmf.template.intel.linux	2019-05-03 20:00:05 UTC (rev 13160)
+++ DART/branches/mizzi/mkmf/mkmf.template.intel.linux	2019-05-03 20:02:04 UTC (rev 13161)
@@ -132,26 +132,38 @@
 #
 # NETCDF = /opt/local
 
-INCS = -I$(NETCDF)/include
-LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
-FFLAGS  = -O -vec-report0 -assume buffered_io $(INCS)
-LDFLAGS = $(FFLAGS) $(LIBS)
-
-# for development or debugging, use this instead:
-# FFLAGS = -g -C -check noarg_temp_created -fpe0 -vec-report0 \
-#          -fp-model precise  -ftrapuv -traceback \
-#          -warn argument_checking,declarations,uncalled,unused $(INCS)
-#
-# for speed on yellowstone (verify against a run with with -O and -fp-model precise
-#        that the numerical differences aren't too large to be acceptable):
-# FFLAGS = -O3 -axavx -ipo -vec-report0 $(INCS)
-#
 # Some optimized (BLAS, LAPACK) libraries may be available with:
 # LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf -lmkl -lmkl_lapack -lguide -lpthread
 #
 # If you get this error: libimf.so: warning: warning: feupdateenv is not implemented
 # try adding: -limf -lm to your LIBS line.
+#
+# The Intel Math Kernel Library has support for the lapack and blas libraries.
+# The Intel-provided scripts to enable run-time use of the Intel compilers
+# usually set and environment variable (sometimes 'MKLROOT')
+#
 
+INCS = -I$(NETCDF)/include -I${MKLROOT}
+LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf \
+       -L${MKLROOT} -lmkl_rt -lmkl_lapack95_lp64 -lmkl_blas95_lp64 -lm -lpthread
+
+#FFLAGS  = -O2 -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
+##FFLAGS  = -g -C -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
+#
+# for development or debugging, use this instead:
+# FFLAGS = -g -C -check noarg_temp_created -fpe0 -mcmodel=large -shared-intel \
+#          -fp-model precise  -ftrapuv -traceback \
+#          -warn declarations,uncalled,unused $(INCS)
+#
+# for speed (verify against a run with with -O and -fp-model precise
+#        that the numerical differences aren't too large to be acceptable):
+
+FFLAGS = -O3 -axavx -xCORE-AVX2  $(INCS)
+
+# FFLAGS = -O3 -axavx -ipo $(INCS)
+
+LDFLAGS = $(FFLAGS) $(LIBS)
+
 # <next few lines under version control, do not edit>
 # $URL$
 # $Revision$

Modified: DART/branches/mizzi/mkmf/mkmf.template_cu_summit
===================================================================
--- DART/branches/mizzi/mkmf/mkmf.template_cu_summit	2019-05-03 20:00:05 UTC (rev 13160)
+++ DART/branches/mizzi/mkmf/mkmf.template_cu_summit	2019-05-03 20:02:04 UTC (rev 13161)
@@ -122,28 +122,33 @@
 #
 # NETCDF = /opt/local
 
-INCS = -I$(NETCDF)/include
-LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf -lmkl_rt -lmkl_lapack95_lp64 -lmkl_blas95_lp64 -lm -lpthread
-#FFLAGS  = -O2 -CB -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
-#FFLAGS  = -g -C -CB -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
+# The Intel Math Kernel Library has support for the lapack and blas libraries.
+# The Intel-provided scripts to enable run-time use of the Intel compilers
+# usually set and environment variable (sometimes 'MKLROOT')
 #
+CURC_MKL_INC = ${MKLROOT}
+
+INCS = -I$(NETCDF)/include -I${CURC_MKL_INC}
+LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf \
+       -L${CURC_MKL_LIB} -lmkl_rt -lmkl_lapack95_lp64 -lmkl_blas95_lp64 -lm -lpthread
+
+#FFLAGS  = -O2 -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
+##FFLAGS  = -g -C -ftz -vec-report0 -mcmodel=medium -shared-intel -fp-model precise $(INCS)
+#
 # for development or debugging, use this instead:
 # FFLAGS = -g -C -check noarg_temp_created -fpe0 -mcmodel=large -shared-intel \
 #          -fp-model precise  -ftrapuv -traceback \
 #          -warn declarations,uncalled,unused $(INCS)
 #
-# for speed on yellowstone (verify against a run with with -O and -fp-model precise
+# for speed (verify against a run with with -O and -fp-model precise
 #        that the numerical differences aren't too large to be acceptable):
- FFLAGS = -O3 -axavx -ipo -vec-report0 $(INCS)
-#
-# Some optimized (BLAS, LAPACK) libraries may be available with:
-# LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf -lmkl -lmkl_lapack -lguide -lpthread
-#
-# If you get this error: libimf.so: warning: warning: feupdateenv is not implemented
-# try adding: -limf -lm to your LIBS line.
 
- LDFLAGS = $(FFLAGS) $(LIBS)
+FFLAGS = -O3 -axavx -xCORE-AVX2  $(INCS)