open-mpi · hjelmn · Mar 30, 2020 · Nov 15, 2019 · Nov 14, 2019
diff --git a/autogen.pl b/autogen.pl
@@ -399,7 +399,7 @@ (\$\@)
 #ifndef $ifdef_string
 #define $ifdef_string
 
-#include <opal/mca/base/mca_base_framework.h>
+#include \"opal/mca/base/mca_base_framework.h\"
 
 $framework_decl_output
 static mca_base_framework_t *${project}_frameworks[] = {

diff --git a/config/opal_setup_cc.m4 b/config/opal_setup_cc.m4
@@ -117,6 +117,26 @@ AC_DEFUN([OPAL_PROG_CC_C11],[
     OPAL_VAR_SCOPE_POP
 ])
 
+# OPAL_CHECK_CC_IQUOTE()
+# ----------------------
+# Check if the compiler supports the -iquote option. This options
+# removes the specified directory from the search path when using
+# #include <>. This check works around an issue caused by C++20
+# which added a <version> header. This conflicts with the
+# VERSION file at the base of our source directory on case-
+# insensitive filesystems.
+AC_DEFUN([OPAL_CHECK_CC_IQUOTE],[
+    OPAL_VAR_SCOPE_PUSH([opal_check_cc_iquote_CFLAGS_save])
+    opal_check_cc_iquote_CFLAGS_save=${CFLAGS}
+    CFLAGS="${CFLAGS} -iquote ."
+    AC_MSG_CHECKING([for $CC option to add a directory only to the search path for the quote form of include])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[])],
+		      [opal_cc_iquote="-iquote"],
+		      [opal_cc_iquote="-I"])
+    CFLAGS=${opal_check_cc_iquote_CFLAGS_save}
+    OPAL_VAR_SCOPE_POP
+    AC_MSG_RESULT([$opal_cc_iquote])
+])
 
 # OPAL_SETUP_CC()
 # ---------------
