configury: remove the --enable-mpi-profiling option

and directly call the PMPI_* symbols from C and Fortran bindings

(back-ported from commit open-mpi/ompi@291a464)

Author: ggouaillardet

config/ompi_configure_options.m4

@@ -166,27 +166,6 @@ case "x$enable_mpi_fortran" in
         ;;
 esac
 
-#
-# MPI profiling
-#
-
-AC_MSG_CHECKING([if want PMPI])
-AC_ARG_ENABLE(mpi-profile,
-    AC_HELP_STRING([--enable-mpi-profile],
-                   [enable MPI profiling (default: enabled)]))
-if test "$enable_mpi_profile" != "no"; then
-    AC_MSG_RESULT([yes])
-    WANT_MPI_PROFILING=1
-    MPIF_H_PMPI_W_FUNCS=", PMPI_WTICK, PMPI_WTIME"
-else
-    AC_MSG_RESULT([no])
-    WANT_MPI_PROFILING=0
-    MPIF_H_PMPI_W_FUNCS=
-fi
-AC_SUBST(MPIF_H_PMPI_W_FUNCS)
-AM_CONDITIONAL(WANT_MPI_PROFILING, test "$WANT_MPI_PROFILING" = 1)
-
-
 #
 # C++
 #

config/ompi_setup_mpi_fortran.m4

@@ -374,15 +374,6 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
            OMPI_FORTRAN_F08_TYPE=$OMPI_FORTRAN_IGNORE_TKR_TYPE
           ])
 
-    AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \
-           test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
-          [ # If we don't have PMPI, we won't build mpi_f08 at all
-           AC_MSG_CHECKING([whether PMPI is enabled (needed for mpi_f08)])
-           AS_IF([test $WANT_MPI_PROFILING -eq 1],
-                 [AC_MSG_RESULT([yes])],
-                 [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS
-                  AC_MSG_RESULT([no (cannot build mpi_f08)])])])
-
     # The overall "_BIND_C" variable will be set to 1 if we have all
     # the necessary forms of BIND(C)
     OMPI_FORTRAN_HAVE_BIND_C=0
@@ -644,11 +635,10 @@ end type test_mpi_handle],
     # these layers need to be built or NOT
 
     AM_CONDITIONAL(BUILD_MPI_FORTRAN_MPIFH_BINDINGS_LAYER,
-                   [( test $WANT_MPI_PROFILING -eq 0 || test $OMPI_PROFILING_COMPILE_SEPARATELY -eq 1 ) && \
+                   [test $OMPI_PROFILING_COMPILE_SEPARATELY -eq 1 && \
                     test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS])
     AM_CONDITIONAL(BUILD_PMPI_FORTRAN_MPIFH_BINDINGS_LAYER,
-                   [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS && \
-                    test $WANT_MPI_PROFILING -eq 1])
+                   [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS])
     AM_CONDITIONAL(OMPI_BUILD_FORTRAN_MPIFH_BINDINGS,
                    [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS])
 

config/ompi_setup_mpi_profiling.m4

@@ -15,6 +15,8 @@
 # Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
 #                         reserved.
 # Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -39,14 +41,10 @@ AC_DEFUN([OMPI_SETUP_MPI_PROFILING],[
     #
 
     AM_CONDITIONAL(BUILD_MPI_BINDINGS_LAYER,
-        test "$WANT_MPI_PROFILING" = 0 -o "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1)
+        test "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1)
 
-    AM_CONDITIONAL(BUILD_PMPI_BINDINGS_LAYER,
-        test "$WANT_MPI_PROFILING" = 1)
     AM_CONDITIONAL(COMPILE_PROFILING_SEPARATELY,
         test "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1)
-    AC_DEFINE_UNQUOTED(OMPI_ENABLE_MPI_PROFILING, $WANT_MPI_PROFILING,
-        [Whether we want MPI profiling or not])
     AC_DEFINE_UNQUOTED(OPAL_HAVE_WEAK_SYMBOLS, $OPAL_C_HAVE_WEAK_SYMBOLS,
         [Whether we have weak symbols or not])
 ])

