Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opal/mca/common/verbs/common_verbs.h
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ OPAL_DECLSPEC int opal_common_verbs_qp_test(struct ibv_context *device_context,
* Known limitations:
* If ibv_fork_init is called after ibv_create_* functions - it will have no effect.
* OMPI initializes verbs many times during initialization in the following verbs components:
* oob/ud, btl/openib, mtl/mxm, pml/yalla, oshmem/ikrit, oshmem/yoda, ompi/mca/coll/{fca,hcoll}
* oob/ud, btl/openib, mtl/mxm, pml/yalla, oshmem/ikrit, ompi/mca/coll/{fca,hcoll}
*
* So, ibv_fork_init should be called once, in the beginning of the init flow of every verb component
* to proper request fork support.
Expand Down
3 changes: 0 additions & 3 deletions oshmem/mca/spml/base/spml_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@
#include "opal/datatype/opal_convertor.h"
#include "orte/include/orte/types.h"
#include "orte/runtime/orte_globals.h"
#include "oshmem/mca/spml/yoda/spml_yoda.h"
#include "oshmem/proc/proc.h"
#include "oshmem/mca/spml/base/base.h"
#include "oshmem/mca/spml/yoda/spml_yoda_putreq.h"
#include "oshmem/mca/spml/yoda/spml_yoda_getreq.h"
#include "opal/mca/btl/btl.h"

#define SPML_BASE_DO_CMP(res, addr, op, val) \
Expand Down
1 change: 0 additions & 1 deletion oshmem/mca/spml/base/spml_base_frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ static int mca_spml_base_open(mca_base_open_flag_t flags)
if( (NULL == default_spml || NULL == default_spml[0] ||
0 == strlen(default_spml[0])) || (default_spml[0][0] == '^') ) {
opal_pointer_array_add(&mca_spml_base_spml, strdup("ikrit"));
opal_pointer_array_add(&mca_spml_base_spml, strdup("yoda"));
} else {
opal_pointer_array_add(&mca_spml_base_spml, strdup(default_spml[0]));
}
Expand Down
7 changes: 1 addition & 6 deletions oshmem/mca/spml/base/spml_base_select.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,7 @@ int mca_spml_base_select(bool enable_progress_threads, bool enable_mpi_threads)
if (NULL == tmp_val) {
continue;
}
if (0 == strncmp(tmp_val, "yoda", 4) && !mca_bml_base_inited()) {
orte_errmgr.abort(1, "SPML %s cannot be selected becasue no btls are available. Please make sure that ob1 pml is selected by ompi (-mca pml ob1)", tmp_val);
}
else {
orte_errmgr.abort(1, "SPML %s cannot be selected", tmp_val);
}
orte_errmgr.abort(1, "SPML %s cannot be selected", tmp_val);
}
if (0 == i) {
orte_errmgr.abort(2,
Expand Down
45 changes: 0 additions & 45 deletions oshmem/mca/spml/yoda/Makefile.am

This file was deleted.

17 changes: 0 additions & 17 deletions oshmem/mca/spml/yoda/help-oshmem-spml-yoda.txt

This file was deleted.

4 changes: 0 additions & 4 deletions oshmem/mca/spml/yoda/post_configure.sh

This file was deleted.

Loading