@@ -140,6 +160,8 @@ AC_DEFUN([OPAL_SETUP_CC],[
 
     OPAL_PROG_CC_C11
 
+    OPAL_CHECK_CC_IQUOTE
+
     if test $opal_cv_c11_supported = no ; then
         # It is not currently an error if C11 support is not available. Uncomment the
         # following lines and update the warning when we require a C11 compiler.

diff --git a/config/opal_setup_cxx.m4 b/config/opal_setup_cxx.m4
@@ -0,0 +1,251 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2006 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2006 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2008-2013 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2015-2016 Research Organization for Information Science
+dnl                         and Technology (RIST). All rights reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# This macro is necessary to get the title to be displayed first.  :-)
+AC_DEFUN([OPAL_SETUP_CXX_BANNER],[
+    opal_show_subtitle "C++ compiler and preprocessor"
+])
+
+# This macro is necessary because PROG_CXX* is REQUIREd by multiple
+# places in SETUP_CXX.
+AC_DEFUN([OPAL_PROG_CXX],[
+    OPAL_VAR_SCOPE_PUSH([opal_cxxflags_save])
+    opal_cxxflags_save="$CXXFLAGS"
+    AC_PROG_CXX
+    AC_PROG_CXXCPP
+    CXXFLAGS="$opal_cxxflags_save"
+    OPAL_VAR_SCOPE_POP
+])
+
+# OPAL_SETUP_CXX()
+# ----------------
+# Do everything required to setup the C++ compiler.  Safe to AC_REQUIRE
+# this macro.
+AC_DEFUN([OPAL_SETUP_CXX],[
+    AC_REQUIRE([OPAL_SETUP_CXX_BANNER])
+
+    _OPAL_SETUP_CXX_COMPILER
+
+    OPAL_CXX_COMPILER_VENDOR([opal_cxx_vendor])
+
+    _OPAL_SETUP_CXX_COMPILER_BACKEND
+])
+
+# _OPAL_SETUP_CXX_COMPILER()
+# --------------------------
+# Setup the CXX compiler
+AC_DEFUN([_OPAL_SETUP_CXX_COMPILER],[
+    OPAL_VAR_SCOPE_PUSH(opal_cxx_compiler_works)
+
+    # Must REQUIRE the PROG_CXX macro and not call it directly here for
+    # reasons well-described in the AC2.64 (and beyond) docs.
+    AC_REQUIRE([OPAL_PROG_CXX])
+    BASECXX="`basename $CXX`"
+
+    AS_IF([test "x$CXX" = "x"], [CXX=none])
+    set dummy $CXX
+    opal_cxx_argv0=[$]2
+    OPAL_WHICH([$opal_cxx_argv0], [OPAL_CXX_ABSOLUTE])
+    AS_IF([test "x$OPAL_CXX_ABSOLUTE" = "x"], [OPAL_CXX_ABSOLUTE=none])
+
+    AC_DEFINE_UNQUOTED(OPAL_CXX, "$CXX", [OPAL underlying C++ compiler])
+    AC_SUBST(OPAL_CXX_ABSOLUTE)
+
+    OPAL_VAR_SCOPE_POP
+])
+
+# OPAL_CHECK_CXX_IQUOTE()
+# ----------------------
+# Check if the compiler supports the -iquote option. This options
+# removes the specified directory from the search path when using
+# #include <>. This check works around an issue caused by C++20
+# which added a <version> header. This conflicts with the
+# VERSION file at the base of our source directory on case-
+# insensitive filesystems.
+AC_DEFUN([OPAL_CHECK_CXX_IQUOTE],[
+    OPAL_VAR_SCOPE_PUSH([opal_check_cxx_iquote_CFLAGS_save])
+    opal_check_cxx_iquote_CFLAGS_save=${CFLAGS}
+    CXXFLAGS="${CFLAGS} -iquote ."
+    AC_MSG_CHECKING([for $CXX option to add a directory only to the search path for the quote form of include])
+    AC_LANG_PUSH(C++)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[])],
+		      [opal_cxx_iquote="-iquote"],
+		      [opal_cxx_iquote="-I"])
+    CXXFLAGS=${opal_check_cxx_iquote_CFLAGS_save}
+    AC_LANG_POP(C++)
+    OPAL_VAR_SCOPE_POP
+    AC_MSG_RESULT([$opal_cxx_iquote])
+])
+
+# _OPAL_SETUP_CXX_COMPILER_BACKEND()
+# ----------------------------------
+# Back end of _OPAL_SETUP_CXX_COMPILER_BACKEND()
+AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
+    # Do we want code coverage
+    if test "$WANT_COVERAGE" = "1"; then
+        if test "$opal_cxx_vendor" = "gnu" ; then
+            AC_MSG_WARN([$OPAL_COVERAGE_FLAGS has been added to CFLAGS (--enable-coverage)])
+            WANT_DEBUG=1
+            CXXFLAGS="${CXXFLAGS} $OPAL_COVERAGE_FLAGS"
+            OPAL_WRAPPER_FLAGS_ADD([CXXFLAGS], [$OPAL_COVERAGE_FLAGS])
+        else
+            AC_MSG_WARN([Code coverage functionality is currently available only with GCC suite])
+            AC_MSG_ERROR([Configure: cannot continue])
+        fi
+    fi
+
+    # Do we want debugging?
+    if test "$WANT_DEBUG" = "1" && test "$enable_debug_symbols" != "no" ; then
+        CXXFLAGS="$CXXFLAGS -g"
+        OPAL_FLAGS_UNIQ(CXXFLAGS)
+        AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
+    fi
+
+    # These flags are generally g++-specific; even the g++-impersonating
+    # compilers won't accept them.
+    OPAL_CXXFLAGS_BEFORE_PICKY="$CXXFLAGS"
+    if test "$WANT_PICKY_COMPILER" = 1 && test "$opal_cxx_vendor" = "gnu"; then
+        add="-Wall -Wundef -Wno-long-long"
+
+        # see if -Wno-long-double works...
+        AC_LANG_PUSH(C++)
+        CXXFLAGS_orig="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $add -Wno-long-double -fstrict-prototype"
+        AC_CACHE_CHECK([if $CXX supports -Wno-long-double],
+            [opal_cv_cxx_wno_long_double],
+            [AC_TRY_COMPILE([], [],
+                [
+                 dnl So -Wno-long-double did not produce any errors...
+                 dnl We will try to extract a warning regarding
+                 dnl unrecognized or ignored options
+                 AC_TRY_COMPILE([], [long double test;],
+                     [
+                      opal_cv_cxx_wno_long_double="yes"
+                      if test -s conftest.err ; then
+                          dnl Yes, it should be "ignor", in order to catch ignoring and ignore
+                          for i in unknown invalid ignor unrecognized ; do
+                              $GREP -iq $i conftest.err
+                              if test "$?" = "0" ; then
+                                  opal_cv_cxx_wno_long_double="no"
+                                  break;
+                              fi
+                          done
+                      fi
+                     ],
+                     [opal_cv_cxx_wno_long_double="no"])],
+                [opal_cv_cxx_wno_long_double="no"])
+            ])
+
+        CXXFLAGS="$CXXFLAGS_orig"
+        AC_LANG_POP(C++)
+        if test "$opal_cv_cxx_wno_long_double" = "yes" ; then
+            add="$add -Wno-long-double"
+        fi
+
+        CXXFLAGS="$CXXFLAGS $add"
+        OPAL_FLAGS_UNIQ(CXXFLAGS)
+        if test "$add" != "" ; then
+            AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
+        fi
+        unset add
+    fi
+
+    # See if this version of g++ allows -finline-functions
+    if test "$GXX" = "yes"; then
+        CXXFLAGS_orig="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS -finline-functions"
+        add=
+        AC_LANG_PUSH(C++)
+        AC_CACHE_CHECK([if $CXX supports -finline-functions],
+                   [opal_cv_cxx_finline_functions],
+                   [AC_TRY_COMPILE([], [],
+                                   [opal_cv_cxx_finline_functions="yes"],
+                                   [opal_cv_cxx_finline_functions="no"])])
+        AC_LANG_POP(C++)
+        if test "$opal_cv_cxx_finline_functions" = "yes" ; then
+            add=" -finline-functions"
+        fi
+        CXXFLAGS="$CXXFLAGS_orig$add"
+        OPAL_FLAGS_UNIQ(CXXFLAGS)
+        if test "$add" != "" ; then
+            AC_MSG_WARN([$add has been added to CXXFLAGS])
+        fi
+        unset add
+    fi
+
+    # Make sure we can link with the C compiler
+    if test "$opal_cv_cxx_compiler_vendor" != "microsoft"; then
+      OPAL_LANG_LINK_WITH_C([C++], [],
+        [cat <<EOF >&2
+**********************************************************************
+* It appears that your C++ compiler is unable to link against object
+* files created by your C compiler.  This generally indicates either
+* a conflict between the options specified in CFLAGS and CXXFLAGS
+* or a problem with the local compiler installation.  More
+* information (including exactly what command was given to the
+* compilers and what error resulted when the commands were executed) is
+* available in the config.log file in this directory.
+**********************************************************************
+EOF
+         AC_MSG_ERROR([C and C++ compilers are not link compatible.  Can not continue.])])
+    fi
+
+    # If we are on HP-UX, ensure that we're using aCC
+    case "$host" in
+    *hpux*)
+        if test "$BASECXX" = "CC"; then
+            AC_MSG_WARN([*** You will probably have problems compiling the MPI 2])
+            AC_MSG_WARN([*** C++ bindings with the HP-UX CC compiler.  You should])
+            AC_MSG_WARN([*** probably be using the aCC compiler.  Re-run configure])
+            AC_MSG_WARN([*** with the environment variable "CXX=aCC".])
+        fi
+        ;;
+    esac
+
+    # Note: gcc-imperonating compilers accept -O3
+    if test "$WANT_DEBUG" = "1"; then
+        OPTFLAGS=
+    else
+        if test "$GXX" = yes; then
+            OPTFLAGS="-O3"
+        else
+            OPTFLAGS="-O"
+        fi
+    fi
+
+    # config/opal_ensure_contains_optflags.m4
+    OPAL_ENSURE_CONTAINS_OPTFLAGS(["$CXXFLAGS"])
+    AC_MSG_CHECKING([for C++ optimization flags])
+    AC_MSG_RESULT([$co_result])
+    CXXFLAGS="$co_result"
+
+    # bool type size and alignment
+    AC_LANG_PUSH(C++)
+    AC_CHECK_SIZEOF(bool)
+    OPAL_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL)
+    AC_LANG_POP(C++)
+
+    OPAL_CHECK_CXX_IQUOTE
+])
diff --git a/configure.ac b/configure.ac
@@ -1266,11 +1266,17 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
     # rather than have successive assignments to these shell
     # variables, lest the $(foo) names try to get evaluated here.
     # Yuck!
