ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Default to internal PMIx if newer than external

Просмотр исходного кода 
Per https://github.com/open-mpi/ompi/issues/5031, if the user didn't specify a particular PMIx installation, then default back to the internal version if it is newer than the discovered external one. PMIx doesn't yet provide a full signature so we have to just get as close as possible for now.

Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2018-07-19 11:02:03 -07:00
родитель 4a596d35f7
Коммит 1e6aaf7f22
2 изменённых файлов: 13 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
config/opal_check_pmi.m4
Просмотреть файл

@ -375,7 +375,7 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
#endif
], [])],
[AC_MSG_RESULT([found])
opal_external_pmix_version=1.2.x
opal_external_pmix_version=1x
opal_external_pmix_version_found=1
opal_external_have_pmix1=1
opal_external_pmix_happy=yes],
@ -402,6 +402,15 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
AC_MSG_WARN([header/library files were not found])
AC_MSG_ERROR([Cannot continue])])
# Final check - if they didn't point us explicitly at an external version
# but we found one anyway, use the internal version if it is higher
AS_IF([test "$opal_external_pmix_version" != "internal" && (test -z "$with_pmix" || test "$with_pmix" = "yes")],
[AS_IF([test "$opal_external_pmix_version" != "3x"],
[AC_MSG_WARN([discovered external PMIx version is less than internal version 3.x])
AC_MSG_WARN([using internal PMIx])
opal_external_pmix_version=internal
opal_external_pmix_happy=no])])
AC_MSG_CHECKING([PMIx version to be used])
AS_IF([test "$opal_external_pmix_happy" = "yes"],
[AC_MSG_RESULT([external($opal_external_pmix_version)])
@ -415,8 +424,8 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
[Whether the external PMIx library is v1])
AM_CONDITIONAL([OPAL_WANT_PRUN], [test "$opal_prun_happy" = "yes"])
AS_IF([test "$opal_external_pmix_version" = "1.2.x"],
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PMIx support]], [opal_pmix], [$opal_external_pmix_version: WARNING - DYNAMIC OPS NOT SUPPORTED])],
AS_IF([test "$opal_external_pmix_version" = "1x"],
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PMIx support]], [opal_pmix], [1.2.x: WARNING - DYNAMIC OPS NOT SUPPORTED])],
[OPAL_SUMMARY_ADD([[Miscellaneous]],[[PMIx support]], [opal_pmix], [$opal_external_pmix_version])])
OPAL_VAR_SCOPE_POP

4
opal/mca/pmix/ext1x/configure.m4
Просмотреть файл

@ -33,9 +33,7 @@ AC_DEFUN([MCA_opal_pmix_ext1x_CONFIG],[
AS_IF([test "$opal_external_pmix_happy" = "yes"],
[ # check for the 1.x version ( >= 1.1.4 ?)
AC_MSG_CHECKING([if external component is version 1.x])
AS_IF([test "$opal_external_pmix_version" = "11" ||
test "$opal_external_pmix_version" = "12" ||
test "$opal_external_pmix_version" = "1x"],
AS_IF([test "$opal_external_pmix_version" = "1x"],
[AC_MSG_RESULT([yes])
AS_IF([test "$opal_event_external_support" != "yes"],
[AC_MSG_WARN([EXTERNAL PMIX SUPPORT REQUIRES USE OF EXTERNAL LIBEVENT])