configure.ac

@@ -496,14 +496,10 @@ fi
 if test "$WANT_WEAK_SYMBOLS" = "0"; then
     OPAL_C_HAVE_WEAK_SYMBOLS=0
 fi
-if test "$WANT_MPI_PROFILING" = "1"; then
-    if test "$OPAL_C_HAVE_WEAK_SYMBOLS" = "1"; then
-        OMPI_PROFILING_COMPILE_SEPARATELY=0
-    else
-        OMPI_PROFILING_COMPILE_SEPARATELY=1
-    fi
-else
+if test "$OPAL_C_HAVE_WEAK_SYMBOLS" = "1"; then
     OMPI_PROFILING_COMPILE_SEPARATELY=0
+else
+    OMPI_PROFILING_COMPILE_SEPARATELY=1
 fi
 
 # Check if we support the offsetof compiler directive
@@ -549,13 +545,7 @@ m4_ifdef([project_oshmem], [OSHMEM_SETUP_JAVA_BINDINGS])
 ##################################
 
 # Setup profiling bindings (if we're building the relevant projects).
-# Note that opal_wrapper.c has a hard-coded use of the
-# OMPI_ENABLE_MPI_PROFILING macro, so we need to define it (to 0) even
-# if we're not building the OMPI project.
-
-m4_ifdef([project_ompi], [OMPI_SETUP_MPI_PROFILING],
-                         [AC_DEFINE([OMPI_ENABLE_MPI_PROFILING], [0],
-                                    [We are not building OMPI, so no profiling])])
+m4_ifdef([project_ompi], [OMPI_SETUP_MPI_PROFILING])
 m4_ifdef([project_oshmem], [OSHMEM_SETUP_PROFILING])
 
 

ompi/Makefile.am

@@ -15,6 +15,8 @@
 # Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2015      Intel, Inc. All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -29,11 +31,7 @@ c_mpi_lib = mpi/c/libmpi_c_mpi.la mpi/tool/libmpi_mpit.la
 else
 c_mpi_lib =
 endif
-if BUILD_PMPI_BINDINGS_LAYER
 c_pmpi_lib = mpi/c/profile/libmpi_c_pmpi.la mpi/tool/profile/libmpi_pmpit.la
-else
-c_pmpi_lib =
-endif
 
 # See if we have Fortran mpif.h MPI bindings
 

ompi/mpi/c/errhandler_create.c

@@ -32,16 +32,12 @@
 #define MPI_Errhandler_create PMPI_Errhandler_create
 #endif
 
-#if OMPI_ENABLE_MPI_PROFILING
-#define MPI_Comm_create_errhandler PMPI_Comm_create_errhandler
-#endif
-
 int MPI_Errhandler_create(MPI_Handler_function *function,
                           MPI_Errhandler *errhandler)
 {
 
     /* This is a deprecated -- just turn around and call the real
        function */
 
-    return MPI_Comm_create_errhandler(function, errhandler);
+    return PMPI_Comm_create_errhandler(function, errhandler);
 }

ompi/mpi/c/errhandler_get.c

@@ -34,10 +34,6 @@
 #define MPI_Errhandler_get PMPI_Errhandler_get
 #endif
 
-#if OMPI_ENABLE_MPI_PROFILING
-#define MPI_Comm_get_errhandler PMPI_Comm_get_errhandler
-#endif
-
 static const char FUNC_NAME[] = "MPI_Errhandler_get";
 
 
@@ -54,5 +50,5 @@ int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler)
   /* This is a deprecated -- just turn around and call the real
      function */
 
-  return MPI_Comm_get_errhandler(comm, errhandler);
+  return PMPI_Comm_get_errhandler(comm, errhandler);
 }

ompi/mpi/c/errhandler_set.c

