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

Merge pull request #8090 from rhc54/topic/pmix3

Просмотр исходного кода 
Add some protection against PMIx v4
Этот коммит содержится в:
Ralph Castain 2020-10-13 07:59:24 -07:00 коммит произвёл GitHub
родитель 0bcef049c9 92d28420d1
Коммит 8cd79760b3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 48 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -13,7 +13,7 @@ dnl All rights reserved.
dnl Copyright (c) 2009-2019 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights
dnl reserved.
dnl Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
dnl Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
dnl Copyright (c) 2014-2018 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
@ -166,11 +166,11 @@ AC_DEFUN([_OPAL_CONFIG_PMIX_EXTERNAL], [
LIBS="$opal_pmix_LIBS_save $opal_pmix_LIBS"
AS_IF([test "$opal_pmix_external_support" = "yes"],
[AC_MSG_CHECKING([if external PMIx version is 3.0.0 or greater])
[AC_MSG_CHECKING([if external PMIx version is 3.1.5 or greater])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pmix_version.h>]],
[[
#if PMIX_VERSION_MAJOR < 3L
#error "pmix API version is less than 3.0.0"
#if PMIX_NUMERIC_VERSION < 0x00030105
#error "pmix API version is less than 3.1.5"
#endif
]])],
[AC_MSG_RESULT([yes])],

12
ompi/dpm/dpm.c
Просмотреть файл

@ -696,7 +696,11 @@ static int dpm_convert(opal_list_t *infos,
/* does it conflict? */
if (0 != strncasecmp(ck, directive, strlen(directive))) {
opal_asprintf(&help_str, "Conflicting directives \"%s %s\"", ck, directive);
#if PMIX_NUMERIC_VERSION >= 0x00040000
attr = PMIx_Get_attribute_string(option);
#else
attr = option;
#endif
opal_show_help("help-dpm.txt", "deprecated-fail", true,
infokey, attr, help_str);
free(help_str);
@ -723,7 +727,11 @@ static int dpm_convert(opal_list_t *infos,
if (OMPI_SUCCESS != rc) {
/* we have a conflict */
opal_asprintf(&ptr, " Option %s\n Conflicting modifiers \"%s %s\"", option, infokey, modifier);
#if PMIX_NUMERIC_VERSION >= 0x00040000
attr = PMIx_Get_attribute_string(option);
#else
attr = option;
#endif
opal_show_help("help-dpm.txt", "deprecated-fail", true,
infokey, attr, ptr);
free(ptr);
@ -983,9 +991,9 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
/* non-standard keys
* Keys that correspond to prun/mpiexec parameters
* do not deprecate PMIX unprefixed forms to remain identical
* do not deprecate PMIX unprefixed forms to remain identical
* to the command line parameter;
* Keys that are not corresponding to an mpiexec parameter are
* Keys that are not corresponding to an mpiexec parameter are
* deprecated in the non-prefixed form */
/* check for 'hostfile' */

62
ompi/runtime/ompi_rte.c
Просмотреть файл

@ -585,9 +585,11 @@ int ompi_rte_init(int *pargc, char ***pargv)
/* just assume 0 */
u16 = 0;
} else {
ret = opal_pmix_convert_status(rc);
error = "node rank";
goto error;
/* we may be in an environment that doesn't quite adhere
* to the Standard - we can safely assume it is the same
* as the local rank as such environments probably aren't
* going to care */
u16 = opal_process_info.my_local_rank;
}
}
opal_process_info.my_node_rank = u16;
@ -668,6 +670,7 @@ int ompi_rte_init(int *pargc, char ***pargv)
}
}
#ifdef PMIX_APP_ARGV
/* get our command - defaults to our appnum */
ev1 = NULL;
OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_APP_ARGV,
@ -681,13 +684,21 @@ int ompi_rte_init(int *pargc, char ***pargv)
opal_process_info.command = opal_argv_join(tmp, ' ');
}
}
#else
tmp = *pargv;
if (NULL != tmp) {
opal_process_info.command = opal_argv_join(tmp, ' ');
}
#endif
#ifdef PMIX_REINCARNATION
/* get our reincarnation number */
OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_REINCARNATION,
&OPAL_PROC_MY_NAME, &u32ptr, PMIX_UINT32);
if (PMIX_SUCCESS == rc) {
opal_process_info.reincarnation = u32;
}
#endif
/* get the number of local peers - required for wireup of
* shared memory BTL, defaults to local node */
@ -695,10 +706,6 @@ int ompi_rte_init(int *pargc, char ***pargv)
&pname, &u32ptr, PMIX_UINT32);
if (PMIX_SUCCESS == rc) {
opal_process_info.num_local_peers = u32 - 1; // want number besides ourselves
} else {
ret = opal_pmix_convert_status(rc);
error = "local size";
goto error;
}
/* retrieve temp directories info */
@ -768,28 +775,27 @@ int ompi_rte_init(int *pargc, char ***pargv)
opal_process_info.proc_is_bound = false;
}
/* get our local peers */
if (0 < opal_process_info.num_local_peers) {
/* if my local rank if too high, then that's an error */
if (opal_process_info.num_local_peers < opal_process_info.my_local_rank) {
ret = OPAL_ERR_BAD_PARAM;
error = "num local peers";
goto error;
}
/* retrieve the local peers - defaults to local node */
val = NULL;
OPAL_MODEX_RECV_VALUE(rc, PMIX_LOCAL_PEERS,
&pname, &val, PMIX_STRING);
if (PMIX_SUCCESS == rc && NULL != val) {
peers = opal_argv_split(val, ',');
free(val);
} else {
ret = opal_pmix_convert_status(rc);
error = "local peers";
goto error;
}
/* retrieve the local peers - defaults to local node */
val = NULL;
OPAL_MODEX_RECV_VALUE(rc, PMIX_LOCAL_PEERS,
&pname, &val, PMIX_STRING);
if (PMIX_SUCCESS == rc && NULL != val) {
peers = opal_argv_split(val, ',');
free(val);
} else {
peers = NULL;
ret = opal_pmix_convert_status(rc);
error = "local peers";
goto error;
}
/* if we were unable to retrieve the #local peers, set it here */
if (0 == opal_process_info.num_local_peers) {
opal_process_info.num_local_peers = opal_argv_count(peers) - 1;
}
/* if my local rank if too high, then that's an error */
if (opal_process_info.num_local_peers < opal_process_info.my_local_rank) {
ret = OPAL_ERR_BAD_PARAM;
error = "num local peers";
goto error;
}
/* set the locality */