Merge pull request #7202 from rhc54/topic/pmixstat

Remove ORTE project

Author: rhc54

.gitmodules

@@ -1,3 +1,11 @@
 [submodule "hwloc-20x"]
 	path = opal/mca/hwloc/hwloc2/hwloc
 	url = https://github.com/open-mpi/hwloc.git
+[submodule "prrte"]
+	path = prrte
+	url = https://github.com/openpmix/prrte
+	branch = master
+[submodule "openpmix"]
+	path = opal/mca/pmix/pmix4x/openpmix
+	url = https://github.com/openpmix/openpmix.git
+	branch = master

Makefile.am

@@ -11,9 +11,10 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2015 Los Alamos National Security, Inc.  All rights reserved.
-# Copyright (c) 2014      Intel, Inc. All rights reserved.
+# Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2017-2018 Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
+# Copyright (c) 2020      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -22,7 +23,14 @@
 #
 
 SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
+if OMPI_WANT_PRRTE
+SUBDIRS += prrte
+endif
+
 DIST_SUBDIRS = config contrib $(MCA_PROJECT_DIST_SUBDIRS) test
+if OMPI_WANT_PRRTE
+DIST_SUBDIRS += prrte
+endif
 EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl README.JAVA.txt AUTHORS
 
 include examples/Makefile.include

VERSION

@@ -90,7 +90,6 @@ libmpi_mpifh_so_version=0:0:0
 libmpi_usempi_tkr_so_version=0:0:0
 libmpi_usempi_ignore_tkr_so_version=0:0:0
 libmpi_usempif08_so_version=0:0:0
-libopen_rte_so_version=0:0:0
 libopen_pal_so_version=0:0:0
 libmpi_java_so_version=0:0:0
 liboshmem_so_version=0:0:0
@@ -105,9 +104,6 @@ libompitrace_so_version=0:0:0
 libmca_ompi_common_ompio_so_version=0:0:0
 libmca_ompi_common_monitoring_so_version=0:0:0
 
-# ORTE layer
-libmca_orte_common_alps_so_version=0:0:0
-
 # OPAL layer
 libmca_opal_common_cuda_so_version=0:0:0
 libmca_opal_common_ofi_so_version=0:0:0

autogen.pl

@@ -7,7 +7,7 @@
 # Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015-2019 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
-# Copyright (c) 2015      IBM Corporation.  All rights reserved.
+# Copyright (c) 2015-2020 IBM Corporation.  All rights reserved.
 #
 # $COPYRIGHT$
 #
@@ -47,6 +47,7 @@
 # Command line parameters
 my $no_ompi_arg = 0;
 my $no_orte_arg = 0;
+my $no_prrte_arg = 0;
 my $no_oshmem_arg = 0;
 my $quiet_arg = 0;
 my $debug_arg = 0;