@@ -34,10 +34,6 @@
 #define MPI_Errhandler_set PMPI_Errhandler_set
 #endif
 
-#if OMPI_ENABLE_MPI_PROFILING
-#define MPI_Comm_set_errhandler PMPI_Comm_set_errhandler
-#endif
-
 static const char FUNC_NAME[] = "MPI_Errhandler_set";
 
 
@@ -54,5 +50,5 @@ int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler)
   /* This is a deprecated -- just turn around and call the real
      function */
 
-  return MPI_Comm_set_errhandler(comm, errhandler);
+  return PMPI_Comm_set_errhandler(comm, errhandler);
 }

ompi/mpi/c/profile/Makefile.am

@@ -38,10 +38,7 @@ AM_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=1
 # Further, this build HAS to go through if profiling is required.
 #
 
-noinst_LTLIBRARIES =
-if BUILD_PMPI_BINDINGS_LAYER
-noinst_LTLIBRARIES += libmpi_c_pmpi.la
-endif
+noinst_LTLIBRARIES = libmpi_c_pmpi.la
 
 nodist_libmpi_c_pmpi_la_SOURCES = \
         pabort.c \

ompi/mpi/c/sendrecv_replace.c

@@ -38,12 +38,6 @@
 #define MPI_Sendrecv_replace PMPI_Sendrecv_replace
 #endif
 
-#if OMPI_ENABLE_MPI_PROFILING
-#define MPI_Alloc_mem PMPI_Alloc_mem
-#define MPI_Free_mem PMPI_Free_mem
-#define MPI_Sendrecv PMPI_Sendrecv
-#endif
-
 static const char FUNC_NAME[] = "MPI_Sendrecv_replace";
 
 
@@ -81,7 +75,7 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
 
     /* simple case */
     if ( source == MPI_PROC_NULL || dest == MPI_PROC_NULL || count == 0 ) {
-        rc = MPI_Sendrecv(buf,count,datatype,dest,sendtag,buf,count,datatype,source,recvtag,comm,status);
+        rc = PMPI_Sendrecv(buf,count,datatype,dest,sendtag,buf,count,datatype,source,recvtag,comm,status);
 
         return rc;
     } else {
@@ -106,7 +100,7 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
         /* setup a buffer for recv */
         opal_convertor_get_packed_size( &convertor, &packed_size );
         if( packed_size > sizeof(recv_data) ) {
-            rc = MPI_Alloc_mem(packed_size, MPI_INFO_NULL, &iov.iov_base);
+            rc = PMPI_Alloc_mem(packed_size, MPI_INFO_NULL, &iov.iov_base);
             if(OMPI_SUCCESS != rc) {
                 OMPI_ERRHANDLER_RETURN(OMPI_ERR_OUT_OF_RESOURCE, comm, MPI_ERR_BUFFER, FUNC_NAME);
             }
@@ -115,11 +109,11 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
         }
 
         /* recv into temporary buffer */
-        rc = MPI_Sendrecv( buf, count, datatype, dest, sendtag, iov.iov_base, packed_size,
+        rc = PMPI_Sendrecv( buf, count, datatype, dest, sendtag, iov.iov_base, packed_size,
                            MPI_BYTE, source, recvtag, comm, &recv_status );
         if (rc != MPI_SUCCESS) {
             if(packed_size > sizeof(recv_data))
-                MPI_Free_mem(iov.iov_base);
+                PMPI_Free_mem(iov.iov_base);
             OBJ_DESTRUCT(&convertor);
             OMPI_ERRHANDLER_RETURN(rc, comm, rc, FUNC_NAME);
         }
@@ -137,7 +131,7 @@ int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
 
         /* release resources */
         if(packed_size > sizeof(recv_data)) {
-            MPI_Free_mem(iov.iov_base);
+            PMPI_Free_mem(iov.iov_base);
         }
         OBJ_DESTRUCT(&convertor);