Merge pull request open-mpi#8976 from awlauria/cleanup_orte

pkg-config oshmem files and removing some -lopen-rte references

Author: awlauria

config/opal_mca.m4

@@ -769,12 +769,12 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[
     else
         if test "$2" = "common"; then
             # Static libraries in "common" frameworks are installed, and
-            # therefore must obey the $FRAMEWORK_LIB_PREFIX that was
+            # therefore must obey the $FRAMEWORK_LIB_NAME that was
             # set.
-            $7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_PREFIX}mca_$2_$3.la $$7"
+            $7="mca/$2/$3/lib${m4_translit([$1], [a-z], [A-Z])_LIB_NAME}mca_$2_$3.la $$7"
         else
             # Other frameworks do not have to obey the
-            # $FRAMEWORK_LIB_PREFIX prefix.
+            # $FRAMEWORK_LIB_NAME prefix.
             $7="mca/$2/$3/libmca_$2_$3.la $$7"
         fi
         echo "extern const mca_base_component_t mca_$2_$3_component;" >> $outfile.extern

config/opal_set_lib_prefix.m4 renamed to config/opal_set_lib_name.m4

@@ -12,19 +12,19 @@
 
 # OPAL_SET_LIB_PREFIX([library_prefix]
 #
-# This macro sets a prefix for the libopen-pal library.  Specifically,
-# libopen-pal.la becomes libPREFIXopen-pal.la.
+# This macro sets a name for the libopen-pal library.  Specifically,
+# libopen-pal.la becomes libopen-pal.la by default.
 #
 # --------------------------------------------------------
-AC_DEFUN([OPAL_SET_LIB_PREFIX],[
+AC_DEFUN([OPAL_SET_LIB_NAME],[
     AS_IF([test "$opal_lib_prefix_set" = "yes"],
-          [AC_MSG_WARN([OPAL lib prefix was already set!])
+          [AC_MSG_WARN([OPAL lib name was already set!])
            AC_MSG_WARN([This is a configury programming error])
            AC_MSG_ERROR([Cannot continue])])
 
-    OPAL_LIB_PREFIX=$1
+    OPAL_LIB_NAME=$1
     opal_lib_prefix_set=yes
-    AC_SUBST(OPAL_LIB_PREFIX)
+    AC_SUBST(OPAL_LIB_NAME)
 ])dnl
 
 #

config/oshmem_config_files.m4

@@ -3,8 +3,8 @@
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
 # Copyright (c) 2013      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2017      Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2017-2018 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -27,5 +27,9 @@ AC_DEFUN([OSHMEM_CONFIG_FILES],[
     oshmem/tools/wrappers/shmemcc-wrapper-data.txt
     oshmem/tools/wrappers/shmemc++-wrapper-data.txt
     oshmem/tools/wrappers/shmemfort-wrapper-data.txt
+    oshmem/tools/wrappers/oshmem.pc
+    oshmem/tools/wrappers/oshmem-c.pc
+    oshmem/tools/wrappers/oshmem-cxx.pc
+    oshmem/tools/wrappers/oshmem-fort.pc
     ])
 ])

configure.ac

@@ -328,7 +328,9 @@ fi
 
 # The library prefixes must be set before we call OPAL MCA.  Here is
 # as good a place as any.
-OPAL_SET_LIB_PREFIX([])
+m4_ifdef([project_opal],
+[OPAL_SET_LIB_NAME([open-pal])])
+
 m4_ifdef([project_ompi],
           [OMPI_SET_LIB_NAME([])])
 

contrib/libadd_mca_comp_update.py

@@ -7,7 +7,7 @@
 
 import glob, os, re, shutil
 
-projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la"],
+projects= {'opal' : ["$(top_builddir)/opal/lib@OPAL_LIB_NAME@.la"],
            'ompi' : ["$(top_builddir)/ompi/lib@[email protected]"],
            'oshmem' : ["$(top_builddir)/oshmem/liboshmem.la"],
           }

contrib/scaling/Makefile

@@ -11,7 +11,7 @@ mpi_no_op: mpi_no_op.c
 	mpicc -o mpi_no_op mpi_no_op.c
 
 mpi_memprobe: mpi_memprobe.c
-	mpicc -o mpi_memprobe mpi_memprobe.c -lopen-pal -lopen-rte
+	mpicc -o mpi_memprobe mpi_memprobe.c -lopen-pal
 
 clean:
 	rm -f $(PROGS) *~

ompi/Makefile.am

@@ -157,7 +157,7 @@ lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
 
 
 lib@OMPI_LIBMPI_NAME@_la_LIBADD += \
-        $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+        $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_NAME@.la
 lib@OMPI_LIBMPI_NAME@_la_DEPENDENCIES = $(lib@OMPI_LIBMPI_NAME@_la_LIBADD)
 lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
        -version-info $(libmpi_so_version) \

