Skip to content

Commit 77c50ef

Browse files
committed
Yoda SPML is removed
Signed-off-by: Boris Karasev <[email protected]>
1 parent 4d3e22e commit 77c50ef

16 files changed

+2
-2080
lines changed

opal/mca/common/verbs/common_verbs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ OPAL_DECLSPEC int opal_common_verbs_qp_test(struct ibv_context *device_context,
172172
* Known limitations:
173173
* If ibv_fork_init is called after ibv_create_* functions - it will have no effect.
174174
* OMPI initializes verbs many times during initialization in the following verbs components:
175-
* oob/ud, btl/openib, mtl/mxm, pml/yalla, oshmem/ikrit, oshmem/yoda, ompi/mca/coll/{fca,hcoll}
175+
* oob/ud, btl/openib, mtl/mxm, pml/yalla, oshmem/ikrit, ompi/mca/coll/{fca,hcoll}
176176
*
177177
* So, ibv_fork_init should be called once, in the beginning of the init flow of every verb component
178178
* to proper request fork support.

oshmem/mca/spml/base/spml_base.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414
#include "opal/datatype/opal_convertor.h"
1515
#include "orte/include/orte/types.h"
1616
#include "orte/runtime/orte_globals.h"
17-
#include "oshmem/mca/spml/yoda/spml_yoda.h"
1817
#include "oshmem/proc/proc.h"
1918
#include "oshmem/mca/spml/base/base.h"
20-
#include "oshmem/mca/spml/yoda/spml_yoda_putreq.h"
21-
#include "oshmem/mca/spml/yoda/spml_yoda_getreq.h"
2219
#include "opal/mca/btl/btl.h"
2320

2421
#define SPML_BASE_DO_CMP(_res, _addr, _op, _val) \

oshmem/mca/spml/base/spml_base_frame.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ static int mca_spml_base_open(mca_base_open_flag_t flags)
144144
if( (NULL == default_spml || NULL == default_spml[0] ||
145145
0 == strlen(default_spml[0])) || (default_spml[0][0] == '^') ) {
146146
opal_pointer_array_add(&mca_spml_base_spml, strdup("ikrit"));
147-
opal_pointer_array_add(&mca_spml_base_spml, strdup("yoda"));
148147
} else {
149148
opal_pointer_array_add(&mca_spml_base_spml, strdup(default_spml[0]));
150149
}

oshmem/mca/spml/base/spml_base_select.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,7 @@ int mca_spml_base_select(bool enable_progress_threads, bool enable_mpi_threads)
147147
if (NULL == tmp_val) {
148148
continue;
149149
}
150-
if (0 == strncmp(tmp_val, "yoda", 4) && !mca_bml_base_inited()) {
151-
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);
152-
}
153-
else {
154-
orte_errmgr.abort(1, "SPML %s cannot be selected", tmp_val);
155-
}
150+
orte_errmgr.abort(1, "SPML %s cannot be selected", tmp_val);
156151
}
157152
if (0 == i) {
158153
orte_errmgr.abort(2,

oshmem/mca/spml/yoda/Makefile.am

Lines changed: 0 additions & 45 deletions
This file was deleted.

oshmem/mca/spml/yoda/help-oshmem-spml-yoda.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

oshmem/mca/spml/yoda/post_configure.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)