Skip to content

Commit 1bd772e

Browse files
author
Ralph Castain
committed
Remove the stale orte-dvm code
Users should migrate to https://github.com/pmix/prrte Signed-off-by: Ralph Castain <rhc@open-mpi.org>
1 parent c2608fb commit 1bd772e

24 files changed

+2
-7355
lines changed

config/opal_check_pmi.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,12 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
248248
AC_MSG_ERROR([Cannot continue])])
249249
250250
AC_MSG_CHECKING([if user requested internal PMIx support($with_pmix)])
251-
opal_prun_happy=no
252251
opal_external_pmix_happy=no
253252
opal_external_have_pmix1=0
254253
255254
AS_IF([test "$with_pmix" = "internal"],
256255
[AC_MSG_RESULT([yes])
257256
opal_external_pmix_happy=no
258-
opal_prun_happy=yes
259257
opal_external_pmix_version=internal],
260258
261259
[AC_MSG_RESULT([no])
@@ -376,7 +374,6 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
376374
[AC_MSG_RESULT([found])
377375
opal_external_pmix_version=2x
378376
opal_external_pmix_version_found=1
379-
opal_prun_happy=yes
380377
opal_external_pmix_happy=yes],
381378
[AC_MSG_RESULT([not found])])])
382379
@@ -436,7 +433,6 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
436433
437434
AC_DEFINE_UNQUOTED([OPAL_PMIX_V1],[$opal_external_have_pmix1],
438435
[Whether the external PMIx library is v1])
439-
AM_CONDITIONAL([OPAL_WANT_PRUN], [test "$opal_prun_happy" = "yes"])
440436
441437
AS_IF([test "$opal_external_pmix_happy" = "yes"],
442438
[AS_IF([test "$opal_external_pmix_version" = "1x"],

config/orte_config_files.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,5 @@ AC_DEFUN([ORTE_CONFIG_FILES],[
3030
orte/tools/orte-top/Makefile
3131
orte/tools/orte-info/Makefile
3232
orte/tools/orte-server/Makefile
33-
orte/tools/orte-dvm/Makefile
34-
orte/tools/ompi-prun/Makefile
3533
])
3634
])

ompi/mca/rte/orte/Makefile.am

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright (c) 2012 Los Alamos National Security, LLC.
33
# All rights reserved.
44
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
5-
# Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
5+
# Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
66
# $COPYRIGHT$
77
#
88
# Additional copyrights may follow
@@ -30,12 +30,6 @@ libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
3030

3131
man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1 ompi-top.1 ompi-server.1
3232

33-
if OPAL_WANT_PRUN
34-
if WANT_INSTALL_HEADERS
35-
man_pages += ompi-dvm.1
36-
endif
37-
endif
38-
3933
if OPAL_INSTALL_BINARIES
4034
nodist_man_MANS = $(man_pages)
4135

@@ -46,9 +40,6 @@ install-exec-hook:
4640
(cd $(DESTDIR)$(bindir); rm -f ompi-clean$(EXEEXT); $(LN_S) orte-clean$(EXEEXT) ompi-clean$(EXEEXT))
4741
(cd $(DESTDIR)$(bindir); rm -f ompi-top$(EXEEXT); $(LN_S) orte-top$(EXEEXT) ompi-top$(EXEEXT))
4842
(cd $(DESTDIR)$(bindir); rm -f ompi-server$(EXEEXT); $(LN_S) orte-server$(EXEEXT) ompi-server$(EXEEXT))
49-
if OPAL_WANT_PRUN
50-
(cd $(DESTDIR)$(bindir); rm -f ompi-dvm$(EXEEXT); $(LN_S) orte-dvm$(EXEEXT) ompi-dvm$(EXEEXT))
51-
endif
5243

5344
uninstall-local:
5445
rm -f $(DESTDIR)$(bindir)/mpirun$(EXEEXT) \
@@ -57,9 +48,6 @@ uninstall-local:
5748
$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \
5849
$(DESTDIR)$(bindir)/ompi-top$(EXEEXT) \
5950
$(DESTDIR)$(bindir)/ompi-server$(EXEEXT)
60-
if OPAL_WANT_PRUN
61-
rm -f $(DESTDIR)$(bindir)/ompi-dvm$(EXEEXT)
62-
endif
6351

6452
endif # OPAL_INSTALL_BINARIES
6553

@@ -96,10 +84,5 @@ $(top_builddir)/orte/tools/orte-server/orte-server.1:
9684
ompi-server.1: $(top_builddir)/orte/tools/orte-server/orte-server.1
9785
cp -f $(top_builddir)/orte/tools/orte-server/orte-server.1 ompi-server.1
9886

99-
if OPAL_WANT_PRUN
100-
ompi-dvm.1: $(top_builddir)/orte/tools/orte-dvm/orte-dvm.1
101-
cp -f $(top_builddir)/orte/tools/orte-dvm/orte-dvm.1 ompi-dvm.1
102-
endif
103-
10487
clean-local:
10588
rm -f $(man_pages)

orte/mca/errmgr/dvm/Makefile.am

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)