Merge pull request #9478 from jsquyres/pr/v5.0.x/platform-file-and-compiler-fixes

awlauria · web-flow · commit 778cbf381cbe · 2021-10-07T09:23:41.000-04:00
v5.0.x: update portable platform file and disable GCC &lt; 4.8.1
diff --git a/NEWS b/NEWS
@@ -77,6 +77,7 @@ Master (not on release branches yet)
 
 v5.0.0rc1 -- September, 2021
 --------------------
+
 - ORTE, the underlying OMPI launcher has been removed, and replaced
   with PRTE.
 - Reworked how Open MPI integrates with 3rd party packages.
@@ -94,6 +95,8 @@ v5.0.0rc1 -- September, 2021
 - Various ROMIO v3.4.1 updates.
 - Use Pandoc to generate manpages
 - 32 bit atomics are now only supported via C11 compliant compilers.
+- Explicitly disable support for GNU gcc < v4.8.1 (note: the default
+  gcc compiler that is included in RHEL 7 is v4.8.5).
 - Do not build Open SHMEM layer when there are no SPMLs available.
   Currently, this means the Open SHMEM layer will only build if
   the UCX library is found.
diff --git a/README.md b/README.md
@@ -201,7 +201,7 @@ base as of this writing (April 2020):
 
 * On platforms other than x86-64, AArch64 (64-bit ARM), and PPC64,
   Open MPI requires a compiler that either supports C11 atomics or
-  the GCC `__atomic` atomics (e.g., GCC >= v4.7.2).
+  the GCC `__atomic` atomics (e.g., GCC >= v4.8.1).
 
 * 32-bit platforms are only supported with a recent compiler that
   supports C11 atomics. This includes gcc 4.9.x+ (gcc 6.x or newer
diff --git a/config/opal_check_compiler_version.m4 b/config/opal_check_compiler_version.m4
@@ -2,6 +2,8 @@ dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2021 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
+dnl                         reserved.
 dnl
 dnl $COPYRIGHT$
 dnl
@@ -27,86 +29,92 @@ AC_DEFUN([OPAL_CHECK_COMPILER_VERSION_ID],
 
 
 AC_DEFUN([OPAL_CHECK_COMPILER], [
-    lower=m4_tolower($1)
-    AC_CACHE_CHECK([for compiler $lower], opal_cv_compiler_[$1],
+    AS_LITERAL_IF([$1], [],
+                  [m4_fatal([OPAL_CHECK_COMPILER argument must be a literal])])
+    lower=m4_tolower([$1])
+    AC_CACHE_CHECK([for compiler $lower], [opal_cv_compiler_$1],
     [
             CPPFLAGS_orig=$CPPFLAGS
-            CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include/opal $CPPFLAGS"
+            CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include $CPPFLAGS"
             AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <stdlib.h>
-#include "opal_portable_platform.h"
+#include "opal/opal_portable_platform.h"
 ]],[[
     FILE * f;
     f=fopen("conftestval", "w");
     if (!f) exit(1);
     fprintf (f, "%d", PLATFORM_COMPILER_$1);
             ]])], [
-                eval opal_cv_compiler_$1=`cat conftestval`;
+                opal_cv_compiler_$1=`cat conftestval`
             ], [
-                eval opal_cv_compiler_$1=0
+                opal_cv_compiler_$1=0
             ], [
-                eval opal_cv_compiler_$1=0
+                opal_cv_compiler_$1=0
             ])
             CPPFLAGS=$CPPFLAGS_orig
     ])
-    AC_DEFINE_UNQUOTED([OPAL_BUILD_PLATFORM_COMPILER_$1], $opal_cv_compiler_[$1],
+    AC_DEFINE_UNQUOTED([OPAL_BUILD_PLATFORM_COMPILER_$1], [$opal_cv_compiler_$1],
                        [The compiler $lower which OMPI was built with])
 ])dnl
 
 AC_DEFUN([OPAL_CHECK_COMPILER_STRING], [
-    lower=m4_tolower($1)
-    AC_CACHE_CHECK([for compiler $lower], opal_cv_compiler_[$1],
+    AS_LITERAL_IF([$1], [],
+                  [m4_fatal([OPAL_CHECK_COMPILER_STRING argument must be a literal])])
+    lower=m4_tolower([$1])
+    AC_CACHE_CHECK([for compiler $lower], [opal_cv_compiler_$1],
     [
             CPPFLAGS_orig=$CPPFLAGS
-            CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include/opal $CPPFLAGS"
+            CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include $CPPFLAGS"
             AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <stdlib.h>
-#include "opal_portable_platform.h"
+#include "opal/opal_portable_platform.h"
 ]],[[
     FILE * f;
     f=fopen("conftestval", "w");
     if (!f) exit(1);
     fprintf (f, "%s", PLATFORM_COMPILER_$1);
             ]])], [
-                eval opal_cv_compiler_$1=`cat conftestval`;
+                opal_cv_compiler_$1=`cat conftestval`
             ], [
-                eval opal_cv_compiler_$1=UNKNOWN
+                opal_cv_compiler_$1=UNKNOWN
             ], [
-                eval opal_cv_compiler_$1=UNKNOWN
+                opal_cv_compiler_$1=UNKNOWN
             ])
             CPPFLAGS=$CPPFLAGS_orig
     ])