-    CPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include m4_ifdef([project_ompi], [-I$(top_srcdir)/ompi/include]) m4_ifdef([project_oshmem], [-I$(top_srcdir)/oshmem/include])'" $CPPFLAGS"
+    cpp_includes='$(top_srcdir) $(top_builddir) $(top_srcdir)/opal/include m4_ifdef([project_ompi], [$(top_srcdir)/ompi/include]) m4_ifdef([project_oshmem], [$(top_srcdir)/oshmem/include])'
 else
-    CPPFLAGS='-I$(top_srcdir)'" $CPPFLAGS"
+    cpp_includes='$(top_srcdir)'
 fi
 
+CPP_INCLUDES="$(echo $cpp_includes | $SED 's/[[^ \]]* */'"$opal_cc_iquote"'&/g')"
+CXX_INCLUDES="$(echo $cpp_includes | $SED 's/[[^ \]]* */'"$opal_cxx_iquote"'&/g')"
+CPPFLAGS="$CPP_INCLUDES $CPPFLAGS"
+# C++ is only relevant if we're building OMPI
+m4_ifdef([project_ompi],[CXXCPPFLAGS="$CXX_INCLUDES $CXXCPPFLAGS"])
+
 # OMPI needs some additional processing of the flags (e.g., get
 # versions without optimization for debugger modules).
 

