Improve Intel parallel build functionality

underwoo · underwoo · commit b864f33ef0d9 · 2020-12-30T14:38:58.000-05:00
The parallel build may still fail due to slow file system flushes on the Fortran modulefiles.  However, this greatly improves the parallel builds when using Intel.
diff --git a/affinity/Makefile.am b/affinity/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libfms_affinity.la
diff --git a/amip_interp/Makefile.am b/amip_interp/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libamip_interp.la
diff --git a/astronomy/Makefile.am b/astronomy/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libastronomy.la
diff --git a/axis_utils/Makefile.am b/axis_utils/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libaxis_utils.la
diff --git a/block_control/Makefile.am b/block_control/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libblock_control.la
diff --git a/column_diagnostics/Makefile.am b/column_diagnostics/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libcolumn_diagnostics.la
diff --git a/configure.ac b/configure.ac
@@ -46,6 +46,14 @@ AC_REQUIRE_AUX_FILE([tap-driver.sh])
 LT_PREREQ([2.4])
 LT_INIT()
 
+# If building on a Cray PE system, check if CRAYPE_LINK_TYPE is 'static'.  If it
+# is, then disable building shared libraries.  Note, the user can still override
+# this by using --enable-shared when running the configure script.
+AS_IF([test x${CRAYPE_VERSION:+yes} = "xyes"],[
+  AS_IF([test x${CRAYPE_LINK_TYP} = "xstatic"],
+        [AC_DISABLE_SHARED])])
+
+
 # Process user optons.
 AC_ARG_ENABLE([mixed-mode],
   [AS_HELP_STRING([--enable-mixed-mode],
diff --git a/constants/Makefile.am b/constants/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libconstants.la
diff --git a/coupler/Makefile.am b/coupler/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libcoupler.la
diff --git a/data_override/Makefile.am b/data_override/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libdata_override.la
diff --git a/diag_integral/Makefile.am b/diag_integral/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libdiag_integral.la
diff --git a/diag_manager/Makefile.am b/diag_manager/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libdiag_manager.la
diff --git a/drifters/Makefile.am b/drifters/Makefile.am
@@ -26,7 +26,8 @@
 .NOTPARALLEL:
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 
 # Build these uninstalled convenience libraries.
diff --git a/exchange/Makefile.am b/exchange/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libexchange.la
diff --git a/field_manager/Makefile.am b/field_manager/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libfield_manager.la
diff --git a/fms/Makefile.am b/fms/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libfms.la
diff --git a/fms2_io/Makefile.am b/fms2_io/Makefile.am
@@ -19,11 +19,9 @@
 
 # This is an automake file for the fms2_io directory of the FMS package.
 
-# Descend into include directory.
-#SUBDIRS = include
-
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/fms2_io/include -I$(MODDIR)
+AM_CPPFLAGS = -I$(top_srcdir)/fms2_io/include -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libfms2_io.la
diff --git a/horiz_interp/Makefile.am b/horiz_interp/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libhoriz_interp.la
diff --git a/interpolator/Makefile.am b/interpolator/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libinterpolator.la
diff --git a/memutils/Makefile.am b/memutils/Makefile.am
@@ -22,7 +22,8 @@
 # Copyright 2019-2020, GFDL, Ed Hartnett, Seth Underwood
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # The convenience library depends on its source.
 noinst_LTLIBRARIES = libmemutils.la
diff --git a/monin_obukhov/Makefile.am b/monin_obukhov/Makefile.am
@@ -22,7 +22,8 @@
 
 # Ed Hartnett 2/22/19
 
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 noinst_LTLIBRARIES = libmonin_obukhov.la
 
diff --git a/mosaic/Makefile.am b/mosaic/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 
diff --git a/mpp/Makefile.am b/mpp/Makefile.am
@@ -24,9 +24,9 @@
 
 # Include .h and .mod files.
 AM_CPPFLAGS = \
-  -I$(MODDIR) \
   -I$(top_srcdir)/include \
   -I$(top_srcdir)/mpp/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 noinst_LTLIBRARIES = libmpp.la
 
diff --git a/platform/Makefile.am b/platform/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libplatform.la
diff --git a/random_numbers/Makefile.am b/random_numbers/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/28/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience library.
 noinst_LTLIBRARIES = librandom_numbers.la
diff --git a/sat_vapor_pres/Makefile.am b/sat_vapor_pres/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/28/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience library.
 noinst_LTLIBRARIES = libsat_vapor_pres.la
diff --git a/time_interp/Makefile.am b/time_interp/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libtime_interp.la
diff --git a/time_manager/Makefile.am b/time_manager/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libtime_manager.la
diff --git a/topography/Makefile.am b/topography/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libtopography.la
diff --git a/tracer_manager/Makefile.am b/tracer_manager/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libtracer_manager.la
diff --git a/tridiagonal/Makefile.am b/tridiagonal/Makefile.am
@@ -23,7 +23,8 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(MODDIR) -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build this uninstalled convenience library.
 noinst_LTLIBRARIES = libtridiagonal.la
