open-mpi · hjelmn · Mar 22, 2018 · Mar 22, 2018 · Mar 22, 2018 · Mar 22, 2018
diff --git a/Makefile.ompi-rules b/Makefile.ompi-rules
@@ -9,9 +9,6 @@
 #
 
 TRIM_OPTIONS=
-if ! MAN_PAGE_BUILD_MPI_CXX_BINDINGS
-    TRIM_OPTIONS += --nocxx
-endif
 if ! MAN_PAGE_BUILD_MPIFH_BINDINGS
     TRIM_OPTIONS += --nofortran
 endif

diff --git a/config/ompi_config_files.m4 b/config/ompi_config_files.m4
@@ -23,7 +23,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
 
         ompi/mpi/c/Makefile
         ompi/mpi/c/profile/Makefile
-        ompi/mpi/cxx/Makefile
         ompi/mpi/fortran/base/Makefile
         ompi/mpi/fortran/mpif-h/Makefile
         ompi/mpi/fortran/mpif-h/profile/Makefile

diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4
@@ -58,10 +58,6 @@ AC_DEFUN([OMPI_SETUP_CXX],[
     _OMPI_CXX_CHECK_BUILTIN
 
     _OMPI_CXX_CHECK_2D_CONST_CAST
-
-    AM_CONDITIONAL(OMPI_BUILD_MPI_CXX_BINDINGS, [test "$WANT_MPI_CXX_SUPPORT" = 1])
-    AC_DEFINE_UNQUOTED(OMPI_BUILD_CXX_BINDINGS, $WANT_MPI_CXX_SUPPORT,
-        [Whether we want MPI C++ support or not])
 ])
 
 # _OMPI_SETUP_CXX_COMPILER()

diff --git a/config/opal_setup_cxx.m4 b/config/opal_setup_cxx.m4
@@ -189,18 +189,6 @@ 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=

diff --git a/configure.ac b/configure.ac
@@ -534,9 +534,6 @@ OPAL_CHECK_OFFSETOF
 # OPAL...?  Shrug.
 m4_ifdef([project_ompi], [OPAL_SETUP_CXX
                           OMPI_SETUP_CXX])
-# Used in Makefile.ompi-rules
-AM_CONDITIONAL(MAN_PAGE_BUILD_MPI_CXX_BINDINGS,
-               [test "$WANT_MPI_CXX_SUPPORT" = 1])
 
 ##################################
 # Only after setting up both