-    AC_DEFINE_UNQUOTED([OPAL_BUILD_PLATFORM_COMPILER_$1], $opal_cv_compiler_[$1],
+    AC_DEFINE_UNQUOTED([OPAL_BUILD_PLATFORM_COMPILER_$1], [$opal_cv_compiler_$1],
                        [The compiler $lower which OMPI was built with])
 ])dnl
 
 
 AC_DEFUN([OPAL_CHECK_COMPILER_STRINGIFY], [
-    lower=m4_tolower($1)
-    AC_CACHE_CHECK([for compiler $lower], opal_cv_compiler_[$1],
+    AS_LITERAL_IF([$1], [],
+                  [m4_fatal([OPAL_CHECK_COMPILER_STRINGIFY argument must be a literal])])
+    lower=m4_tolower([$1])
+    AC_CACHE_CHECK([for compiler $lower], [opal_cv_compiler_$1],
     [
             CPPFLAGS_orig=$CPPFLAGS
-            CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include/opal $CPPFLAGS"
+            CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include $CPPFLAGS"
             AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <stdlib.h>
-#include "opal_portable_platform.h"
+#include "opal/opal_portable_platform.h"
 ]],[[
     FILE * f;
     f=fopen("conftestval", "w");
     if (!f) exit(1);
-    fprintf (f, "%s", _STRINGIFY(PLATFORM_COMPILER_$1));
+    fprintf (f, "%s", PLATFORM_STRINGIFY(PLATFORM_COMPILER_$1));
             ]])], [
-                eval opal_cv_compiler_$1=`cat conftestval`;
+                opal_cv_compiler_$1=`cat conftestval`
             ], [
-                eval opal_cv_compiler_$1=UNKNOWN
+                opal_cv_compiler_$1=UNKNOWN
             ], [
-                eval opal_cv_compiler_$1=UNKNOWN
+                opal_cv_compiler_$1=UNKNOWN
             ])
             CPPFLAGS=$CPPFLAGS_orig
     ])
-    AC_DEFINE_UNQUOTED([OPAL_BUILD_PLATFORM_COMPILER_$1], $opal_cv_compiler_[$1],
+    AC_DEFINE_UNQUOTED([OPAL_BUILD_PLATFORM_COMPILER_$1], [$opal_cv_compiler_$1],
                        [The compiler $lower which OMPI was built with])
 ])dnl