ompi/debuggers/Makefile.am

@@ -46,7 +46,7 @@ headers = \
 dlopen_test_SOURCES = dlopen_test.c
 dlopen_test_LDADD = \
         $(top_builddir)/ompi/lib@[email protected] \
-        $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
+        $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la
 dlopen_test_DEPENDENCIES = $(ompi_predefined_LDADD)
 
 predefined_gap_test_SOURCES = predefined_gap_test.c

ompi/debuggers/ompi_debuggers.c

@@ -26,8 +26,6 @@
  * MPI portion of debugger support: initially based on the
  * TotalView/Etnus API for debuggers to attach to MPI jobs.
  *
- * There is a lengthy explanation of how OMPI handles parallel
- * debuggers attaching to MPI jobs in orte/tools/orterun/debuggers.c.
  */
 
 #include "ompi_config.h"

ompi/dpm/dpm.c

@@ -1148,7 +1148,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
 #endif
 
             /* check for 'ompi_prefix' (OMPI-specific -- to effect the same
-             * behavior as --prefix option to orterun)
+             * behavior as --prefix option to prun)
              *
              * This is a job-level key
              */
@@ -1217,7 +1217,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1239,7 +1238,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1257,7 +1255,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1275,7 +1272,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1291,7 +1287,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1307,7 +1302,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1327,7 +1321,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     if (NULL != hostfiles) {
                         opal_argv_free(hostfiles);
                     }
@@ -1364,7 +1357,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     return MPI_ERR_SPAWN;
                 }
             }
@@ -1395,7 +1387,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                     OPAL_LIST_DESTRUCT(&job_info);
                     OPAL_LIST_DESTRUCT(&app_info);
                     PMIX_APP_FREE(apps, scount);
-                    opal_progress_event_users_decrement();
                     return MPI_ERR_SPAWN;
                 }
             }
@@ -1472,7 +1463,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
             }
 #endif
 
-            /* see if this is a non-mpi job - if so, then set the flag so ORTE
+            /* see if this is a non-mpi job - if so, then set the flag so PRTE
              * knows what to do - job-level key
              */
             ompi_info_get_bool(array_of_info[i], "ompi_non_mpi", &non_mpi, &flag);
@@ -1551,7 +1542,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
             if (OMPI_SUCCESS != (rc = opal_getcwd(cwd, OPAL_PATH_MAX))) {
                 OMPI_ERROR_LOG(rc);
                 PMIX_APP_FREE(apps, (size_t)count);
-                opal_progress_event_users_decrement();
                 if (NULL != hostfiles) {
                     opal_argv_free(hostfiles);
                 }
@@ -1608,7 +1598,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
                 PMIX_INFO_FREE(pinfo, ninfo);
             }
             PMIX_APP_FREE(apps, scount);
-            opal_progress_event_users_decrement();
             if (NULL != hostfiles) {
                 opal_argv_free(hostfiles);
             }
@@ -1633,7 +1622,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
     PMIX_APP_FREE(apps, scount);
 
     if (OPAL_SUCCESS != rc) {
-        opal_progress_event_users_decrement();
         return MPI_ERR_SPAWN;
     }
 
@@ -2057,7 +2045,7 @@ static int start_dvm(char **hostfiles, char **dash_host)
          will) reset them.  If we don't do this, the event
          library may have left some set that, at least on some
          OS's, don't get reset via fork() or exec().  Hence, the
-         orted could be unkillable (for example). */
+         prted could be unkillable (for example). */
         set_handler_default(SIGTERM);
         set_handler_default(SIGINT);
         set_handler_default(SIGHUP);
@@ -2067,9 +2055,9 @@ static int start_dvm(char **hostfiles, char **dash_host)
         /* Unblock all signals, for many of the same reasons that
          we set the default handlers, above.  This is noticable
          on Linux where the event library blocks SIGTERM, but we
-         don't want that blocked by the orted (or, more
+         don't want that blocked by the prted (or, more
          specifically, we don't want it to be blocked by the
-         orted and then inherited by the ORTE processes that it
+         prted and then inherited by the PRTE processes that it
          forks, making them unkillable by SIGTERM). */
         sigprocmask(0, 0, &sigs);
         sigprocmask(SIG_UNBLOCK, &sigs, 0);
@@ -2130,7 +2118,6 @@ static int start_dvm(char **hostfiles, char **dash_host)
     pret = PMIx_Init(NULL, &info, 1);
     rc = opal_pmix_convert_status(pret);
     if (OPAL_SUCCESS != rc) {
-        opal_progress_event_users_decrement();
         return MPI_ERR_SPAWN;
     }
     /* decrement the PMIx init refcount */