MXM: do not enforce version check
- MXM uses libtool versioning scheme which is enough, no need additional in OMPI reviewed by yossi cmr=v1.7.5:reviewer=ompi-rm1.7 This commit was SVN r30768.
Этот коммит содержится в:
родитель
d4f12148c4
Коммит
49ee63f4b8
@ -99,16 +99,12 @@ static int ompi_mtl_mxm_component_open(void)
|
||||
opal_output_set_verbosity(mca_mtl_mxm_output, ompi_mtl_mxm.verbose);
|
||||
cur_ver = mxm_get_version();
|
||||
if (cur_ver != MXM_API) {
|
||||
char *str;
|
||||
if (asprintf(&str, "OMPI was compiled with MXM version %d.%d but "
|
||||
"version %ld.%ld detected.", MXM_VERNO_MAJOR,
|
||||
MXM_VERNO_MINOR, (cur_ver >> MXM_MAJOR_BIT)& 0xff,
|
||||
(cur_ver >> MXM_MINOR_BIT) & 0xff)>0) {
|
||||
opal_show_help("help-mtl-mxm.txt", "mxm init", true, str);
|
||||
|
||||
free(str);
|
||||
}
|
||||
return OMPI_ERR_NOT_AVAILABLE;
|
||||
MXM_VERBOSE(1,
|
||||
"WARNING: OMPI was compiled with MXM version %d.%d but version %ld.%ld detected.",
|
||||
MXM_VERNO_MAJOR,
|
||||
MXM_VERNO_MINOR,
|
||||
(cur_ver >> MXM_MAJOR_BIT) & 0xff,
|
||||
(cur_ver >> MXM_MINOR_BIT) & 0xff);
|
||||
}
|
||||
|
||||
#if MXM_API >= MXM_VERSION(2,0)
|
||||
|
@ -92,6 +92,10 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework;
|
||||
oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \
|
||||
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
|
||||
|
||||
#define SPML_WARNING(...) \
|
||||
oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \
|
||||
"WARNING %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
#endif /* MCA_SPML_BASE_H */
|
||||
|
@ -158,19 +158,11 @@ static int mca_spml_ikrit_component_open(void)
|
||||
|
||||
cur_ver = mxm_get_version();
|
||||
if (cur_ver != MXM_API) {
|
||||
char *str;
|
||||
if (asprintf(&str,
|
||||
"SHMEM was compiled with MXM version %d.%d but "
|
||||
"version %ld.%ld detected.",
|
||||
MXM_VERNO_MAJOR,
|
||||
MXM_VERNO_MINOR,
|
||||
(cur_ver >> MXM_MAJOR_BIT) & 0xff,
|
||||
(cur_ver >> MXM_MINOR_BIT) & 0xff) > 0) {
|
||||
orte_show_help("help-shmem-spml-ikrit.txt", "mxm init", true, str);
|
||||
|
||||
free(str);
|
||||
}
|
||||
return OSHMEM_ERROR;
|
||||
SPML_WARNING(
|
||||
"OSHMEM was compiled with MXM version %d.%d but version %ld.%ld detected.",
|
||||
MXM_VERNO_MAJOR, MXM_VERNO_MINOR,
|
||||
(cur_ver >> MXM_MAJOR_BIT) & 0xff,
|
||||
(cur_ver >> MXM_MINOR_BIT) & 0xff);
|
||||
}
|
||||
|
||||
#if MXM_API < MXM_VERSION(2,1)
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user