diff --git a/ompi/Makefile.am b/ompi/Makefile.am
@@ -85,7 +85,6 @@ SUBDIRS = \
         $(MCA_ompi_FRAMEWORKS_SUBDIRS) \
         $(MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
         . \
-        mpi/cxx \
         $(OMPI_MPIEXT_MPIFH_DIRS) \
         mpi/fortran/mpif-h \
         $(OMPI_MPIEXT_USEMPI_DIR) \
@@ -114,7 +113,6 @@ DIST_SUBDIRS = \
         etc \
         mpi/c \
         mpi/tool \
-        mpi/cxx \
         mpi/fortran/base \
         mpi/fortran/mpif-h \
         mpi/fortran/use-mpi-tkr \

diff --git a/ompi/contrib/libompitrace/Makefile.am b/ompi/contrib/libompitrace/Makefile.am
@@ -27,13 +27,13 @@ libompitrace_la_SOURCES = \
         add_error_class.c \
         add_error_code.c \
         add_error_string.c \
-        address.c \
         allgather.c \
         allgatherv.c \
         alloc_mem.c \
         allreduce.c \
         barrier.c \
         bcast.c \
+	get_address.c \
         finalize.c \
         init.c \
         isend.c \

diff --git a/ompi/contrib/libompitrace/address.c → ompi/contrib/libompitrace/get_address.c b/ompi/contrib/libompitrace/address.c → ompi/contrib/libompitrace/get_address.c
@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2018      Los Alamos National Security, LLC. All
+ *                         rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -24,16 +26,16 @@
 #include "opal_stdint.h"
 #include "ompi/mpi/c/bindings.h"
 
-int MPI_Address(void *location, MPI_Aint *address)
+int MPI_Get_address(const void *location, MPI_Aint *address)
 {
 
     int rank;
 
     PMPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
-    fprintf(stderr, "MPI_ADDRESS[%d]: location %0" PRIxPTR " address %0" PRIxPTR "\n",
+    fprintf(stderr, "MPI_GET_ADDRESS[%d]: location %0" PRIxPTR " address %0" PRIxPTR "\n",
             rank, (uintptr_t)location, (uintptr_t)address);
     fflush(stderr);
 
-    return PMPI_Address(location, address);
+    return PMPI_Get_address(location, address);
 }
diff --git a/ompi/datatype/ompi_datatype_args.c b/ompi/datatype/ompi_datatype_args.c
@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2006 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2017 Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2013-2018 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -839,19 +839,17 @@ ompi_datatype_t* ompi_datatype_get_single_predefined_type_from_args( ompi_dataty
                 return NULL;
             }
         }
-        if (current_predef != MPI_LB && current_predef != MPI_UB) {
-            if( NULL == predef ) {  /* This is the first iteration */
-                predef = current_predef;
-            } else {
-                /**
-                 *  What exactly should we consider as identical types?
-                 *  If they are the same MPI level type, or if they map
-                 *  to the same OPAL datatype? In other words, MPI_FLOAT
-                 *  and MPI_REAL4 are they identical?
-                 */
-                if( predef != current_predef ) {
-                    return NULL;
-                }
+        if( NULL == predef ) {  /* This is the first iteration */
+            predef = current_predef;
+        } else {
+            /**
+             *  What exactly should we consider as identical types?
+             *  If they are the same MPI level type, or if they map
+             *  to the same OPAL datatype? In other words, MPI_FLOAT
+             *  and MPI_REAL4 are they identical?
+             */
+            if( predef != current_predef ) {
+                return NULL;
             }
         }
     }

diff --git a/ompi/datatype/ompi_datatype_internal.h b/ompi/datatype/ompi_datatype_internal.h
@@ -5,7 +5,7 @@
  *                         reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2010-2012 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2015-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -91,16 +91,13 @@
 #define OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX        0x2A
 #define OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX   0x2B
 
-#define OMPI_DATATYPE_MPI_LB                      0x2C
-#define OMPI_DATATYPE_MPI_UB                      0x2D
-
 /*
  * Datatypes from the MPI 3.0 standard
  */
-#define OMPI_DATATYPE_MPI_COUNT                   0x2E
+#define OMPI_DATATYPE_MPI_COUNT                   0x2C
 
 /* This should __ALWAYS__ stay last  */
-#define OMPI_DATATYPE_MPI_UNAVAILABLE             0x2F
+#define OMPI_DATATYPE_MPI_UNAVAILABLE             0x2D
 
 
 #define OMPI_DATATYPE_MPI_MAX_PREDEFINED          (OMPI_DATATYPE_MPI_UNAVAILABLE+1)

diff --git a/ompi/datatype/ompi_datatype_module.c b/ompi/datatype/ompi_datatype_module.c
@@ -13,7 +13,7 @@
  * Copyright (c) 2007-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
+ * Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights
  *                         reserved.
  * Copyright (c) 2015-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
@@ -67,8 +67,6 @@ ompi_predefined_datatype_t ompi_mpi_datatype_null =
 
 ompi_predefined_datatype_t ompi_mpi_unavailable =    OMPI_DATATYPE_INIT_PREDEFINED (UNAVAILABLE, 0);
 
-ompi_predefined_datatype_t ompi_mpi_lb =             OMPI_DATATYPE_INIT_PREDEFINED (LB, 0);
-ompi_predefined_datatype_t ompi_mpi_ub =             OMPI_DATATYPE_INIT_PREDEFINED (UB, 0);
 ompi_predefined_datatype_t ompi_mpi_char =           OMPI_DATATYPE_INIT_PREDEFINED (CHAR, OMPI_DATATYPE_FLAG_DATA_C);
 ompi_predefined_datatype_t ompi_mpi_signed_char =    OMPI_DATATYPE_INIT_PREDEFINED (SIGNED_CHAR, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
 ompi_predefined_datatype_t ompi_mpi_unsigned_char =  OMPI_DATATYPE_INIT_PREDEFINED (UNSIGNED_CHAR, OMPI_DATATYPE_FLAG_DATA_C | OMPI_DATATYPE_FLAG_DATA_INT );
@@ -357,9 +355,6 @@ const ompi_datatype_t* ompi_datatype_basicDatatypes[OMPI_DATATYPE_MPI_MAX_PREDEF
     [OMPI_DATATYPE_MPI_C_DOUBLE_COMPLEX] = &ompi_mpi_c_double_complex.dt,
     [OMPI_DATATYPE_MPI_C_LONG_DOUBLE_COMPLEX] = &ompi_mpi_c_long_double_complex.dt,
 
-    [OMPI_DATATYPE_MPI_LB] = &ompi_mpi_lb.dt,
-    [OMPI_DATATYPE_MPI_UB] = &ompi_mpi_ub.dt,
-
     /* MPI 3.0 types */
     [OMPI_DATATYPE_MPI_COUNT] = &ompi_mpi_count.dt,
 
@@ -545,88 +540,86 @@ int32_t ompi_datatype_init( void )
     MOOG(datatype_null, 0);
     MOOG(byte, 1);
     MOOG(packed, 2);
-    MOOG(ub, 3);
-    MOOG(lb, 4);
-    MOOG(character, 5);
-    MOOG(logical, 6);
-    MOOG(integer, 7);
-    MOOG(integer1, 8);
-    MOOG(integer2, 9);
-    MOOG(integer4, 10);
-    MOOG(integer8, 11);
-    MOOG(integer16, 12);
-    MOOG(real, 13);
-    MOOG(real4, 14);
-    MOOG(real8, 15);
-    MOOG(real16, 16);
-    MOOG(dblprec, 17);
-    MOOG(cplex, 18);
-    MOOG(complex8, 19);
-    MOOG(complex16, 20);
-    MOOG(complex32, 21);
-    MOOG(dblcplex, 22);
-    MOOG(2real, 23);
-    MOOG(2dblprec, 24);
-    MOOG(2integer, 25);
-    MOOG(2cplex, 26);
-    MOOG(2dblcplex, 27);
-    MOOG(real2, 28);
-    MOOG(logical1, 29);
-    MOOG(logical2, 30);
-    MOOG(logical4, 31);
-    MOOG(logical8, 32);
+    MOOG(character, 3);
+    MOOG(logical, 4);
+    MOOG(integer, 5);
+    MOOG(integer1, 6);
+    MOOG(integer2, 7);
+    MOOG(integer4, 8);
+    MOOG(integer8, 9);
+    MOOG(integer16, 10);
+    MOOG(real, 11);
+    MOOG(real4, 12);
+    MOOG(real8, 13);
+    MOOG(real16, 14);
+    MOOG(dblprec, 15);
+    MOOG(cplex, 16);
+    MOOG(complex8, 17);
+    MOOG(complex16, 18);
+    MOOG(complex32, 19);
+    MOOG(dblcplex, 20);
+    MOOG(2real, 21);
+    MOOG(2dblprec, 22);
+    MOOG(2integer, 23);
+    MOOG(2cplex, 24);
+    MOOG(2dblcplex, 25);
+    MOOG(real2, 26);
+    MOOG(logical1, 27);
+    MOOG(logical2, 28);
+    MOOG(logical4, 29);
+    MOOG(logical8, 30);
 
     /* Now the C types */
 
-    MOOG(wchar, 33);
-    MOOG(char, 34);
-    MOOG(unsigned_char, 35);
-    MOOG(signed_char, 36);
-    MOOG(short, 37);
-    MOOG(unsigned_short, 38);
-    MOOG(int, 39);
-    MOOG(unsigned, 40);
-    MOOG(long, 41);
-    MOOG(unsigned_long, 42);
-    MOOG(long_long_int, 43);
-    MOOG(unsigned_long_long, 44);
-
-    MOOG(float, 45);
-    MOOG(double, 46);
-    MOOG(long_double, 47);
-
-    MOOG(float_int, 48);
-    MOOG(double_int, 49);
-    MOOG(longdbl_int, 50);
-    MOOG(long_int, 51);
-    MOOG(2int, 52);
-    MOOG(short_int, 53);
+    MOOG(wchar, 31);
+    MOOG(char, 32);
+    MOOG(unsigned_char, 33);
+    MOOG(signed_char, 34);
+    MOOG(short, 35);
+    MOOG(unsigned_short, 36);
+    MOOG(int, 37);
+    MOOG(unsigned, 38);
+    MOOG(long, 39);
+    MOOG(unsigned_long, 40);
+    MOOG(long_long_int, 41);
+    MOOG(unsigned_long_long, 42);
+
+    MOOG(float, 43);
+    MOOG(double, 44);
+    MOOG(long_double, 45);
+
+    MOOG(float_int, 46);
+    MOOG(double_int, 47);
+    MOOG(longdbl_int, 48);
+    MOOG(long_int, 49);
+    MOOG(2int, 50);
+    MOOG(short_int, 51);
 
     /* C++ types */
 
-    MOOG(cxx_bool, 54);
-    MOOG(cxx_cplex, 55);
-    MOOG(cxx_dblcplex, 56);
-    MOOG(cxx_ldblcplex, 57);
+    MOOG(cxx_bool, 52);
+    MOOG(cxx_cplex, 53);
+    MOOG(cxx_dblcplex, 54);
+    MOOG(cxx_ldblcplex, 55);
 
     /* MPI 2.2 types */
-    MOOG(int8_t, 58);
-    MOOG(uint8_t, 59);
-    MOOG(int16_t, 60);
-    MOOG(uint16_t, 61);
-    MOOG(int32_t, 62);
-    MOOG(uint32_t, 63);
-    MOOG(int64_t, 64);
-    MOOG(uint64_t, 65);
-    MOOG(aint, 66);
-    MOOG(offset, 67);
-    MOOG(c_bool, 68);
-    MOOG(c_float_complex, 69);
-    MOOG(c_double_complex, 70);
-    MOOG(c_long_double_complex, 71);
+    MOOG(int8_t, 56);
+    MOOG(uint8_t, 57);
+    MOOG(int16_t, 58);
+    MOOG(uint16_t, 59);
+    MOOG(int32_t, 60);
+    MOOG(uint32_t, 61);
+    MOOG(int64_t, 62);
+    MOOG(uint64_t, 63);
+    MOOG(aint, 64);
+    MOOG(offset, 65);
+    MOOG(c_bool, 66);
+    MOOG(c_float_complex, 67);
+    MOOG(c_double_complex, 68);
+    MOOG(c_long_double_complex, 69);
 
     /* MPI 3.0 types */
-    MOOG(count, 72);
+    MOOG(count, 70);
 
     /**
      * Now make sure all non-contiguous types are marked as such.