Merge pull request #5994 from rhc54/cmr40/cleanup

Remove stale defunct tools

Author: hppritcha

config/opal_check_pmi.m4

@@ -248,14 +248,12 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
            AC_MSG_ERROR([Cannot continue])])
 
     AC_MSG_CHECKING([if user requested internal PMIx support($with_pmix)])
-    opal_prun_happy=no
     opal_external_pmix_happy=no
     opal_external_have_pmix1=0
 
     AS_IF([test "$with_pmix" = "internal"],
           [AC_MSG_RESULT([yes])
            opal_external_pmix_happy=no
-           opal_prun_happy=yes
            opal_external_pmix_version=internal],
 
           [AC_MSG_RESULT([no])
@@ -362,7 +360,6 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
                                            [AC_MSG_RESULT([found])
                                             opal_external_pmix_version=2x
                                             opal_external_pmix_version_found=1
-                                            opal_prun_happy=yes
                                             opal_external_pmix_happy=yes],
                                            [AC_MSG_RESULT([not found])])])
 
@@ -422,7 +419,6 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
 
     AC_DEFINE_UNQUOTED([OPAL_PMIX_V1],[$opal_external_have_pmix1],
                        [Whether the external PMIx library is v1])
-    AM_CONDITIONAL([OPAL_WANT_PRUN], [test "$opal_prun_happy" = "yes"])
 
     AS_IF([test "$opal_external_pmix_happy" = "yes"],
           [AS_IF([test "$opal_external_pmix_version" = "1x"],

config/orte_config_files.m4

@@ -25,12 +25,8 @@ AC_DEFUN([ORTE_CONFIG_FILES],[
         orte/tools/wrappers/Makefile
         orte/tools/wrappers/ortecc-wrapper-data.txt
         orte/tools/wrappers/orte.pc
-        orte/tools/orte-ps/Makefile
         orte/tools/orte-clean/Makefile
-        orte/tools/orte-top/Makefile
         orte/tools/orte-info/Makefile
         orte/tools/orte-server/Makefile
-        orte/tools/orte-dvm/Makefile
-        orte/tools/ompi-prun/Makefile
     ])
 ])

ompi/mca/rte/orte/Makefile.am

@@ -2,7 +2,7 @@
 # Copyright (c) 2012      Los Alamos National Security, LLC.
 #                         All rights reserved.
 # Copyright (c) 2014      Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2016-2018 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -28,38 +28,22 @@ libmca_rte_orte_la_SOURCES =$(sources) $(headers)
 libmca_rte_orte_la_LDFLAGS = -module -avoid-version
 libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@[email protected]
 
-man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1
-
-if OPAL_WANT_PRUN
-if WANT_INSTALL_HEADERS
-man_pages += ompi-dvm.1
-endif
-endif
+man_pages = mpirun.1 mpiexec.1 ompi-clean.1 ompi-server.1
 
 if OPAL_INSTALL_BINARIES
 nodist_man_MANS = $(man_pages)
 
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
 	(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpiexec$(EXEEXT))
-	(cd $(DESTDIR)$(bindir); rm -f ompi-ps$(EXEEXT); $(LN_S) orte-ps$(EXEEXT) ompi-ps$(EXEEXT))
 	(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
-	(cd $(DESTDIR)$(bindir); rm -f ompi-top$(EXEEXT); $(LN_S) orte-top$(EXEEXT) ompi-top$(EXEEXT))
 	(cd $(DESTDIR)$(bindir); rm -f ompi-server$(EXEEXT); $(LN_S) orte-server$(EXEEXT) ompi-server$(EXEEXT))
-if OPAL_WANT_PRUN
-	(cd $(DESTDIR)$(bindir); rm -f ompi-dvm$(EXEEXT); $(LN_S) orte-dvm$(EXEEXT) ompi-dvm$(EXEEXT))
-endif
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
 		$(DESTDIR)$(bindir)/mpiexec$(EXEEXT) \
-		$(DESTDIR)$(bindir)/ompi-ps$(EXEEXT) \
 		$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \
-		$(DESTDIR)$(bindir)/ompi-top$(EXEEXT) \
 		$(DESTDIR)$(bindir)/ompi-server$(EXEEXT)
-if OPAL_WANT_PRUN
-	rm -f $(DESTDIR)$(bindir)/ompi-dvm$(EXEEXT)
-endif
 
 endif # OPAL_INSTALL_BINARIES
 
@@ -72,34 +56,17 @@ mpirun.1: $(top_builddir)/orte/tools/orterun/orterun.1
 mpiexec.1: $(top_builddir)/orte/tools/orterun/orterun.1
 	cp -f $(top_builddir)/orte/tools/orterun/orterun.1 mpiexec.1
 
-$(top_builddir)/orte/tools/orte-ps/orte-ps.1:
-	(cd $(top_builddir)/orte/tools/orte-ps && $(MAKE) $(AM_MAKEFLAGS) orte-ps.1)
-
-ompi-ps.1: $(top_builddir)/orte/tools/orte-ps/orte-ps.1
-	cp -f $(top_builddir)/orte/tools/orte-ps/orte-ps.1 ompi-ps.1
-
 $(top_builddir)/orte/tools/orte-clean/orte-clean.1:
 	(cd $(top_builddir)/orte/tools/orte-clean && $(MAKE) $(AM_MAKEFLAGS) orte-clean.1)
 
 ompi-clean.1: $(top_builddir)/orte/tools/orte-clean/orte-clean.1
 	cp -f $(top_builddir)/orte/tools/orte-clean/orte-clean.1 ompi-clean.1
 
-$(top_builddir)/orte/tools/orte-top/orte-top.1:
-	(cd $(top_builddir)/orte/tools/orte-top && $(MAKE) $(AM_MAKEFLAGS) orte-top.1)
-
-ompi-top.1: $(top_builddir)/orte/tools/orte-top/orte-top.1
-	cp -f $(top_builddir)/orte/tools/orte-top/orte-top.1 ompi-top.1
-
 $(top_builddir)/orte/tools/orte-server/orte-server.1:
 	(cd $(top_builddir)/orte/tools/orte-server && $(MAKE) $(AM_MAKEFLAGS) orte-server.1)
 
 ompi-server.1: $(top_builddir)/orte/tools/orte-server/orte-server.1
 	cp -f $(top_builddir)/orte/tools/orte-server/orte-server.1 ompi-server.1
 
-if OPAL_WANT_PRUN
-ompi-dvm.1: $(top_builddir)/orte/tools/orte-dvm/orte-dvm.1
-	cp -f $(top_builddir)/orte/tools/orte-dvm/orte-dvm.1 ompi-dvm.1
-endif
-
 clean-local:
 	rm -f $(man_pages)