diff --git a/config/opal_setup_cc.m4 b/config/opal_setup_cc.m4
@@ -416,10 +416,6 @@ AC_DEFUN([OPAL_SETUP_CC],[
 
 AC_DEFUN([_OPAL_START_SETUP_CC],[
     opal_show_subtitle "C compiler and preprocessor"
-
-	# $%@#!@#% AIX!!  This has to be called before anything invokes the C
-    # compiler.
-    dnl AC_AIX
 ])
 
 
diff --git a/configure.ac b/configure.ac
@@ -600,6 +600,22 @@ opal_show_subtitle "Compiler characteristics"
 OPAL_CHECK_ATTRIBUTES
 OPAL_CHECK_COMPILER_VERSION_ID
 
+# Open MPI only supports GCC >=v4.8.1.  Notes:
+#
+# 1. The default compiler that comes with RHEL 7 is v4.8.5 (version ID
+#    264197).
+# 2. We regularly test with GCC v4.8.1 (version ID 264193).
+# 3. GCC 4.8.0 probably also works; we just haven't tested it.
+#
+# Since we regularly test with 4.8.1, that's what we check for.
+AS_IF([test "$opal_cv_compiler_FAMILYNAME" = "GNU" && \
+       test "$opal_cv_compiler_VERSION" -lt 264193],
+      [AC_MSG_WARN([Open MPI no longer supports versions of the GNU compiler suite])
+       AC_MSG_WARN([less than v4.8.1.])
+       AC_MSG_WARN([Please upgrade your GNU compiler suite, or use])
+       AC_MSG_WARN([a different compiler to build Open MPI.])
+       AC_MSG_ERROR([Cannot continue])
+      ])
 
 ##################################
 # Java MPI Binding request
diff --git a/ompi/include/Makefile.am b/ompi/include/Makefile.am
@@ -127,6 +127,6 @@ distclean-local:
 	    mpif-sizeof.h \
 	    mpif-c-constants-decl.h mpif-c-constants.h mpif-f08-types.h
 
-mpi_portable_platform.h: $(top_srcdir)/opal/include/opal/opal_portable_platform.h
+mpi_portable_platform.h: $(top_srcdir)/opal/include/opal/opal_portable_platform_real.h
 	-@rm -f mpi_portable_platform.h
-	$(OMPI_V_LN_S) $(LN_S) $(top_srcdir)/opal/include/opal/opal_portable_platform.h mpi_portable_platform.h
+	$(OMPI_V_LN_S) $(LN_S) $(top_srcdir)/opal/include/opal/opal_portable_platform_real.h mpi_portable_platform.h
diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in
@@ -22,6 +22,8 @@
  * Copyright (c) 2017-2019 IBM Corporation.  All rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * Copyright (c) 2021      Google, LLC. All rights reserved.
+ * Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -78,6 +80,9 @@
 /* The size of a `int', as computed by sizeof. */
 #undef OPAL_SIZEOF_INT
 
+/* The size of a `void*', as computed by sizeof. */
+#undef OPAL_SIZEOF_VOID_P
+
 /* Maximum length of datarep string (default is 128) */
 #undef OPAL_MAX_DATAREP_STRING
 
@@ -249,10 +254,29 @@
 #if !OMPI_BUILDING
      /*
       * Figure out which compiler is being invoked (in order to compare if
-      * it was different than what OMPI was built with).
+      * it was different than what OMPI was built with).  Do some preprocessor
+      * hacks to eliminate warnings in the portable_platform.h file.
       */
+#    ifndef SIZEOF_VOID_P
+#    define CLEANUP_SIZEOF_VOID_P 1
+#    define SIZEOF_VOID_P OPAL_SIZEOF_VOID_P
+#    else
+#    define CLEANUP_SIZEOF_VOID_P 0
+#    endif
+
+#    ifndef _PORTABLE_PLATFORM_H
+#    define _PORTABLE_PLATFORM_H 0
+#    endif
+#    ifndef PLATFORM_HEADER_VERSION
+#    define PLATFORM_HEADER_VERSION 0
+#    endif
+
 #    include "mpi_portable_platform.h"
 
+#if CLEANUP_SIZEOF_VOID_P
+#undef SIZEOF_VOID_P
+#endif
+
      /*
       * If we're currently using the same compiler that was used to
       * build Open MPI, enable compile-time warning of user-level code
diff --git a/ompi/tools/ompi_info/param.c b/ompi/tools/ompi_info/param.c
@@ -14,7 +14,7 @@
  * Copyright (c) 2014-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
- * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+ * Copyright (c) 2018-2021 Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -287,7 +287,7 @@ void ompi_info_do_config(bool want_all)
 
     if (OMPI_FORTRAN_HAVE_IGNORE_TKR) {
         /* OMPI_FORTRAN_IGNORE_TKR_PREDECL is already in quotes; it
-           didn't work consistently to put it in _STRINGIFY because
+           didn't work consistently to put it in PLATFORM_STRINGIFY because
            sometimes the compiler would actually interpret the pragma
            in there before stringify-ing it. */
         (void)opal_asprintf(&fortran_have_ignore_tkr, "yes (%s)",
@@ -336,9 +336,9 @@ void ompi_info_do_config(bool want_all)
     opal_info_out("C compiler absolute", "compiler:c:absolute",
                   OPAL_CC_ABSOLUTE);
     opal_info_out("C compiler family name", "compiler:c:familyname",
-                  _STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_FAMILYNAME));
+                  PLATFORM_STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_FAMILYNAME));
     opal_info_out("C compiler version", "compiler:c:version",
-                  _STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_VERSION_STR));
+                  PLATFORM_STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_VERSION_STR));
 
     if (want_all) {
         opal_info_out_int("C char size", "compiler:c:sizeof:char", sizeof(char));
diff --git a/opal/include/opal/Makefile.am b/opal/include/opal/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -27,7 +28,8 @@ headers += \
 	opal/prefetch.h \
         opal/hash_string.h \
 	opal/frameworks.h \
-	opal/opal_portable_platform.h
+	opal/opal_portable_platform.h \
+	opal/opal_portable_platform_real.h
 
 nodist_headers += \
 	opal/version.h
diff --git a/opal/include/opal/opal_portable_platform.h b/opal/include/opal/opal_portable_platform.h
diff --git a/opal/include/opal/opal_portable_platform_real.h b/opal/include/opal/opal_portable_platform_real.h
diff --git a/oshmem/tools/oshmem_info/param.c b/oshmem/tools/oshmem_info/param.c
