Define OSHMEM_HAS_IKRIT removed from configuration file.
Both yoda and ikrit componets are adding in mca_spml_base_open now. Default component ikrit if found. Refs: 3763 This commit was SVN r29770.
Этот коммит содержится в:
родитель
9491989097
Коммит
2faef6bc2d
@ -137,9 +137,7 @@ static int mca_spml_base_open(mca_base_open_flag_t flags)
|
|||||||
|
|
||||||
if( (NULL == default_spml || NULL == default_spml[0] ||
|
if( (NULL == default_spml || NULL == default_spml[0] ||
|
||||||
0 == strlen(default_spml[0])) || (default_spml[0][0] == '^') ) {
|
0 == strlen(default_spml[0])) || (default_spml[0][0] == '^') ) {
|
||||||
#if OSHMEM_HAS_IKRIT
|
|
||||||
opal_pointer_array_add(&mca_spml_base_spml, strdup("ikrit"));
|
opal_pointer_array_add(&mca_spml_base_spml, strdup("ikrit"));
|
||||||
#endif
|
|
||||||
opal_pointer_array_add(&mca_spml_base_spml, strdup("yoda"));
|
opal_pointer_array_add(&mca_spml_base_spml, strdup("yoda"));
|
||||||
} else {
|
} else {
|
||||||
opal_pointer_array_add(&mca_spml_base_spml, strdup(default_spml[0]));
|
opal_pointer_array_add(&mca_spml_base_spml, strdup(default_spml[0]));
|
||||||
|
@ -15,14 +15,11 @@ AC_DEFUN([MCA_oshmem_spml_ikrit_CONFIG],[
|
|||||||
AC_CONFIG_FILES([oshmem/mca/spml/ikrit/Makefile])
|
AC_CONFIG_FILES([oshmem/mca/spml/ikrit/Makefile])
|
||||||
|
|
||||||
OMPI_CHECK_MXM([spml_ikrit],
|
OMPI_CHECK_MXM([spml_ikrit],
|
||||||
[AC_DEFINE([OSHMEM_HAS_IKRIT], [1], [mxm support is available])
|
[spml_ikrit_happy="yes"],
|
||||||
spml_ikrit_happy="yes"],
|
|
||||||
[spml_ikrit_happy="no"])
|
[spml_ikrit_happy="no"])
|
||||||
|
|
||||||
AS_IF([test "$spml_ikrit_happy" = "yes"],
|
AS_IF([test "$spml_ikrit_happy" = "yes"],
|
||||||
[spml_ikrit_WRAPPER_EXTRA_LDFLAGS="$spml_ikrit_LDFLAGS"
|
[$1],
|
||||||
spml_ikrit_WRAPPER_EXTRA_LIBS="$spml_ikrit_LIBS"
|
|
||||||
$1],
|
|
||||||
[$2])
|
[$2])
|
||||||
|
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user