@@ -1121,6 +1122,7 @@ sub in_tarball {
 
 my $ok = Getopt::Long::GetOptions("no-ompi" => \$no_ompi_arg,
                                   "no-orte" => \$no_orte_arg,
+                                  "no-prrte" => \$no_prrte_arg,
                                   "no-oshmem" => \$no_oshmem_arg,
                                   "quiet|q" => \$quiet_arg,
                                   "debug|d" => \$debug_arg,
@@ -1136,7 +1138,8 @@ sub in_tarball {
         if (!$ok);
     print "Options:
   --no-ompi | -no-ompi          Do not build the Open MPI layer
-  --no-orte | -no-orte          Do not build the ORTE layer
+  --no-orte | -no-orte          Do not build Open MPI's runtime support (alias for --no-prrte)
+  --no-prrte | -no-prrte        Do not build Open MPI's runtime support
   --no-oshmem | -no-oshmem      Do not build the OSHMEM layer
   --quiet | -q                  Do not display normal verbose output
   --debug | -d                  Output lots of debug information
@@ -1164,31 +1167,22 @@ sub in_tarball {
     $no_ompi_arg = 1;
     debug "No ompi subdirectory found - will not build MPI layer\n";
 }
-if (! -e "orte") {
-    $no_orte_arg = 1;
-    debug "No orte subdirectory found - will not build ORTE\n";
+if (! -e "prrte") {
+    $no_prrte_arg = 1;
+    debug "No prrte subdirectory found - will not build PRRTE\n";
 }
 if (! -e "oshmem") {
     $no_oshmem_arg = 1;
     debug "No oshmem subdirectory found - will not build OSHMEM\n";
 }
+# alias --no-orte to --no-prrte
+if ($no_orte_arg == 1) {
+    $no_prrte_arg = 1;
+}
 
-if (-e "orcm") {
-    # bozo check - ORCM requires ORTE
-    if ($no_orte_arg == 1) {
-        print "Cannot build ORCM without ORTE\n";
-        my_exit(1);
-    }
-    $project_name_long = "Open Resilient Cluster Manager";
-    $project_name_short = "open-rcm";
-} elsif ($no_ompi_arg == 1) {
-    if ($no_orte_arg == 0) {
-        $project_name_long = "Open MPI Run Time Environment";
-        $project_name_short = "open-rte";
-    } else {
-        $project_name_long = "Open Portability Access Layer";
-        $project_name_short = "open-pal";
-    }
+if ($no_ompi_arg == 1) {
+    $project_name_long = "Open Portability Access Layer";
+    $project_name_short = "open-pal";
 }
 
 #---------------------------------------------------------------------------
@@ -1393,19 +1387,18 @@ sub in_tarball {
 # Top-level projects to examine
 my $projects;
 push(@{$projects}, { name => "opal", dir => "opal", need_base => 1 });
-push(@{$projects}, { name => "orte", dir => "orte", need_base => 1 })
-    if (!$no_orte_arg);
 push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 })
     if (!$no_ompi_arg);
 push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 })
     if (!$no_ompi_arg && !$no_oshmem_arg);
-push(@{$projects}, { name => "orcm", dir => "orcm", need_base => 1 })
-    if (-e "orcm");
 
 $m4 .= "dnl Separate m4 define for each project\n";
 foreach my $p (@$projects) {
     $m4 .= "m4_define([project_$p->{name}], [1])\n";
 }
+if (!$no_prrte_arg) {
+    $m4 .= "m4_define([project_prrte], [1])\n";
+}
 
 $m4 .= "\ndnl Project names
 m4_define([project_name_long], [$project_name_long])
@@ -1433,6 +1426,10 @@ sub in_tarball {
 ++$step;
 verbose "\n$step. Processing autogen.subdirs directories\n";
 
+if (!$no_prrte_arg) {
+    process_autogen_subdirs(".");
+}
+
 if ($#subdirs >= 0) {
     foreach my $d (@subdirs) {
         process_subdir($d);

autogen.subdirs

@@ -0,0 +1 @@
+prrte

config/ompi_config_files.m4

@@ -57,5 +57,6 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/tools/wrappers/ompi-fort.pc
         ompi/tools/wrappers/mpijavac.pl
         ompi/tools/mpisync/Makefile
+        ompi/tools/mpirun/Makefile
     ])
 ])

config/ompi_setup_prrte.m4

@@ -0,0 +1,103 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
+#                         reserved.
+# Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
+# Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+AC_DEFUN([OMPI_SETUP_PRRTE],[
+    OPAL_VAR_SCOPE_PUSH([opal_prrte_save_CPPFLAGS opal_prrte_save_CFLAGS opal_prrte_save_LDFLAGS opal_prrte_save_LIBS opal_prrte_args opal_prrte_save_enable_dlopen opal_prrte_save_enable_mca_dso opal_prrte_save_enable_mca_static])
+
+    opal_prrte_save_CFLAGS=$CFLAGS
+    opal_prrte_save_CPPFLAGS=$CPPFLAGS
+    opal_prrte_save_LDFLAGS=$LDFLAGS
+    opal_prrte_save_LIBS=$LIBS
+    opal_prrte_save_enable_dlopen=enable_dlopen
+    opal_prrte_save_enable_mca_dso=enable_mca_dso
+    opal_prrte_save_enable_mca_static=enable_mca_static
+
+    AC_ARG_ENABLE([internal-rte],
+                  [AC_HELP_STRING([--enable-internal-rte],
+                                  [Enable internal runtime support and provide mpiexec/mpirun (default: enabled)])])
+    AC_MSG_CHECKING([if RTE support is enabled])
+    if test "$enable_internal_rte" != "no"; then
+        AC_MSG_RESULT([yes])
+        if test -z $with_libevent || test "$with_libevent" = "internal" || test "$with_libevent" = "yes"; then
+            opal_prrte_libevent_arg="--with-libevent-header=$OMPI_TOP_SRCDIR/opal/mca/event/event.h"
+        elif test "$with_libevent" = "external"; then
+            opal_prrte_libevent_arg=""
+        else
+            opal_prrte_libevent_arg="--with-libevent=$with_libevent"
+        fi
+
+        if test -z $with_hwloc || test "$with_hwloc" = "internal" || test "$with_hwloc" = "yes"; then
+               opal_prrte_hwloc_arg="--with-hwloc-header=$OMPI_TOP_SRCDIR/opal/mca/hwloc/hwloc-internal.h"
+        elif test "$with_hwloc" = "external"; then
+            opal_prrte_hwloc_arg=""
+        else
+            opal_prrte_hwloc_arg="--with-hwloc=$with_hwloc"
+        fi
+
+        if test -z $with_pmix || test "$with_pmix" = "internal" || test "$with_pmix" = "yes"; then
+            opal_prrte_pmix_arg="--with-pmix-header=$OMPI_TOP_SRCDIR/opal/mca/pmix/pmix-internal.h"
+        elif test "$with_pmix" = "external"; then
+            opal_prrte_pmix_arg=""
+        else
+            opal_prrte_pmix_arg="--with-pmix=$with_pmix"
+        fi
+
+        opal_prrte_args="--prefix=$prefix --disable-dlopen $opal_prrte_libevent_arg $opal_prrte_hwloc_arg $opal_prrte_pmix_arg"
+        AS_IF([test "$enable_debug" = "yes"],
+              [opal_prrte_args="--enable-debug $opal_prrte_args"
+               CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"],
+              [opal_prrte_args="--disable-debug $opal_prrte_args"
+               CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"])
+        AS_IF([test "$with_devel_headers" = "yes"],
+              [opal_prrte_args="--with-devel-headers  $opal_prrte_args"])
+        # add the extra libs
+        opal_prrte_args="$opal_prrte_args --with-prrte-extra-lib=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la --with-prrte-extra-ltlib=$OMPI_TOP_BUILDDIR/opal/libopen-pal.la"
+
+        AC_MSG_CHECKING([final prrte configure args])
+        AC_MSG_RESULT([$opal_prrte_args])
+
+        CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
+        OPAL_CONFIG_SUBDIR([prrte],
+                           [$opal_prrte_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
+                           [opal_prrte_happy=1], [opal_prrte_happy=0])
+
+        OPAL_SUMMARY_ADD([[Miscellaneous]],[[PRRTE]],[prrte],[yes])
+
+    else
+        OPAL_SUMMARY_ADD([[Miscellaneous]],[[PRRTE]],[prrte],[no (disabled)])
+        AC_MSG_RESULT([no (disabled)])
+    fi
+
+    CFLAGS=$opal_prrte_save_CFLAGS
+    CPPFLAGS=$opal_prrte_save_CPPFLAGS
+    LDFLAGS=$opal_prrte_save_LDFLAGS
+    LIBS=$opal_prrte_save_LIBS
+    enable_dlopen=$opal_prrte_save_enable_dlopen
+    enable_mca_dso=$opal_prrte_save_enable_mca_dso
+    enable_mca_static=$opal_prrte_save_enable_mca_static
+
+    OPAL_VAR_SCOPE_POP
+
+])