Merge pull request #10836 from jsquyres/pr/mpirun-send-frameworks-to-prte-because-well-its-complicated

mpirun: set OMPI_MCA_PREFIXES env var

Author: jsquyres

ompi/tools/mpirun/Makefile.am

@@ -3,6 +3,7 @@
 # Copyright (c) 2020      IBM Corporation.  All rights reserved.
 # Copyright (c) 2021-2022 Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -22,6 +23,11 @@ mpirun_SOURCES = \
 mpirun_LDADD = \
 	$(top_builddir)/opal/libopen-pal_core.la
 
+mpirun_CPPFLAGS = \
+    -DMCA_oshmem_FRAMEWORKS="\"$(MCA_oshmem_FRAMEWORKS)\"" \
+    -DMCA_ompi_FRAMEWORKS="\"$(MCA_ompi_FRAMEWORKS)\"" \
+    -DMCA_opal_FRAMEWORKS="\"$(MCA_opal_FRAMEWORKS)\""
+
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); rm -f mpiexec$(EXEEXT); $(LN_S) mpirun$(EXEEXT) mpiexec$(EXEEXT))
 	(cd $(DESTDIR)$(bindir); rm -f oshrun$(EXEEXT); $(LN_S) mpirun$(EXEEXT) oshrun$(EXEEXT))

ompi/tools/mpirun/main.c

@@ -69,6 +69,48 @@ static char *find_prterun(void)
 #endif
 }
 
+static void append_prefixes(char ***out, const char *in)
+{
+    if (NULL == in) {
+        return;
+    }
+
+    char **tokenized;
+    tokenized = opal_argv_split(in, ' ');
+
+    int count = opal_argv_count(*out);
+    for (int i = 0; tokenized[i] != NULL; ++i) {
+        // Skip adding the names "common" and "pmix" to the list
+        if (strcmp(tokenized[i], "common") == 0 ||
+            strcmp(tokenized[i], "pmix") == 0) {
+            continue;
+        }
+        opal_argv_append(&count, out, tokenized[i]);
+    }
+
+    opal_argv_free(tokenized);
+}
+
+static void setup_mca_prefixes(void)
+{
+    int count = 0;
+    char **tmp = NULL;
+
+    opal_argv_append(&count, &tmp, "mca");
+    opal_argv_append(&count, &tmp, "opal");
+    opal_argv_append(&count, &tmp, "ompi");
+
+    append_prefixes(&tmp, MCA_oshmem_FRAMEWORKS);
+    append_prefixes(&tmp, MCA_ompi_FRAMEWORKS);
+    append_prefixes(&tmp, MCA_opal_FRAMEWORKS);
+
+    char *env_str = opal_argv_join(tmp, ',');
+    opal_setenv("OMPI_MCA_PREFIXES", env_str, true,
+                &environ);
+
+    opal_argv_free(tmp);
+}
+
 
 int main(int argc, char *argv[])
 {
@@ -121,6 +163,9 @@ int main(int argc, char *argv[])
 
     setenv("OMPI_LIBDIR_LOC", opal_install_dirs.libdir, 1);
 
+    // Set environment variable to tell PRTE what MCA prefixes belong
+    // to Open MPI.
+    setup_mca_prefixes();
 
     /* calling mpirun (and now prterun) with a full path has a special
      * meaning in terms of -prefix behavior, so copy that behavior