Skip to content

Commit 2185e05

Browse files
hjelmnhppritcha
authored andcommitted
pml/ob1: do not use OPAL_ENABLE_MULTI_THREADS to determine thread multiple support
OPAL_ENABLE_MULTI_THREADS is always on. The correct value to check is OMPI_ENABLE_THREAD_MULTIPLE. Signed-off-by: Nathan Hjelm <[email protected]> (cherry picked from commit open-mpi/ompi@284dd6b)
1 parent b0ff2a1 commit 2185e05

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

ompi/mca/pml/ob1/pml_ob1_irecv.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,17 @@ int mca_pml_ob1_recv(void *addr,
9797
mca_pml_ob1_recv_request_t *recvreq = NULL;
9898
int rc;
9999

100-
#if !OPAL_ENABLE_MULTI_THREADS
100+
#if !OMPI_ENABLE_THREAD_MULTIPLE
101101
recvreq = mca_pml_ob1_recvreq;
102102
if( OPAL_UNLIKELY(NULL == recvreq) )
103-
#endif /* !OPAL_ENABLE_MULTI_THREADS */
103+
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
104104
{
105105
MCA_PML_OB1_RECV_REQUEST_ALLOC(recvreq);
106106
if (NULL == recvreq)
107107
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
108-
#if !OPAL_ENABLE_MULTI_THREADS
108+
#if !OMPI_ENABLE_THREAD_MULTIPLE
109109
mca_pml_ob1_recvreq = recvreq;
110-
#endif /* !OPAL_ENABLE_MULTI_THREADS */
110+
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
111111
}
112112
OBJ_CONSTRUCT(recvreq, mca_pml_ob1_recv_request_t);
113113

ompi/mca/pml/ob1/pml_ob1_isend.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,17 @@ int mca_pml_ob1_send(const void *buf,
220220
}
221221
}
222222

223-
#if !OPAL_ENABLE_MULTI_THREADS
223+
#if !OMPI_ENABLE_THREAD_MULTIPLE
224224
sendreq = mca_pml_ob1_sendreq;
225225
if( OPAL_UNLIKELY(NULL == sendreq) )
226-
#endif /* !OPAL_ENABLE_MULTI_THREADS */
226+
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
227227
{
228228
MCA_PML_OB1_SEND_REQUEST_ALLOC(comm, dst, sendreq);
229229
if (NULL == sendreq)
230230
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
231-
#if !OPAL_ENABLE_MULTI_THREADS
231+
#if !OMPI_ENABLE_THREAD_MULTIPLE
232232
mca_pml_ob1_sendreq = sendreq;
233-
#endif /* !OPAL_ENABLE_MULTI_THREADS */
233+
#endif /* !OMPI_ENABLE_THREAD_MULTIPLE */
234234
}
235235
OBJ_CONSTRUCT(sendreq, mca_pml_ob1_send_request_t);
236236
sendreq->req_send.req_base.req_proc = dst_proc;

0 commit comments

Comments
 (0)