Merge pull request #5944 from rhc54/topic/psrvr

Remove the stale orte-dvm code

Author: Ralph Castain

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])
@@ -376,7 +374,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])])])
 
@@ -436,7 +433,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

@@ -30,7 +30,5 @@ AC_DEFUN([ORTE_CONFIG_FILES],[
         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
@@ -30,12 +30,6 @@ 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
-
 if OPAL_INSTALL_BINARIES
 nodist_man_MANS = $(man_pages)
 
@@ -46,9 +40,6 @@ install-exec-hook:
 	(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) \
@@ -57,9 +48,6 @@ uninstall-local:
 		$(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
 
@@ -96,10 +84,5 @@ $(top_builddir)/orte/tools/orte-server/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)