diff --git a/ompi/mca/coll/monitoring/coll_monitoring.h b/ompi/mca/coll/monitoring/coll_monitoring.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2016      Inria.  All rights reserved.
- * Copyright (c) 2017      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017      Amazon.com, Inc. or its affiliates.  All Rights
  *                         reserved.
  * $COPYRIGHT$
@@ -16,13 +16,13 @@
 
 BEGIN_C_DECLS
 
-#include <ompi_config.h>
-#include <ompi/mca/coll/coll.h>
-#include <ompi/op/op.h>
-#include <ompi/request/request.h>
-#include <ompi/datatype/ompi_datatype.h>
-#include <ompi/communicator/communicator.h>
-#include <ompi/mca/common/monitoring/common_monitoring.h>
+#include "ompi_config.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/op/op.h"
+#include "ompi/request/request.h"
+#include "ompi/datatype/ompi_datatype.h"
+#include "ompi/communicator/communicator.h"
+#include "ompi/mca/common/monitoring/common_monitoring.h"
 
 struct mca_coll_monitoring_component_t {
     mca_coll_base_component_t super;

diff --git a/ompi/mca/coll/monitoring/coll_monitoring_allgather.c b/ompi/mca/coll/monitoring/coll_monitoring_allgather.c
@@ -1,16 +1,18 @@
 /*
  * Copyright (c) 2016-2018 Inria. All rights reserved.
+ * Copyright (c) 2019      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
  *
  * $HEADER$
  */
 
-#include <ompi_config.h>
-#include <ompi/request/request.h>
-#include <ompi/datatype/ompi_datatype.h>
-#include <ompi/communicator/communicator.h>
+#include "ompi_config.h"
+#include "ompi/request/request.h"
+#include "ompi/datatype/ompi_datatype.h"
+#include "ompi/communicator/communicator.h"
 #include "coll_monitoring.h"
 
 int mca_coll_monitoring_allgather(const void *sbuf, int scount,

diff --git a/ompi/mca/coll/monitoring/coll_monitoring_allgatherv.c b/ompi/mca/coll/monitoring/coll_monitoring_allgatherv.c
@@ -1,16 +1,18 @@
 /*
  * Copyright (c) 2016-2018 Inria. All rights reserved.
+ * Copyright (c) 2019      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
  *
  * $HEADER$
  */
 
-#include <ompi_config.h>
-#include <ompi/request/request.h>
-#include <ompi/datatype/ompi_datatype.h>
-#include <ompi/communicator/communicator.h>
+#include "ompi_config.h"
+#include "ompi/request/request.h"
+#include "ompi/datatype/ompi_datatype.h"
+#include "ompi/communicator/communicator.h"
 #include "coll_monitoring.h"
 
 int mca_coll_monitoring_allgatherv(const void *sbuf, int scount,