Fix some "is proc on local node?" logic that got accidentally flipped
by r20496 for the sm BTL, openib BTL on iWarp, and the sm & sm2 coll modules. This commit was SVN r20515. The following SVN revision numbers were found above: r20496 --> open-mpi/ompi@4cdf91a8d4
Этот коммит содержится в:
родитель
e76b68e554
Коммит
9b83df22ec
@ -347,7 +347,7 @@ int mca_btl_openib_add_procs(
|
|||||||
we'll just mark any local peer on an iWARP NIC as
|
we'll just mark any local peer on an iWARP NIC as
|
||||||
unreachable. See trac ticket #1352. */
|
unreachable. See trac ticket #1352. */
|
||||||
if (IBV_TRANSPORT_IWARP == openib_btl->device->ib_dev->transport_type &&
|
if (IBV_TRANSPORT_IWARP == openib_btl->device->ib_dev->transport_type &&
|
||||||
!OPAL_PROC_ON_LOCAL_NODE(ompi_proc->proc_flags)) {
|
OPAL_PROC_ON_LOCAL_NODE(ompi_proc->proc_flags)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -446,7 +446,7 @@ int mca_btl_sm_add_procs(
|
|||||||
/* check to see if this proc can be reached via shmem (i.e.,
|
/* check to see if this proc can be reached via shmem (i.e.,
|
||||||
if they're on my local host and in my job) */
|
if they're on my local host and in my job) */
|
||||||
if (procs[proc]->proc_name.jobid != my_proc->proc_name.jobid ||
|
if (procs[proc]->proc_name.jobid != my_proc->proc_name.jobid ||
|
||||||
OPAL_PROC_ON_LOCAL_NODE(procs[proc]->proc_flags)) {
|
!OPAL_PROC_ON_LOCAL_NODE(procs[proc]->proc_flags)) {
|
||||||
peers[proc] = NULL;
|
peers[proc] = NULL;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -492,7 +492,7 @@ static bool have_local_peers(ompi_group_t *group, size_t size)
|
|||||||
|
|
||||||
for (i = 0; i < size; ++i) {
|
for (i = 0; i < size; ++i) {
|
||||||
proc = ompi_group_peer_lookup(group,i);
|
proc = ompi_group_peer_lookup(group,i);
|
||||||
if (OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
|
if (!OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -180,7 +180,7 @@ static bool have_local_peers(ompi_group_t *group, size_t size)
|
|||||||
|
|
||||||
for (i = 0; i < size; ++i) {
|
for (i = 0; i < size; ++i) {
|
||||||
proc = ompi_group_peer_lookup(group,i);
|
proc = ompi_group_peer_lookup(group,i);
|
||||||
if (OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
|
if (!OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user