Skip to content

Commit 525d8c7

Browse files
committed
tools/mpirun: Expose OMPI_VERSION as a string.
To be passed into the launcher (prterun). There seemed to be some inconsistency with how OMPI_VERSION was defined, the change to opal_save_version.m4 makes it consistently defined between makefiles and header files. Signed-off-by: Austen Lauria <[email protected]>
1 parent c9598ed commit 525d8c7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

config/opal_save_version.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ AC_DEFUN([OPAL_SAVE_VERSION], [
5555
[The repository version ]$2)
5656
AC_DEFINE_UNQUOTED($1[_TARBALL_VERSION], ["$]$1[_TARBALL_VERSION"],
5757
[Tarball filename version string of ]$2)
58-
AC_DEFINE_UNQUOTED($1[_VERSION], ["$]$1[_RELEASE_VERSION"],
58+
AC_DEFINE_UNQUOTED($1[_VERSION], ["$]$1[_VERSION"],
5959
[Complete release number of ]$2)
6060
AC_DEFINE_UNQUOTED($1[_RELEASE_DATE], ["$]$1[_RELEASE_DATE"],
6161
[Release date of ]$2)

ompi/tools/mpirun/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
4444
#endif
4545
}
4646
setenv("PRTE_MCA_schizo_proxy", "ompi", 1);
47+
setenv("OMPI_VERSION", OMPI_VERSION, 1);
4748

4849
opal_argv_append_nosize(&pargs, "prterun");
4950
for (m=1; NULL != argv[m]; m++) {

0 commit comments

Comments
 (0)