A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Gather SMP collective from MVAPICH2
[simgrid.git]
/
src
/
smpi
/
colls
/
smpi_mvapich2_selector.c
diff --git
a/src/smpi/colls/smpi_mvapich2_selector.c
b/src/smpi/colls/smpi_mvapich2_selector.c
index
fa6c7b2
..
d9e3565
100644
(file)
--- a/
src/smpi/colls/smpi_mvapich2_selector.c
+++ b/
src/smpi/colls/smpi_mvapich2_selector.c
@@
-242,9
+242,8
@@
int smpi_coll_tuned_gather_mvapich2(void *sendbuf,
-1)) {
range_intra_threshold++;
}
-1)) {
range_intra_threshold++;
}
- /*
- if (comm->ch.is_global_block == 1 && mv2_use_direct_gather == 1 &&
- mv2_use_two_level_gather == 1 && comm->ch.shmem_coll_ok == 1) {
+
+ if (smpi_comm_is_blocked(comm) ) {
// Set intra-node function pt for gather_two_level
MV2_Gather_intra_node_function =
mv2_gather_thresholds_table[range].intra_node[range_intra_threshold].
// Set intra-node function pt for gather_two_level
MV2_Gather_intra_node_function =
mv2_gather_thresholds_table[range].intra_node[range_intra_threshold].
@@
-258,12
+257,12
@@
int smpi_coll_tuned_gather_mvapich2(void *sendbuf,
MV2_Gather_inter_leader_function(sendbuf, sendcnt, sendtype, recvbuf, recvcnt,
recvtype, root, comm);
MV2_Gather_inter_leader_function(sendbuf, sendcnt, sendtype, recvbuf, recvcnt,
recvtype, root, comm);
- } else {
*/
- // Ind
d
ed, direct (non SMP-aware)gather is MPICH one
+ } else {
+ // Ind
e
ed, direct (non SMP-aware)gather is MPICH one
mpi_errno = smpi_coll_tuned_gather_mpich(sendbuf, sendcnt, sendtype,
recvbuf, recvcnt, recvtype,
root, comm);
mpi_errno = smpi_coll_tuned_gather_mpich(sendbuf, sendcnt, sendtype,
recvbuf, recvcnt, recvtype,
root, comm);
-
//
}
+ }
return mpi_errno;
}
return mpi_errno;
}