From 196f3246685506784de8cb52a053330e51f4a8db Mon Sep 17 00:00:00 2001
From: Austen Lauria <awlauria@us.ibm.com>
Date: Tue, 15 Mar 2022 14:30:40 -0400
Subject: [PATCH] schizos: add --version output for ompi and prte.

For mpirun/mpiexec, grab the tool name from the environment.
This is set before the exec of prterun.

Signed-off-by: Austen Lauria <awlauria@us.ibm.com>
---
 src/mca/schizo/ompi/help-schizo-ompi.txt    |  5 +++++
 src/mca/schizo/ompi/schizo_ompi.c           | 12 ++++++++++++
 src/mca/schizo/prte/help-schizo-prte.txt    |  5 +++++
 src/mca/schizo/prte/help-schizo-prted.txt   |  5 +++++
 src/mca/schizo/prte/help-schizo-prterun.txt |  5 +++++
 src/mca/schizo/prte/help-schizo-prun.txt    |  5 +++++
 src/mca/schizo/prte/schizo_prte.c           |  3 +++
 7 files changed, 40 insertions(+)

diff --git a/src/mca/schizo/ompi/help-schizo-ompi.txt b/src/mca/schizo/ompi/help-schizo-ompi.txt
index c1214ca539..2261125cbb 100644
--- a/src/mca/schizo/ompi/help-schizo-ompi.txt
+++ b/src/mca/schizo/ompi/help-schizo-ompi.txt
@@ -8,6 +8,11 @@
 # $HEADER$
 #
 #
+[version]
+%s (%s) %s
+
+%s
+#
 [usage]
 %s (%s) %s
 
diff --git a/src/mca/schizo/ompi/schizo_ompi.c b/src/mca/schizo/ompi/schizo_ompi.c
index 041d854147..d08bfa392b 100644
--- a/src/mca/schizo/ompi/schizo_ompi.c
+++ b/src/mca/schizo/ompi/schizo_ompi.c
@@ -47,6 +47,7 @@
 #include "src/util/pmix_path.h"
 #include "src/util/pmix_environ.h"
 #include "src/util/prte_cmd_line.h"
+#include "src/runtime/pmix_init_util.h"
 #include "src/util/session_dir.h"
 #include "src/util/show_help.h"
 
@@ -282,6 +283,17 @@ static int parse_cli(char **argv, pmix_cli_result_t *results,
 #endif
     }
 
+    const char *tool_version = getenv("OMPI_VERSION");
+    const char *tool_name    = getenv("OMPI_TOOL_NAME");
+    // If the user is using prterun --personality ompi, these
+    // won't be set, and thus this is not mpirun/mpiexec.
+    if(tool_version && tool_name) {
+        pmix_tool_version  = tool_version;
+        pmix_tool_basename = tool_name;
+        pmix_tool_org      = "Open MPI";
+        pmix_tool_msg      = "Report bugs to https://www.open-mpi.org/community/help/";
+    }
+
     rc = pmix_cmd_line_parse(pargv, ompishorts, ompioptions, NULL,
                              results, "help-schizo-ompi.txt");
     pmix_argv_free(pargv);
diff --git a/src/mca/schizo/prte/help-schizo-prte.txt b/src/mca/schizo/prte/help-schizo-prte.txt
index 0c2fa196bd..5e5d559b2f 100644
--- a/src/mca/schizo/prte/help-schizo-prte.txt
+++ b/src/mca/schizo/prte/help-schizo-prte.txt
@@ -8,6 +8,11 @@
 # $HEADER$
 #
 #
+[version]
+%s (%s) %s
+
+%s
+#
 [usage]
 %s (%s) %s
 
diff --git a/src/mca/schizo/prte/help-schizo-prted.txt b/src/mca/schizo/prte/help-schizo-prted.txt
index d199e81ce7..e2d484e590 100644
--- a/src/mca/schizo/prte/help-schizo-prted.txt
+++ b/src/mca/schizo/prte/help-schizo-prted.txt
@@ -8,6 +8,11 @@
 # $HEADER$
 #
 #
+[version]
+%s (%s) %s
+
+%s
+#
 [usage-prte]
 %s (%s) %s
 
diff --git a/src/mca/schizo/prte/help-schizo-prterun.txt b/src/mca/schizo/prte/help-schizo-prterun.txt
index 506d945f63..cef6ee0245 100644
--- a/src/mca/schizo/prte/help-schizo-prterun.txt
+++ b/src/mca/schizo/prte/help-schizo-prterun.txt
@@ -8,6 +8,11 @@
 # $HEADER$
 #
 #
+[version]
+%s (%s) %s
+
+%s
+#
 [usage]
 %s (%s) %s
 
diff --git a/src/mca/schizo/prte/help-schizo-prun.txt b/src/mca/schizo/prte/help-schizo-prun.txt
index 341cdce593..c6098af198 100644
--- a/src/mca/schizo/prte/help-schizo-prun.txt
+++ b/src/mca/schizo/prte/help-schizo-prun.txt
@@ -9,6 +9,11 @@
 #
 #
 #
+[version]
+%s (%s) %s
+
+%s
+#
 [usage]
 %s (%s) %s
 
diff --git a/src/mca/schizo/prte/schizo_prte.c b/src/mca/schizo/prte/schizo_prte.c
index a1008717d5..1416ef0e71 100644
--- a/src/mca/schizo/prte/schizo_prte.c
+++ b/src/mca/schizo/prte/schizo_prte.c
@@ -53,6 +53,7 @@
 #include "src/mca/prteinstalldirs/prteinstalldirs.h"
 #include "src/mca/rmaps/rmaps_types.h"
 #include "src/runtime/prte_globals.h"
+#include "src/runtime/pmix_init_util.h"
 
 #include "schizo_prte.h"
 #include "src/mca/schizo/base/base.h"
@@ -459,6 +460,8 @@ static int parse_cli(char **argv, pmix_cli_result_t *results,
         shorts = pinfoshorts;
         helpfile = "help-schizo-pinfo.txt";
     }
+    pmix_tool_msg = "Report bugs to: https://github.com/openpmix/prrte";
+
     rc = pmix_cmd_line_parse(argv, shorts, myoptions, NULL,
                              results, helpfile);
     if (PMIX_SUCCESS != rc) {